diff --git a/src/problem_bank_scripts/problem_bank_scripts.py b/src/problem_bank_scripts/problem_bank_scripts.py
index 28a93438..3e2d6175 100644
--- a/src/problem_bank_scripts/problem_bank_scripts.py
+++ b/src/problem_bank_scripts/problem_bank_scripts.py
@@ -903,8 +903,13 @@ def process_workspace(part_name, parsed_question, data_dict):
 
     html += f"""<pl-workspace></pl-workspace>"""
 
+    html += f"""\n<pl-submission-panel>"""
+
     if parsed_question["header"][part_name].get("gradingMethod", None) == "External":
-        html += f"""<pl-submission-panel>\n\t<pl-external-grader-results></pl-external-grader-results>\n\t<pl-file-preview></pl-file-preview></pl-submission-panel>"""
+        html += f"""\n<pl-external-grader-results></pl-external-grader-results>\n<pl-file-preview></pl-file-preview>"""
+    
+    html += f"""\n<ul>\n\t|@ #feedback.results @| \n\t<li>|@ . @|</li>\n\t|@ /feedback.results @|\n</ul>\n</pl-submission-panel>"""
+
 
     return replace_tags(html)
 
diff --git a/tests/test_question_templates/question_expected_outputs/instructor/q16_workspaces/file1.txt b/tests/test_question_templates/question_expected_outputs/instructor/q17_workspaces/file1.txt
similarity index 100%
rename from tests/test_question_templates/question_expected_outputs/instructor/q16_workspaces/file1.txt
rename to tests/test_question_templates/question_expected_outputs/instructor/q17_workspaces/file1.txt
diff --git a/tests/test_question_templates/question_expected_outputs/instructor/q16_workspaces/file2.txt b/tests/test_question_templates/question_expected_outputs/instructor/q17_workspaces/file2.txt
similarity index 100%
rename from tests/test_question_templates/question_expected_outputs/instructor/q16_workspaces/file2.txt
rename to tests/test_question_templates/question_expected_outputs/instructor/q17_workspaces/file2.txt
diff --git a/tests/test_question_templates/question_expected_outputs/instructor/q16_workspaces/filebad.txt b/tests/test_question_templates/question_expected_outputs/instructor/q17_workspaces/filebad.txt
similarity index 100%
rename from tests/test_question_templates/question_expected_outputs/instructor/q16_workspaces/filebad.txt
rename to tests/test_question_templates/question_expected_outputs/instructor/q17_workspaces/filebad.txt
diff --git a/tests/test_question_templates/question_expected_outputs/instructor/q16_workspaces/q16_workspaces.md b/tests/test_question_templates/question_expected_outputs/instructor/q17_workspaces/q17_workspaces.md
similarity index 95%
rename from tests/test_question_templates/question_expected_outputs/instructor/q16_workspaces/q16_workspaces.md
rename to tests/test_question_templates/question_expected_outputs/instructor/q17_workspaces/q17_workspaces.md
index a1e11c53..3ca8a706 100644
--- a/tests/test_question_templates/question_expected_outputs/instructor/q16_workspaces/q16_workspaces.md
+++ b/tests/test_question_templates/question_expected_outputs/instructor/q17_workspaces/q17_workspaces.md
@@ -120,14 +120,8 @@ Once you complete these tasks, click on "Save & Grade" below.
 
 ### pl-submission-panel
 
