diff --git a/editors/demo/src/HHMI/HHMI.js b/editors/demo/src/HHMI/HHMI.js
index 9ddbb0cd56604e99cc8c24cc2db836713a561bd8..35f9e07468fbbe0d02ea37314d52b4a3fd7fff92 100644
--- a/editors/demo/src/HHMI/HHMI.js
+++ b/editors/demo/src/HHMI/HHMI.js
@@ -167,7 +167,7 @@ const Hhmi = () => {
         ref={editorRef}
         customValues={{ showFeedBack: submitted, testMode }}
         fileUpload={file => renderImage(file)}
-        // value={content}
+        value={content}
         readonly={readOnly}
         layout={HhmiLayout}
         // onChange={source => console.log(source)}
diff --git a/wax-prosemirror-services/src/FillTheGapQuestionService/components/FillTheGapContainerComponent.js b/wax-prosemirror-services/src/FillTheGapQuestionService/components/FillTheGapContainerComponent.js
index d59c87533169dfa2b7b877870bc997cdc65f448a..4e2c749901bf032f7f1b668b5005336eb5fe4777 100644
--- a/wax-prosemirror-services/src/FillTheGapQuestionService/components/FillTheGapContainerComponent.js
+++ b/wax-prosemirror-services/src/FillTheGapQuestionService/components/FillTheGapContainerComponent.js
@@ -45,9 +45,11 @@ export default ({ node, view, getPos }) => {
     <FillTheGapWrapper>
       <div>
         <span> Fill The Gap</span>
-        <FillTheGapContainerTool>
-          <FillTheGapTool />
-        </FillTheGapContainerTool>
+        {!testMode && !readOnly && (
+          <FillTheGapContainerTool>
+            <FillTheGapTool />
+          </FillTheGapContainerTool>
+        )}
       </div>
       <FillTheGapContainer className="fill-the-gap">
         <ContainerEditor getPos={getPos} node={node} view={view} />
diff --git a/wax-prosemirror-services/src/MatchingService/MatchingQuestion.js b/wax-prosemirror-services/src/MatchingService/MatchingQuestion.js
index 45d9ce86e9afdac00a82a1688ed58a79d852dcbc..1e31ab9907400bb844b8f3dd0bd6420f509d4158 100644
--- a/wax-prosemirror-services/src/MatchingService/MatchingQuestion.js
+++ b/wax-prosemirror-services/src/MatchingService/MatchingQuestion.js
@@ -16,7 +16,7 @@ class MatchingQuestion extends Tools {
     return main => {
       const { dispatch } = main;
       const { state } = main;
-      // helpers.checkifEmpty(main);
+      helpers.checkifEmpty(main);
       /* Create Wrapping */
       const { $from, $to } = main.state.selection;
       const range = $from.blockRange($to);
diff --git a/wax-prosemirror-services/src/MultipleDropDownService/components/MultipleDropDownContainerComponent.js b/wax-prosemirror-services/src/MultipleDropDownService/components/MultipleDropDownContainerComponent.js
index eacb901564d126a08fc806b115ab110fa68fbec4..d259987f82947e011d57a9c4770c9a948a4f442d 100644
--- a/wax-prosemirror-services/src/MultipleDropDownService/components/MultipleDropDownContainerComponent.js
+++ b/wax-prosemirror-services/src/MultipleDropDownService/components/MultipleDropDownContainerComponent.js
@@ -45,9 +45,11 @@ export default ({ node, view, getPos }) => {
     <MultipleDropDownpWrapper>
       <div>
         <span>Multiple Drop Down</span>
-        <MultipleDropDownContainerTool>
-          <MultipleDropDown />
-        </MultipleDropDownContainerTool>
+        {!testMode && !readOnly && (
+          <MultipleDropDownContainerTool>
+            <MultipleDropDown />
+          </MultipleDropDownContainerTool>
+        )}
       </div>
       <MultipleDropDownpContainer className="multiple-drop-down">
         <ContainerEditor getPos={getPos} node={node} view={view} />