diff --git a/editors/demo/src/HHMI/HHMI.js b/editors/demo/src/HHMI/HHMI.js
index 86c00af088ac7789b527cbe3bb8cb9549f615de5..949776029b16f1e492a07f5e8b78e7afa14ff241 100644
--- a/editors/demo/src/HHMI/HHMI.js
+++ b/editors/demo/src/HHMI/HHMI.js
@@ -170,7 +170,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/MatchingService/components/DropDownComponent.js b/wax-prosemirror-services/src/MatchingService/components/DropDownComponent.js
index 4dfbba33502713291f1d07c76bc0e19ed6a754be..e8f921166516974e98997672d1bec162ae39048b 100644
--- a/wax-prosemirror-services/src/MatchingService/components/DropDownComponent.js
+++ b/wax-prosemirror-services/src/MatchingService/components/DropDownComponent.js
@@ -44,7 +44,7 @@ const DropdownStyled = styled(Dropdown)`
 `;
 
 const DropComponent = ({ getPos, node, view }) => {
-  const [selectedOption, setSelectedOption] = useState(undefined);
+  const [selectedOption, setSelectedOption] = useState(node.attrs.correct);
 
   const context = useContext(WaxContext);
   const {
@@ -52,7 +52,6 @@ const DropComponent = ({ getPos, node, view }) => {
   } = context;
 
   const onChange = option => {
-    setSelectedOption(option);
     const allNodes = getNodes(main);
     allNodes.forEach(singleNode => {
       if (singleNode.node.attrs.id === node.attrs.id) {
@@ -68,14 +67,13 @@ const DropComponent = ({ getPos, node, view }) => {
     });
   };
 
-  useEffect(() => {
-    const value = selectedOption ? selectedOption.value : '';
-    const found = find(node.attrs.options, { value });
+  // useEffect(() => {
+  //   const found = find(node.attrs.options, { value: node.attrs.correct });
 
-    if (!found) {
-      setSelectedOption(undefined);
-    }
-  }, [node.attrs.options]);
+  //   if (found) {
+  //     setSelectedOption(found);
+  //   }
+  // }, [node.attrs.options]);
 
   const MultipleDropDown = useMemo(
     () => (
diff --git a/wax-prosemirror-services/src/MatchingService/components/MatchingContainerComponent.js b/wax-prosemirror-services/src/MatchingService/components/MatchingContainerComponent.js
index 166d1a35df8683441377396cd17a2baa66a4678e..64248282a210bba24b50158a59535df2281f2194 100644
--- a/wax-prosemirror-services/src/MatchingService/components/MatchingContainerComponent.js
+++ b/wax-prosemirror-services/src/MatchingService/components/MatchingContainerComponent.js
@@ -200,6 +200,8 @@ export default ({ node, view, getPos }) => {
     });
   };
 
+  const { testMode } = customProps;
+
   return (
     <MatchingWrapper>
       <span>Matching</span>
@@ -252,8 +254,7 @@ export default ({ node, view, getPos }) => {
             )}
           </CreateOptions>
         )}
-        {(!(readOnly && !customProps.showFeedBack) ||
-          (readOnly && !customProps.testMode && !customProps.showFeedBack)) && (
+        {!testMode && (
           <FeedbackComponent
             getPos={getPos}
             node={node}
diff --git a/wax-prosemirror-services/src/MatchingService/components/MatchingOptionComponent.js b/wax-prosemirror-services/src/MatchingService/components/MatchingOptionComponent.js
index 5bd695e1b95dfa42c6886c3f1823c5238f650d66..2e9d9e8b4b184b7fbfc7e0612241dbed858128d6 100644
--- a/wax-prosemirror-services/src/MatchingService/components/MatchingOptionComponent.js
+++ b/wax-prosemirror-services/src/MatchingService/components/MatchingOptionComponent.js
@@ -8,7 +8,7 @@ import { Icon } from 'wax-prosemirror-components';
 import { WaxContext } from 'wax-prosemirror-core';
 import EditorComponent from './EditorComponent';
 import DropDownComponent from './DropDownComponent';
-import ReadOnlyDropDownComponent from './ReadOnlyDropDownComponent';
+import TestModeDropDownComponent from './TestModeDropDownComponent';
 
 const Option = styled.div`
   display: flex;
@@ -139,7 +139,7 @@ export default ({ node, view, getPos }) => {
         )}
 
         {readOnly && testMode && !showFeedBack && (
-          <ReadOnlyDropDownComponent getPos={getPos} node={node} view={view} />
+          <TestModeDropDownComponent getPos={getPos} node={node} view={view} />
         )}
 
         {readOnly && showFeedBack && (
diff --git a/wax-prosemirror-services/src/MatchingService/components/ReadOnlyDropDownComponent.js b/wax-prosemirror-services/src/MatchingService/components/TestModeDropDownComponent.js
similarity index 95%
rename from wax-prosemirror-services/src/MatchingService/components/ReadOnlyDropDownComponent.js
rename to wax-prosemirror-services/src/MatchingService/components/TestModeDropDownComponent.js
index e5121aca8e739960257d3b5b28dcc82b8ecb478f..bb7a38eb82e1947ff2cabb46fe09f90dc9d95081 100644
--- a/wax-prosemirror-services/src/MatchingService/components/ReadOnlyDropDownComponent.js
+++ b/wax-prosemirror-services/src/MatchingService/components/TestModeDropDownComponent.js
@@ -41,7 +41,7 @@ const DropdownStyled = styled(Dropdown)`
   }
 `;
 
-const ReadOnlyDropDownComponent = ({ getPos, node, view }) => {
+const TestModeDropDownComponent = ({ getPos, node, view }) => {
   const [selectedOption, setSelectedOption] = useState(undefined);
 
   const context = useContext(WaxContext);
@@ -97,7 +97,7 @@ const ReadOnlyDropDownComponent = ({ getPos, node, view }) => {
   return ReadOnlyMultipleDropDown;
 };
 
-export default ReadOnlyDropDownComponent;
+export default TestModeDropDownComponent;
 
 const getNodes = view => {
   return DocumentHelpers.findInlineNodes(view.state.doc);