diff --git a/wax-prosemirror-services/src/EssayService/components/EssayAnswerComponent.js b/wax-prosemirror-services/src/EssayService/components/EssayAnswerComponent.js
index 78ff4361c82a69b9ceda3d7fc628674e6a53390b..8940b0e522fe256dd30e49eb9ee5e58f22ed835b 100644
--- a/wax-prosemirror-services/src/EssayService/components/EssayAnswerComponent.js
+++ b/wax-prosemirror-services/src/EssayService/components/EssayAnswerComponent.js
@@ -54,9 +54,10 @@ const EssayAnswerComponent = ({ node, view, getPos }) => {
   } = context;
   let essayAnswerView;
   const questionId = node.attrs.id;
-  const isEditable = main.props.editable(editable => {
-    return editable;
-  });
+
+  const customProps = main.props.customValues;
+
+  const { testMode } = customProps;
 
   let finalPlugins = [];
 
@@ -120,7 +121,7 @@ const EssayAnswerComponent = ({ node, view, getPos }) => {
         mount: editorRef.current,
       },
       {
-        editable: () => !isEditable,
+        editable: () => testMode,
         state: EditorState.create({
           doc: node,
           plugins: finalPlugins,
@@ -190,7 +191,7 @@ const EssayAnswerComponent = ({ node, view, getPos }) => {
   };
 
   return (
-    <EditorWrapper editable={!isEditable}>
+    <EditorWrapper editable={testMode}>
       <div ref={editorRef} />
     </EditorWrapper>
   );
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/AnswerComponent.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/AnswerComponent.js
index 086eff00c9a67991ec9b3274ee86e07b0da62411..67fbf350c63fdf9b6389c2b5e9771dc46e7d4e73 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/AnswerComponent.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/AnswerComponent.js
@@ -92,7 +92,7 @@ export default ({ node, view, getPos }) => {
   const removeOption = () => {
     const answersCount = findAnswerCount();
     if (answersCount.count >= 1) {
-      main.state.doc.nodesBetween(getPos(), getPos() + 1, (sinlgeNode, pos) => {
+      main.state.doc.nodesBetween(getPos(), getPos() + 1, sinlgeNode => {
         if (sinlgeNode.attrs.id === node.attrs.id) {
           main.dispatch(
             main.state.tr.deleteRange(getPos(), getPos() + sinlgeNode.nodeSize),