-<ul>
-  {{#feedback.results}}
-  <li>{{.}}</li>
-  {{/feedback.results}}
-</ul>
-
-<!-- Everything here will get inserted directly into the pl-submission-panel element at the end of the `question.html`.
-Please remove this section if it is not application for this question. -->
+Everything here will get inserted directly into the pl-submission-panel element at the end of the `question.html`.
+Please remove this section if it is not application for this question.
 
 ### pl-answer-panel
 
diff --git a/tests/test_question_templates/question_expected_outputs/instructor/q16_workspaces/workspace/file1.txt b/tests/test_question_templates/question_expected_outputs/instructor/q17_workspaces/workspace/file1.txt
similarity index 100%
rename from tests/test_question_templates/question_expected_outputs/instructor/q16_workspaces/workspace/file1.txt
rename to tests/test_question_templates/question_expected_outputs/instructor/q17_workspaces/workspace/file1.txt
diff --git a/tests/test_question_templates/question_expected_outputs/instructor/q16_workspaces/workspace/file2.txt b/tests/test_question_templates/question_expected_outputs/instructor/q17_workspaces/workspace/file2.txt
similarity index 100%
rename from tests/test_question_templates/question_expected_outputs/instructor/q16_workspaces/workspace/file2.txt
rename to tests/test_question_templates/question_expected_outputs/instructor/q17_workspaces/workspace/file2.txt
diff --git a/tests/test_question_templates/question_expected_outputs/instructor/q16_workspaces/workspace/filebad.txt b/tests/test_question_templates/question_expected_outputs/instructor/q17_workspaces/workspace/filebad.txt
similarity index 100%
rename from tests/test_question_templates/question_expected_outputs/instructor/q16_workspaces/workspace/filebad.txt
rename to tests/test_question_templates/question_expected_outputs/instructor/q17_workspaces/workspace/filebad.txt
diff --git a/tests/test_question_templates/question_expected_outputs/prairielearn-dev/q16_workspaces/info.json b/tests/test_question_templates/question_expected_outputs/prairielearn-dev/q17_workspaces/info.json
similarity index 81%
rename from tests/test_question_templates/question_expected_outputs/prairielearn-dev/q16_workspaces/info.json
rename to tests/test_question_templates/question_expected_outputs/prairielearn-dev/q17_workspaces/info.json
index 221ffeb9..ff6de953 100644
--- a/tests/test_question_templates/question_expected_outputs/prairielearn-dev/q16_workspaces/info.json
+++ b/tests/test_question_templates/question_expected_outputs/prairielearn-dev/q17_workspaces/info.json
@@ -1,5 +1,5 @@
 {
-    "uuid": "fc0d8086-108a-3418-a5d7-498e9af0bd74",
+    "uuid": "a27bed7b-7fe1-3092-9be7-82e4d2799c82",
     "title": "Moving and copying files",
     "topic": "000.Template",
     "tags": [
@@ -7,8 +7,8 @@
         "DEV"
     ],
     "type": "v3",
-    "singleVariant": false,
     "partialCredit": true,
+    "showCorrectAnswer": false,
     "workspaceOptions": {
         "image": "prairielearn/workspace-xtermjs",
         "port": 8080,
@@ -21,5 +21,5 @@
             "newdir/file2_new.txt"
         ]
     },
-    "showCorrectAnswer": false
+    "singleVariant": false
 }
\ No newline at end of file
diff --git a/tests/test_question_templates/question_expected_outputs/prairielearn/q16_workspaces/question.html b/tests/test_question_templates/question_expected_outputs/prairielearn-dev/q17_workspaces/question.html
similarity index 82%
rename from tests/test_question_templates/question_expected_outputs/prairielearn/q16_workspaces/question.html
rename to tests/test_question_templates/question_expected_outputs/prairielearn-dev/q17_workspaces/question.html
index 83e23818..e5c49dc9 100644
--- a/tests/test_question_templates/question_expected_outputs/prairielearn/q16_workspaces/question.html
+++ b/tests/test_question_templates/question_expected_outputs/prairielearn-dev/q17_workspaces/question.html
@@ -14,14 +14,15 @@
 </pl-question-panel>
 
 <pl-workspace></pl-workspace>
-<pl-submission-panel><ul>
-  {{#feedback.results}}
-  <li>{{.}}</li>
-  {{/feedback.results}}
+<pl-submission-panel>
+<ul>
+	{{ #feedback.results }} 
+	<li>{{ . }}</li>
+	{{ /feedback.results }}
 </ul>
-
-<!-- Everything here will get inserted directly into the pl-submission-panel element at the end of the `question.html`.
-Please remove this section if it is not application for this question. -->
+</pl-submission-panel>
+<pl-submission-panel>Everything here will get inserted directly into the pl-submission-panel element at the end of the `question.html`.
+Please remove this section if it is not application for this question.
  </pl-submission-panel>
 
 <pl-answer-panel>Everything here will get inserted directly into an pl-answer-panel element at the end of the `question.html`.
diff --git a/tests/test_question_templates/question_expected_outputs/prairielearn-dev/q16_workspaces/server.py b/tests/test_question_templates/question_expected_outputs/prairielearn-dev/q17_workspaces/server.py
similarity index 100%
rename from tests/test_question_templates/question_expected_outputs/prairielearn-dev/q16_workspaces/server.py
rename to tests/test_question_templates/question_expected_outputs/prairielearn-dev/q17_workspaces/server.py
diff --git a/tests/test_question_templates/question_expected_outputs/prairielearn-dev/q16_workspaces/serverFilesQuestion/file1.txt b/tests/test_question_templates/question_expected_outputs/prairielearn-dev/q17_workspaces/serverFilesQuestion/file1.txt
similarity index 100%
rename from tests/test_question_templates/question_expected_outputs/prairielearn-dev/q16_workspaces/serverFilesQuestion/file1.txt
rename to tests/test_question_templates/question_expected_outputs/prairielearn-dev/q17_workspaces/serverFilesQuestion/file1.txt
diff --git a/tests/test_question_templates/question_expected_outputs/prairielearn-dev/q16_workspaces/serverFilesQuestion/file2.txt b/tests/test_question_templates/question_expected_outputs/prairielearn-dev/q17_workspaces/serverFilesQuestion/file2.txt
similarity index 100%
rename from tests/test_question_templates/question_expected_outputs/prairielearn-dev/q16_workspaces/serverFilesQuestion/file2.txt
rename to tests/test_question_templates/question_expected_outputs/prairielearn-dev/q17_workspaces/serverFilesQuestion/file2.txt
diff --git a/tests/test_question_templates/question_expected_outputs/prairielearn-dev/q16_workspaces/serverFilesQuestion/filebad.txt b/tests/test_question_templates/question_expected_outputs/prairielearn-dev/q17_workspaces/serverFilesQuestion/filebad.txt
similarity index 100%
rename from tests/test_question_templates/question_expected_outputs/prairielearn-dev/q16_workspaces/serverFilesQuestion/filebad.txt
rename to tests/test_question_templates/question_expected_outputs/prairielearn-dev/q17_workspaces/serverFilesQuestion/filebad.txt
diff --git a/tests/test_question_templates/question_expected_outputs/prairielearn-dev/q16_workspaces/workspace/file1.txt b/tests/test_question_templates/question_expected_outputs/prairielearn-dev/q17_workspaces/workspace/file1.txt
similarity index 100%
rename from tests/test_question_templates/question_expected_outputs/prairielearn-dev/q16_workspaces/workspace/file1.txt
rename to tests/test_question_templates/question_expected_outputs/prairielearn-dev/q17_workspaces/workspace/file1.txt
diff --git a/tests/test_question_templates/question_expected_outputs/prairielearn-dev/q16_workspaces/workspace/file2.txt b/tests/test_question_templates/question_expected_outputs/prairielearn-dev/q17_workspaces/workspace/file2.txt
similarity index 100%
rename from tests/test_question_templates/question_expected_outputs/prairielearn-dev/q16_workspaces/workspace/file2.txt
rename to tests/test_question_templates/question_expected_outputs/prairielearn-dev/q17_workspaces/workspace/file2.txt
diff --git a/tests/test_question_templates/question_expected_outputs/prairielearn-dev/q16_workspaces/workspace/filebad.txt b/tests/test_question_templates/question_expected_outputs/prairielearn-dev/q17_workspaces/workspace/filebad.txt
similarity index 100%
rename from tests/test_question_templates/question_expected_outputs/prairielearn-dev/q16_workspaces/workspace/filebad.txt
rename to tests/test_question_templates/question_expected_outputs/prairielearn-dev/q17_workspaces/workspace/filebad.txt
diff --git a/tests/test_question_templates/question_expected_outputs/prairielearn/q16_workspaces/info.json b/tests/test_question_templates/question_expected_outputs/prairielearn/q17_workspaces/info.json
similarity index 84%
rename from tests/test_question_templates/question_expected_outputs/prairielearn/q16_workspaces/info.json
rename to tests/test_question_templates/question_expected_outputs/prairielearn/q17_workspaces/info.json
index b2bc7872..05f8d99a 100644
--- a/tests/test_question_templates/question_expected_outputs/prairielearn/q16_workspaces/info.json
+++ b/tests/test_question_templates/question_expected_outputs/prairielearn/q17_workspaces/info.json
@@ -1,5 +1,5 @@
 {
-    "uuid": "fad3fc60-3738-3899-8c8d-04a0bf0a5c70",
+    "uuid": "9ecb07ed-d25c-3da4-bd8a-62076a4b29fe",
     "title": "Moving and copying files",
     "topic": "000.Template",
     "tags": [
@@ -7,6 +7,7 @@
     ],
     "type": "v3",
     "singleVariant": false,
+    "showCorrectAnswer": false,
     "partialCredit": true,
     "workspaceOptions": {
         "image": "prairielearn/workspace-xtermjs",
@@ -19,6 +20,5 @@
             "newdir/file1_new.txt",
             "newdir/file2_new.txt"
         ]
-    },
-    "showCorrectAnswer": false
+    }
 }
\ No newline at end of file
diff --git a/tests/test_question_templates/question_expected_outputs/prairielearn-dev/q16_workspaces/question.html b/tests/test_question_templates/question_expected_outputs/prairielearn/q17_workspaces/question.html
similarity index 82%
rename from tests/test_question_templates/question_expected_outputs/prairielearn-dev/q16_workspaces/question.html
rename to tests/test_question_templates/question_expected_outputs/prairielearn/q17_workspaces/question.html
index 83e23818..e5c49dc9 100644
--- a/tests/test_question_templates/question_expected_outputs/prairielearn-dev/q16_workspaces/question.html
+++ b/tests/test_question_templates/question_expected_outputs/prairielearn/q17_workspaces/question.html
@@ -14,14 +14,15 @@
 </pl-question-panel>
 
 <pl-workspace></pl-workspace>
-<pl-submission-panel><ul>
-  {{#feedback.results}}
-  <li>{{.}}</li>
-  {{/feedback.results}}
+<pl-submission-panel>
+<ul>
+	{{ #feedback.results }} 
+	<li>{{ . }}</li>
+	{{ /feedback.results }}
 </ul>
-
-<!-- Everything here will get inserted directly into the pl-submission-panel element at the end of the `question.html`.
-Please remove this section if it is not application for this question. -->
+</pl-submission-panel>
+<pl-submission-panel>Everything here will get inserted directly into the pl-submission-panel element at the end of the `question.html`.
+Please remove this section if it is not application for this question.
  </pl-submission-panel>
 
 <pl-answer-panel>Everything here will get inserted directly into an pl-answer-panel element at the end of the `question.html`.
diff --git a/tests/test_question_templates/question_expected_outputs/prairielearn/q16_workspaces/server.py b/tests/test_question_templates/question_expected_outputs/prairielearn/q17_workspaces/server.py
similarity index 100%
rename from tests/test_question_templates/question_expected_outputs/prairielearn/q16_workspaces/server.py
rename to tests/test_question_templates/question_expected_outputs/prairielearn/q17_workspaces/server.py
diff --git a/tests/test_question_templates/question_expected_outputs/prairielearn/q16_workspaces/serverFilesQuestion/file1.txt b/tests/test_question_templates/question_expected_outputs/prairielearn/q17_workspaces/serverFilesQuestion/file1.txt
similarity index 100%
rename from tests/test_question_templates/question_expected_outputs/prairielearn/q16_workspaces/serverFilesQuestion/file1.txt
rename to tests/test_question_templates/question_expected_outputs/prairielearn/q17_workspaces/serverFilesQuestion/file1.txt
diff --git a/tests/test_question_templates/question_expected_outputs/prairielearn/q16_workspaces/serverFilesQuestion/file2.txt b/tests/test_question_templates/question_expected_outputs/prairielearn/q17_workspaces/serverFilesQuestion/file2.txt
similarity index 100%
rename from tests/test_question_templates/question_expected_outputs/prairielearn/q16_workspaces/serverFilesQuestion/file2.txt
rename to tests/test_question_templates/question_expected_outputs/prairielearn/q17_workspaces/serverFilesQuestion/file2.txt
diff --git a/tests/test_question_templates/question_expected_outputs/prairielearn/q16_workspaces/serverFilesQuestion/filebad.txt b/tests/test_question_templates/question_expected_outputs/prairielearn/q17_workspaces/serverFilesQuestion/filebad.txt
similarity index 100%
rename from tests/test_question_templates/question_expected_outputs/prairielearn/q16_workspaces/serverFilesQuestion/filebad.txt
rename to tests/test_question_templates/question_expected_outputs/prairielearn/q17_workspaces/serverFilesQuestion/filebad.txt
diff --git a/tests/test_question_templates/question_expected_outputs/prairielearn/q16_workspaces/workspace/file1.txt b/tests/test_question_templates/question_expected_outputs/prairielearn/q17_workspaces/workspace/file1.txt
similarity index 100%
rename from tests/test_question_templates/question_expected_outputs/prairielearn/q16_workspaces/workspace/file1.txt
rename to tests/test_question_templates/question_expected_outputs/prairielearn/q17_workspaces/workspace/file1.txt
diff --git a/tests/test_question_templates/question_expected_outputs/prairielearn/q16_workspaces/workspace/file2.txt b/tests/test_question_templates/question_expected_outputs/prairielearn/q17_workspaces/workspace/file2.txt
similarity index 100%
rename from tests/test_question_templates/question_expected_outputs/prairielearn/q16_workspaces/workspace/file2.txt
rename to tests/test_question_templates/question_expected_outputs/prairielearn/q17_workspaces/workspace/file2.txt
diff --git a/tests/test_question_templates/question_expected_outputs/prairielearn/q16_workspaces/workspace/filebad.txt b/tests/test_question_templates/question_expected_outputs/prairielearn/q17_workspaces/workspace/filebad.txt
similarity index 100%
rename from tests/test_question_templates/question_expected_outputs/prairielearn/q16_workspaces/workspace/filebad.txt
rename to tests/test_question_templates/question_expected_outputs/prairielearn/q17_workspaces/workspace/filebad.txt
diff --git a/tests/test_question_templates/question_expected_outputs/public/q16_workspaces/q16_workspaces.md b/tests/test_question_templates/question_expected_outputs/public/q17_workspaces/q17_workspaces.md
similarity index 89%
rename from tests/test_question_templates/question_expected_outputs/public/q16_workspaces/q16_workspaces.md
rename to tests/test_question_templates/question_expected_outputs/public/q17_workspaces/q17_workspaces.md
index 8d63d498..5e7d2a21 100644
--- a/tests/test_question_templates/question_expected_outputs/public/q16_workspaces/q16_workspaces.md
+++ b/tests/test_question_templates/question_expected_outputs/public/q17_workspaces/q17_workspaces.md
@@ -65,14 +65,8 @@ Once you complete these tasks, click on "Save & Grade" below.
 
 ### pl-submission-panel
 
-<ul>
-  {{#feedback.results}}
-  <li>{{.}}</li>
-  {{/feedback.results}}
-</ul>
-
-<!-- Everything here will get inserted directly into the pl-submission-panel element at the end of the `question.html`.
-Please remove this section if it is not application for this question. -->
+Everything here will get inserted directly into the pl-submission-panel element at the end of the `question.html`.
+Please remove this section if it is not application for this question.
 
 ### pl-answer-panel
 
diff --git a/tests/test_question_templates/question_expected_outputs/public/q16_workspaces/workspace/file1.txt b/tests/test_question_templates/question_expected_outputs/public/q17_workspaces/workspace/file1.txt
similarity index 100%
rename from tests/test_question_templates/question_expected_outputs/public/q16_workspaces/workspace/file1.txt
rename to tests/test_question_templates/question_expected_outputs/public/q17_workspaces/workspace/file1.txt
diff --git a/tests/test_question_templates/question_expected_outputs/public/q16_workspaces/workspace/file2.txt b/tests/test_question_templates/question_expected_outputs/public/q17_workspaces/workspace/file2.txt
similarity index 100%
rename from tests/test_question_templates/question_expected_outputs/public/q16_workspaces/workspace/file2.txt
rename to tests/test_question_templates/question_expected_outputs/public/q17_workspaces/workspace/file2.txt
diff --git a/tests/test_question_templates/question_expected_outputs/public/q16_workspaces/workspace/filebad.txt b/tests/test_question_templates/question_expected_outputs/public/q17_workspaces/workspace/filebad.txt
similarity index 100%
rename from tests/test_question_templates/question_expected_outputs/public/q16_workspaces/workspace/filebad.txt
rename to tests/test_question_templates/question_expected_outputs/public/q17_workspaces/workspace/filebad.txt
diff --git a/tests/test_question_templates/question_inputs/q16_workspaces/file1.txt b/tests/test_question_templates/question_inputs/q17_workspaces/file1.txt
similarity index 100%
rename from tests/test_question_templates/question_inputs/q16_workspaces/file1.txt
rename to tests/test_question_templates/question_inputs/q17_workspaces/file1.txt
diff --git a/tests/test_question_templates/question_inputs/q16_workspaces/file2.txt b/tests/test_question_templates/question_inputs/q17_workspaces/file2.txt
similarity index 100%
rename from tests/test_question_templates/question_inputs/q16_workspaces/file2.txt
rename to tests/test_question_templates/question_inputs/q17_workspaces/file2.txt
diff --git a/tests/test_question_templates/question_inputs/q16_workspaces/filebad.txt b/tests/test_question_templates/question_inputs/q17_workspaces/filebad.txt
similarity index 100%
rename from tests/test_question_templates/question_inputs/q16_workspaces/filebad.txt
rename to tests/test_question_templates/question_inputs/q17_workspaces/filebad.txt
diff --git a/tests/test_question_templates/question_inputs/q16_workspaces/q16_workspaces.md b/tests/test_question_templates/question_inputs/q17_workspaces/q17_workspaces.md
similarity index 95%
rename from tests/test_question_templates/question_inputs/q16_workspaces/q16_workspaces.md
rename to tests/test_question_templates/question_inputs/q17_workspaces/q17_workspaces.md
index 24fa812f..3daad871 100644
--- a/tests/test_question_templates/question_inputs/q16_workspaces/q16_workspaces.md
+++ b/tests/test_question_templates/question_inputs/q17_workspaces/q17_workspaces.md
@@ -116,14 +116,8 @@ Once you complete these tasks, click on "Save & Grade" below.
 
 ### pl-submission-panel
 
-<ul>
-  {{#feedback.results}}
-  <li>{{.}}</li>
-  {{/feedback.results}}
-</ul>
-
-<!-- Everything here will get inserted directly into the pl-submission-panel element at the end of the `question.html`.
-Please remove this section if it is not application for this question. -->
+Everything here will get inserted directly into the pl-submission-panel element at the end of the `question.html`.
+Please remove this section if it is not application for this question.
 
 ### pl-answer-panel
 
diff --git a/tests/test_question_templates/question_inputs/q16_workspaces/workspace/file1.txt b/tests/test_question_templates/question_inputs/q17_workspaces/workspace/file1.txt
similarity index 100%
rename from tests/test_question_templates/question_inputs/q16_workspaces/workspace/file1.txt
rename to tests/test_question_templates/question_inputs/q17_workspaces/workspace/file1.txt
diff --git a/tests/test_question_templates/question_inputs/q16_workspaces/workspace/file2.txt b/tests/test_question_templates/question_inputs/q17_workspaces/workspace/file2.txt
similarity index 100%
rename from tests/test_question_templates/question_inputs/q16_workspaces/workspace/file2.txt
rename to tests/test_question_templates/question_inputs/q17_workspaces/workspace/file2.txt
diff --git a/tests/test_question_templates/question_inputs/q16_workspaces/workspace/filebad.txt b/tests/test_question_templates/question_inputs/q17_workspaces/workspace/filebad.txt
similarity index 100%
rename from tests/test_question_templates/question_inputs/q16_workspaces/workspace/filebad.txt
rename to tests/test_question_templates/question_inputs/q17_workspaces/workspace/filebad.txt