diff --git a/package-lock.json b/package-lock.json
index a8248606..b00ce7e3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,16 +10,18 @@
       "dependencies": {
         "@fortawesome/fontawesome-free": "^5.15.4",
         "@types/minimatch": "^3.0.5",
-        "ag-client-typescript": "2.6.0",
+        "ag-client-typescript": "2.8.0",
         "chart.js": "^3.9.1",
         "chartjs-adapter-moment": "^1.0.1",
         "chartjs-plugin-zoom": "^1.2.1",
+        "dompurify": "^3.1.6",
         "file-saver": "^2.0.5",
         "highlight.js": "^11.9.0",
         "lodash": "^4.17.21",
         "minimatch": "^3.1.2",
         "moment": "^2.29.4",
         "moment-timezone": "^0.5.43",
+        "showdown": "^2.1.0",
         "vue": "^2.7.14",
         "vue-class-component": "^7.2.6",
         "vue-property-decorator": "^8.5.1",
@@ -28,9 +30,11 @@
       },
       "devDependencies": {
         "@testing-library/jest-dom": "^5.11.9",
+        "@types/dompurify": "^3.0.5",
         "@types/file-saver": "^2.0.1",
         "@types/jest": "^25.2.3",
         "@types/lodash": "^4.14.168",
+        "@types/showdown": "^2.0.6",
         "@types/sinon": "^7.5.2",
         "@vue/cli-plugin-typescript": "^4.5.11",
         "@vue/cli-plugin-unit-jest": "^4.5.11",
@@ -2193,6 +2197,15 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/dompurify": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/@types/dompurify/-/dompurify-3.0.5.tgz",
+      "integrity": "sha512-1Wg0g3BtQF7sSb27fJQAKck1HECM6zV1EB66j8JH9i3LCjYabJa0FSdiSgsD5K/RbrsR0SiraKacLB+T8ZVYAg==",
+      "dev": true,
+      "dependencies": {
+        "@types/trusted-types": "*"
+      }
+    },
     "node_modules/@types/express": {
       "version": "4.17.17",
       "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.17.tgz",
@@ -2385,6 +2398,12 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/showdown": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@types/showdown/-/showdown-2.0.6.tgz",
+      "integrity": "sha512-pTvD/0CIeqe4x23+YJWlX2gArHa8G0J0Oh6GKaVXV7TAeickpkkZiNOgFcFcmLQ5lB/K0qBJL1FtRYltBfbGCQ==",
+      "dev": true
+    },
     "node_modules/@types/sinon": {
       "version": "7.5.2",
       "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-7.5.2.tgz",
@@ -2430,6 +2449,12 @@
         "@types/jest": "*"
       }
     },
+    "node_modules/@types/trusted-types": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz",
+      "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==",
+      "dev": true
+    },
     "node_modules/@types/uglify-js": {
       "version": "3.17.1",
       "resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.17.1.tgz",
@@ -4736,9 +4761,9 @@
       }
     },
     "node_modules/ag-client-typescript": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/ag-client-typescript/-/ag-client-typescript-2.6.0.tgz",
-      "integrity": "sha512-6WLbPhHISELCVC9hcTJzkKZnVbKJ8wM4ICif2s4O5TxSz5jc5/7GCnyzfEhrLn1NyCGCedppswK1uiLUkxm6jA==",
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/ag-client-typescript/-/ag-client-typescript-2.8.0.tgz",
+      "integrity": "sha512-U6wLZAJ28s6elwOJItU1Mk/1He1L6hRd1Oj37LmmlsJV/8Juk/HP5S9iRUwYVUXJo3GT80nH4HzO69x6liYQNw==",
       "dependencies": {
         "axios": "^0.21.1"
       }
@@ -8203,6 +8228,11 @@
         "url": "https://github.com/fb55/domhandler?sponsor=1"
       }
     },
+    "node_modules/dompurify": {
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.1.6.tgz",
+      "integrity": "sha512-cTOAhc36AalkjtBpfG6O8JimdTMWNXjiePT2xQH/ppBGi/4uIpmj8eKyIkMJErXWARyINV/sB38yf8JCLF5pbQ=="
+    },
     "node_modules/domutils": {
       "version": "2.8.0",
       "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
@@ -18421,6 +18451,29 @@
       "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==",
       "dev": true
     },
+    "node_modules/showdown": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/showdown/-/showdown-2.1.0.tgz",
+      "integrity": "sha512-/6NVYu4U819R2pUIk79n67SYgJHWCce0a5xTP979WbNp0FL9MN1I1QK662IDU1b6JzKTvmhgI7T7JYIxBi3kMQ==",
+      "dependencies": {
+        "commander": "^9.0.0"
+      },
+      "bin": {
+        "showdown": "bin/showdown.js"
+      },
+      "funding": {
+        "type": "individual",
+        "url": "https://www.paypal.me/tiviesantos"
+      }
+    },
+    "node_modules/showdown/node_modules/commander": {
+      "version": "9.5.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz",
+      "integrity": "sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==",
+      "engines": {
+        "node": "^12.20.0 || >=14"
+      }
+    },
     "node_modules/side-channel": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
diff --git a/package.json b/package.json
index 566a18b0..892d8c91 100644
--- a/package.json
+++ b/package.json
@@ -11,16 +11,18 @@
   "dependencies": {
     "@fortawesome/fontawesome-free": "^5.15.4",
     "@types/minimatch": "^3.0.5",
-    "ag-client-typescript": "2.6.0",
+    "ag-client-typescript": "2.8.0",
     "chart.js": "^3.9.1",
     "chartjs-adapter-moment": "^1.0.1",
     "chartjs-plugin-zoom": "^1.2.1",
+    "dompurify": "^3.1.6",
     "file-saver": "^2.0.5",
     "highlight.js": "^11.9.0",
     "lodash": "^4.17.21",
     "minimatch": "^3.1.2",
     "moment": "^2.29.4",
     "moment-timezone": "^0.5.43",
+    "showdown": "^2.1.0",
     "vue": "^2.7.14",
     "vue-class-component": "^7.2.6",
     "vue-property-decorator": "^8.5.1",
@@ -29,9 +31,11 @@
   },
   "devDependencies": {
     "@testing-library/jest-dom": "^5.11.9",
+    "@types/dompurify": "^3.0.5",
     "@types/file-saver": "^2.0.1",
     "@types/jest": "^25.2.3",
     "@types/lodash": "^4.14.168",
+    "@types/showdown": "^2.0.6",
     "@types/sinon": "^7.5.2",
     "@vue/cli-plugin-typescript": "^4.5.11",
     "@vue/cli-plugin-unit-jest": "^4.5.11",
diff --git a/src/components/project_admin/ag_tests/ag_test_case_fdbk_config_panel.vue b/src/components/project_admin/ag_tests/ag_test_case_fdbk_config_panel.vue
index 47f78059..88ae2ec1 100644
--- a/src/components/project_admin/ag_tests/ag_test_case_fdbk_config_panel.vue
+++ b/src/components/project_admin/ag_tests/ag_test_case_fdbk_config_panel.vue
@@ -16,6 +16,17 @@
         </label>
       </div>
 
+      <div class="checkbox-input-container">
+        <label class="label">
+          <input data-testid="show_student_description"
+                 type="checkbox"
+                 @change="$emit('input', d_feedback_config)"
+                 class="checkbox"
+                 v-model="d_feedback_config.show_student_description">
+          Show Student-Facing Description
+        </label>
+      </div>
+
       <div class="checkbox-input-container">
         <label class="label">
           <input data-testid="show_individual_commands"
diff --git a/src/components/project_admin/ag_tests/ag_test_case_settings.vue b/src/components/project_admin/ag_tests/ag_test_case_settings.vue
index 84fc31cb..de2331ec 100644
--- a/src/components/project_admin/ag_tests/ag_test_case_settings.vue
+++ b/src/components/project_admin/ag_tests/ag_test_case_settings.vue
@@ -5,67 +5,94 @@
                   @submit="save_ag_test_case_settings"
                   @form_validity_changed="d_settings_form_is_valid = $event">
 
+    <div class="form-field-wrapper">
+      <label class="label"> Test name </label>
+      <validated-input ref="name"
+                       v-model="d_ag_test_case.name"
+                       :validators="[is_not_empty]">
+      </validated-input>
+    </div>
+
+    <div class="form-field-wrapper">
+      <label class="label"> Internal Admin Notes </label>
+      <validated-input ref="internal_admin_notes"
+                       v-model="d_ag_test_case.internal_admin_notes"
+                       :num_rows=3
+                       :validators="[]">
+      </validated-input>
+    </div>
+
+    <div class="form-field-wrapper">
+      <label class="label"> Staff-only description </label>
+      <validated-input ref="staff_description"
+                       v-model="d_ag_test_case.staff_description"
+                       :num_rows=3
+                       :validators="[]">
+      </validated-input>
+    </div>
+
       <div class="form-field-wrapper">
-        <label class="label"> Test name </label>
-        <validated-input ref="name"
-                         v-model="d_ag_test_case.name"
-                         :validators="[is_not_empty]">
-        </validated-input>
-      </div>
-
-      <div ref="fdbk_panels">
-        <AGTestCaseFdbkConfigPanel ref="normal"
-                                   v-model="d_ag_test_case.normal_fdbk_config"
-                                   :config_name="FeedbackConfigLabel.normal">
-          <template slot="header">
-            <div class="config-name">
-              {{FeedbackConfigLabel.normal}}
-              <tooltip width="large" placement="top">
-                {{FeedbackDescriptions.normal}}
-              </tooltip>
-            </div>
-          </template>
-        </AGTestCaseFdbkConfigPanel>
-
-        <AGTestCaseFdbkConfigPanel ref="final_graded"
-                                    v-model="d_ag_test_case.ultimate_submission_fdbk_config"
-                                    :config_name="FeedbackConfigLabel.ultimate_submission">
-          <template slot="header">
-            <div class="config-name">
-              {{FeedbackConfigLabel.ultimate_submission}}
-              <tooltip width="large" placement="top">
-                {{FeedbackDescriptions.ultimate_submission}}
-              </tooltip>
-            </div>
-          </template>
-        </AGTestCaseFdbkConfigPanel>
-
-        <AGTestCaseFdbkConfigPanel ref="past_limit"
-                                    v-model="d_ag_test_case.past_limit_submission_fdbk_config"
-                                    :config_name="FeedbackConfigLabel.past_limit">
-          <template slot="header">
-            <div class="config-name">
-              {{FeedbackConfigLabel.past_limit}}
-              <tooltip width="large" placement="top">
-                {{FeedbackDescriptions.past_limit}}
-              </tooltip>
-            </div>
-          </template>
-        </AGTestCaseFdbkConfigPanel>
-
-        <AGTestCaseFdbkConfigPanel ref="student_lookup"
-                                    v-model="d_ag_test_case.staff_viewer_fdbk_config"
-                                    :config_name="FeedbackConfigLabel.staff_viewer">
-          <template slot="header">
-            <div class="config-name">
-              {{FeedbackConfigLabel.staff_viewer}}
-              <tooltip width="large" placement="top">
-                {{FeedbackDescriptions.staff_viewer}}
-              </tooltip>
-            </div>
-          </template>
-        </AGTestCaseFdbkConfigPanel>
-      </div>
+      <label class="label"> Student-Facing Description </label>
+      <validated-input ref="student_description"
+                       v-model="d_ag_test_case.student_description"
+                       :num_rows=3
+                       :validators="[]">
+      </validated-input>
+    </div>
+
+    <div ref="fdbk_panels">
+      <AGTestCaseFdbkConfigPanel ref="normal"
+                                 v-model="d_ag_test_case.normal_fdbk_config"
+                                 :config_name="FeedbackConfigLabel.normal">
+        <template slot="header">
+          <div class="config-name">
+            {{FeedbackConfigLabel.normal}}
+            <tooltip width="large" placement="top">
+              {{FeedbackDescriptions.normal}}
+            </tooltip>
+          </div>
+        </template>
+      </AGTestCaseFdbkConfigPanel>
+
+      <AGTestCaseFdbkConfigPanel ref="final_graded"
+                                 v-model="d_ag_test_case.ultimate_submission_fdbk_config"
+                                 :config_name="FeedbackConfigLabel.ultimate_submission">
+        <template slot="header">
+          <div class="config-name">
+            {{FeedbackConfigLabel.ultimate_submission}}
+            <tooltip width="large" placement="top">
+              {{FeedbackDescriptions.ultimate_submission}}
+            </tooltip>
+          </div>
+        </template>
+      </AGTestCaseFdbkConfigPanel>
+
+      <AGTestCaseFdbkConfigPanel ref="past_limit"
+                                 v-model="d_ag_test_case.past_limit_submission_fdbk_config"
+                                 :config_name="FeedbackConfigLabel.past_limit">
+        <template slot="header">
+          <div class="config-name">
+            {{FeedbackConfigLabel.past_limit}}
+            <tooltip width="large" placement="top">
+              {{FeedbackDescriptions.past_limit}}
+            </tooltip>
+          </div>
+        </template>
+      </AGTestCaseFdbkConfigPanel>
+
+      <AGTestCaseFdbkConfigPanel ref="student_lookup"
+                                 v-model="d_ag_test_case.staff_viewer_fdbk_config"
+                                 :config_name="FeedbackConfigLabel.staff_viewer">
+        <template slot="header">
+          <div class="config-name">
+            {{FeedbackConfigLabel.staff_viewer}}
+            <tooltip width="large" placement="top">
+              {{FeedbackDescriptions.staff_viewer}}
+            </tooltip>
+          </div>
+        </template>
+      </AGTestCaseFdbkConfigPanel>
+    </div>
 
     <APIErrors ref="api_errors"></APIErrors>
 
diff --git a/src/components/project_admin/ag_tests/ag_test_command_advanced_fdbk_settings.vue b/src/components/project_admin/ag_tests/ag_test_command_advanced_fdbk_settings.vue
index 270978cc..14c68918 100644
--- a/src/components/project_admin/ag_tests/ag_test_command_advanced_fdbk_settings.vue
+++ b/src/components/project_admin/ag_tests/ag_test_command_advanced_fdbk_settings.vue
@@ -13,6 +13,17 @@
         </label>
       </div>
 
+      <div class="checkbox-input-container">
+        <label class="checkbox-label">
+          <input data-testid="show_student_description"
+                  type="checkbox"
+                  class="checkbox"
+                  @change="$emit('input', d_feedback_config)"
+                  v-model="d_feedback_config.show_student_description">
+          Show Student-Facing Descriptions
+        </label>
+      </div>
+
       <div class="advanced-settings-label" @click="toggle_is_open">
         <i v-if="d_is_open" class="fas fa-caret-down caret-down"></i>
         <i v-else class="fas fa-caret-right caret-right"></i>
diff --git a/src/components/project_admin/ag_tests/ag_test_command_settings.vue b/src/components/project_admin/ag_tests/ag_test_command_settings.vue
index 1f432b97..726fa012 100644
--- a/src/components/project_admin/ag_tests/ag_test_command_settings.vue
+++ b/src/components/project_admin/ag_tests/ag_test_command_settings.vue
@@ -62,6 +62,54 @@
         </validated-input>
       </div>
 
+      <div class="form-field-wrapper">
+        <label class="label">
+          Staff-Only Description
+        </label>
+        <validated-input ref="internal_admin_notes"
+                         id="input-internal-admin-notes"
+                         v-model="d_ag_test_command.internal_admin_notes"
+                         :num_rows="2"
+                         :validators="[]">
+        </validated-input>
+      </div>
+
+      <div class="form-field-wrapper">
+        <label class="label">
+          Staff-Only Description
+        </label>
+        <validated-input ref="staff_description"
+                         id="input-staff-description"
+                         v-model="d_ag_test_command.staff_description"
+                         :num_rows="2"
+                         :validators="[]">
+        </validated-input>
+      </div>
+
+      <div class="form-field-wrapper">
+        <label class="label">
+          Student-Facing Description
+        </label>
+        <validated-input ref="student_description"
+                         id="input-student-description"
+                         v-model="d_ag_test_command.student_description"
+                         :num_rows="2"
+                         :validators="[]">
+        </validated-input>
+      </div>
+
+      <div class="form-field-wrapper">
+        <label class="label">
+          Student-Facing Description (On Failure Only)
+        </label>
+        <validated-input ref="student_on_fail_description"
+                         id="input-student-on-faildescription"
+                         v-model="d_ag_test_command.student_on_fail_description"
+                         :num_rows="2"
+                         :validators="[]">
+        </validated-input>
+      </div>
+
       <fieldset class="fieldset">
         <legend class="legend"> Stdin </legend>
         <div class="form-field-wrapper">
@@ -716,7 +764,8 @@ export default class AGTestCommandSettings extends Vue {
         show_actual_return_code: true,
         show_actual_stdout: true,
         show_actual_stderr: true,
-        show_whether_timed_out: true
+        show_whether_timed_out: true,
+        show_student_description: true,
       };
     }
     else {
diff --git a/src/components/project_admin/ag_tests/ag_test_suite_advanced_fdbk_settings.vue b/src/components/project_admin/ag_tests/ag_test_suite_advanced_fdbk_settings.vue
index c44c6f1a..f9ce2515 100644
--- a/src/components/project_admin/ag_tests/ag_test_suite_advanced_fdbk_settings.vue
+++ b/src/components/project_admin/ag_tests/ag_test_suite_advanced_fdbk_settings.vue
@@ -13,6 +13,17 @@
             Suite is Visible
           </label>
         </div>
+
+        <div class="checkbox-input-container">
+          <label class="label">
+            <input data-testid="show_student_description"
+                   type="checkbox"
+                   @change="$emit('input', d_feedback_config)"
+                   class="checkbox"
+                   v-model="d_feedback_config.show_student_description">
+            Show Student-Facing Description
+          </label>
+        </div>
       </div>
 
       <div class="advanced-settings-label" @click="toggle_is_open">
diff --git a/src/components/project_admin/ag_tests/ag_test_suite_settings.vue b/src/components/project_admin/ag_tests/ag_test_suite_settings.vue
index cedeae4f..03ece2d7 100644
--- a/src/components/project_admin/ag_tests/ag_test_suite_settings.vue
+++ b/src/components/project_admin/ag_tests/ag_test_suite_settings.vue
@@ -13,6 +13,30 @@
                         :docker_images="d_docker_images"
                         @field_change="Object.assign(d_ag_test_suite, $event)"></suite-settings>
 
+        <div class="form-field-wrapper">
+          <label class="label">Internal Admin Notes</label>
+          <validated-input ref="internal_admin_notes"
+                           v-model="d_ag_test_suite.internal_admin_notes"
+                           :num_rows="3"
+                           :validators="[]"></validated-input>
+        </div>
+
+        <div class="form-field-wrapper">
+          <label class="label">Staff-only Description</label>
+          <validated-input ref="staff_description"
+                           v-model="d_ag_test_suite.staff_description"
+                           :num_rows="3"
+                           :validators="[]"></validated-input>
+        </div>
+
+        <div class="form-field-wrapper">
+          <label class="label">Student-Facing Description</label>
+          <validated-input ref="student_description"
+                           v-model="d_ag_test_suite.student_description"
+                           :num_rows="3"
+                           :validators="[]"></validated-input>
+        </div>
+
         <fieldset class="fieldset">
           <legend class="legend"> Setup </legend>
 
diff --git a/src/components/project_view/submission_detail/ag_test_case_result_detail.vue b/src/components/project_view/submission_detail/ag_test_case_result_detail.vue
index 1fe529a0..31f93d47 100644
--- a/src/components/project_view/submission_detail/ag_test_case_result_detail.vue
+++ b/src/components/project_view/submission_detail/ag_test_case_result_detail.vue
@@ -1,6 +1,20 @@
 <template>
   <div v-if="ag_test_case_result.ag_test_command_results.length"
        class="ag-case-result">
+    <description-renderer
+      v-if="d_globals.user_roles.is_staff
+            && d_staff_description !== null && d_staff_description !== ''"
+      :text="d_staff_description"
+      ref="staff_description"
+    ></description-renderer>
+
+    <description-renderer
+      v-if="ag_test_case_result.student_description !== null
+            && ag_test_case_result.student_description !== ''"
+      :text="ag_test_case_result.student_description"
+      ref="student_description"
+    ></description-renderer>
+
     <template v-if="ag_test_case_result.ag_test_command_results.length > 1">
       <div v-for="ag_test_command_result of ag_test_case_result.ag_test_command_results">
         <result-panel
@@ -27,29 +41,38 @@
 </template>
 
 <script lang="ts">
-import { Component, Prop, Vue } from 'vue-property-decorator';
+import { Component, Inject, Prop, Vue } from 'vue-property-decorator';
 
 import {
-    AGTestCaseResultFeedback,
-    AGTestCommandResultFeedback,
-    FeedbackCategory,
-    Submission
+  AGTestCase,
+  AGTestCaseResultFeedback,
+  AGTestCommandResultFeedback,
+  FeedbackCategory,
+  Submission
 } from "ag-client-typescript";
 
+import { GlobalData } from '@/app.vue';
 import AGTestCommandResultDetail from '@/components/project_view/submission_detail/ag_test_command_result_detail.vue';
 import { CorrectnessLevel } from '@/components/project_view/submission_detail/correctness';
 import CorrectnessIcon from '@/components/project_view/submission_detail/correctness_icon.vue';
+import DescriptionRenderer from "@/components/project_view/submission_detail/description_renderer.vue";
 import ResultPanel from "@/components/project_view/submission_detail/result_panel.vue";
+import { Created } from '@/lifecycle';
 
 
 @Component({
   components: {
     AGTestCommandResultDetail,
     ResultPanel,
-    CorrectnessIcon
+    CorrectnessIcon,
+    DescriptionRenderer,
   }
 })
-export default class AGTestCaseResultDetail extends Vue {
+export default class AGTestCaseResultDetail extends Vue implements Created {
+  @Inject({from: 'globals'})
+  globals!: GlobalData;
+  d_globals = this.globals;
+
   @Prop({required: true, type: Submission})
   submission!: Submission;
 
@@ -59,8 +82,17 @@ export default class AGTestCaseResultDetail extends Vue {
   @Prop({required: true, type: String})
   fdbk_category!: FeedbackCategory;
 
+  d_staff_description: string | null = null;
+
   readonly CorrectnessLevel = CorrectnessLevel;
 
+  async created() {
+    if (this.d_globals.user_roles.is_staff) {
+      let ag_test_case = await AGTestCase.get_by_pk(this.ag_test_case_result.ag_test_case_pk);
+      this.d_staff_description = ag_test_case.staff_description;
+    }
+  }
+
   command_result_correctness(command_result: AGTestCommandResultFeedback) {
     let return_code_correctness = this.command_result_return_code_correctness(command_result);
     let stdout_correctness = this.command_result_output_correctness(command_result.stdout_correct);
diff --git a/src/components/project_view/submission_detail/ag_test_command_result_detail.vue b/src/components/project_view/submission_detail/ag_test_command_result_detail.vue
index 285e1b94..9321ebc7 100644
--- a/src/components/project_view/submission_detail/ag_test_command_result_detail.vue
+++ b/src/components/project_view/submission_detail/ag_test_command_result_detail.vue
@@ -1,5 +1,26 @@
 <template>
   <div>
+    <description-renderer
+      v-if="d_globals.user_roles.is_staff
+            && d_staff_description !== null && d_staff_description !== ''"
+      :text="d_staff_description"
+      ref="staff_description"
+    ></description-renderer>
+
+    <description-renderer
+      v-if="ag_test_command_result.student_description !== null
+            && ag_test_command_result.student_description !== ''"
+      :text="ag_test_command_result.student_description"
+      ref="student_description"
+    ></description-renderer>
+
+    <description-renderer
+      v-if="ag_test_command_result.student_on_fail_description !== null
+            && ag_test_command_result.student_on_fail_description !== ''"
+      :text="ag_test_command_result.student_on_fail_description"
+      ref="student_on_fail_description"
+    ></description-renderer>
+
     <fieldset ref="correctness" v-if="show_correctness_fieldset" class="fieldset">
       <legend class="legend"> Correctness </legend>
 
@@ -160,28 +181,38 @@
 
 <script lang="ts">
 
-import { Component, Prop, Vue, Watch } from 'vue-property-decorator';
+import { Component, Inject, Prop, Vue, Watch } from 'vue-property-decorator';
 
 import {
-    AGTestCommandResultFeedback,
-    ExpectedReturnCode,
-    FeedbackCategory,
-    ResultOutput,
-    Submission,
-    ValueFeedbackLevel
+  AGTestCommand,
+  AGTestCommandResultFeedback,
+  ExpectedReturnCode,
+  FeedbackCategory,
+  ResultOutput,
+  Submission,
+  ValueFeedbackLevel
 } from "ag-client-typescript";
 
+import { GlobalData } from '@/app.vue';
 import Diff from '@/components/diff.vue';
+import DescriptionRenderer from "@/components/project_view/submission_detail/description_renderer.vue"
 import ViewFile from "@/components/view_file/view_file.vue";
 import { handle_global_errors_async } from '@/error_handling';
+import { Created } from '@/lifecycle';
+
 
 @Component({
   components: {
+    DescriptionRenderer,
     Diff,
     ViewFile
   }
 })
-export default class AGTestCommandResultDetail extends Vue {
+export default class AGTestCommandResultDetail extends Vue implements Created{
+  @Inject({from: 'globals'})
+  globals!: GlobalData;
+  d_globals = this.globals;
+
   @Prop({required: true, type: Submission})
   submission!: Submission;
 
@@ -191,6 +222,8 @@ export default class AGTestCommandResultDetail extends Vue {
   @Prop({required: true, type: String})
   fdbk_category!: FeedbackCategory;
 
+  d_staff_description: string | null = null;
+
   d_output_size: ResultOutput.AGTestCommandResultOutputSize | null = null;
 
   d_stdout_content: Promise<string> | null = null;
@@ -211,7 +244,12 @@ export default class AGTestCommandResultDetail extends Vue {
   readonly ExpectedReturnCode = ExpectedReturnCode;
   readonly ValueFeedbackLevel = ValueFeedbackLevel;
 
-  created() {
+  async created() {
+    if (this.d_globals.user_roles.is_staff) {
+      let ag_test_command = await AGTestCommand.get_by_pk(
+        this.ag_test_command_result.ag_test_command_pk);
+      this.d_staff_description = ag_test_command.staff_description;
+    }
     return this.get_output();
   }
 
diff --git a/src/components/project_view/submission_detail/ag_test_suite_result_detail.vue b/src/components/project_view/submission_detail/ag_test_suite_result_detail.vue
index 1a9d3d2a..8db3b9e0 100644
--- a/src/components/project_view/submission_detail/ag_test_suite_result_detail.vue
+++ b/src/components/project_view/submission_detail/ag_test_suite_result_detail.vue
@@ -2,6 +2,21 @@
   <div class="suite-result">
 
     <div id="ag-test-suite-name">{{ag_test_suite_result.ag_test_suite_name}}</div>
+
+    <description-renderer
+      v-if="d_globals.user_roles.is_staff
+            && d_staff_description !== null && d_staff_description !== ''"
+      :text="d_staff_description"
+      ref="staff_description"
+    ></description-renderer>
+
+    <description-renderer
+      v-if="ag_test_suite_result.student_description !== null
+            && ag_test_suite_result.student_description !== ''"
+      :text="ag_test_suite_result.student_description"
+      ref="student_description"
+    ></description-renderer>
+
     <div class="ag-test-case-results-header">
       <div class="column-1"> Test Case </div>
       <div class="column-2"> Passed </div>
@@ -44,15 +59,17 @@
 </template>
 
 <script lang="ts">
-import { Component, Prop, Vue } from 'vue-property-decorator';
+import { Component, Inject, Prop, Vue } from 'vue-property-decorator';
 
 import {
     AGTestCaseResultFeedback,
+    AGTestSuite,
     AGTestSuiteResultFeedback,
     FeedbackCategory,
     Submission
 } from "ag-client-typescript";
 
+import { GlobalData } from '@/app.vue';
 import AGTestCaseResultDetail from '@/components/project_view/submission_detail/ag_test_case_result_detail.vue';
 import AGTestSuiteSetupResultDetail from '@/components/project_view/submission_detail/ag_test_suite_setup_result_detail.vue';
 import {
@@ -62,17 +79,23 @@ import {
   CorrectnessLevel,
   setup_return_code_correctness
 } from "@/components/project_view/submission_detail/correctness";
+import DescriptionRenderer from "@/components/project_view/submission_detail/description_renderer.vue"
 import ResultPanel from "@/components/project_view/submission_detail/result_panel.vue";
+import { Created } from '@/lifecycle';
 
 
 @Component({
   components: {
     AGTestCaseResultDetail,
     AGTestSuiteSetupResultDetail,
+    DescriptionRenderer,
     ResultPanel
   }
 })
-export default class AGTestSuiteResultDetail extends Vue {
+export default class AGTestSuiteResultDetail extends Vue implements Created {
+  @Inject({from: 'globals'})
+  globals!: GlobalData;
+  d_globals = this.globals;
 
   @Prop({required: true, type: Submission})
   submission!: Submission;
@@ -86,8 +109,17 @@ export default class AGTestSuiteResultDetail extends Vue {
   @Prop({default: false, type: Boolean})
   is_first_suite!: boolean;
 
+  d_staff_description: string | null = null;
+
   readonly CorrectnessLevel = CorrectnessLevel;
 
+  async created() {
+    if (this.d_globals.user_roles.is_staff) {
+      let ag_test_suite = await AGTestSuite.get_by_pk(this.ag_test_suite_result.ag_test_suite_pk);
+      this.d_staff_description = ag_test_suite.staff_description;
+    }
+  }
+
   private get setup_correctness_level(): CorrectnessLevel {
     if (this.ag_test_suite_result.setup_name === null) {
       return CorrectnessLevel.not_available;
diff --git a/src/components/project_view/submission_detail/description_renderer.vue b/src/components/project_view/submission_detail/description_renderer.vue
new file mode 100644
index 00000000..8dcc32ff
--- /dev/null
+++ b/src/components/project_view/submission_detail/description_renderer.vue
@@ -0,0 +1,46 @@
+<template>
+  <div v-html="markdown_rendered" class="description-markdown"></div>
+</template>
+
+<script lang="ts">
+
+import { Component, Prop, Vue } from 'vue-property-decorator';
+
+import DOMPurify from 'dompurify';
+import showdown from 'showdown';
+
+const converter = new showdown.Converter();
+
+@Component({})
+export default class DescriptionRenderer extends Vue {
+  @Prop({required: true, type: String})
+  text!: string;
+
+  get markdown_rendered() : string {
+    return DOMPurify.sanitize(<string> converter.makeHtml(this.text));
+  }
+
+}
+</script>
+
+<style scoped lang="scss">
+@import '@/styles/colors.scss';
+
+.description-markdown {
+  margin: .25rem 0;
+  padding: .625rem .75rem;
+  border: 1px solid $sky-blue;
+
+  :first-child {
+    // Override any margin/padding in the first and last elements in the markdown.
+    margin-top: 0!important;
+    padding-top: 0!important;
+  }
+
+  :last-child {
+    // Override any margin/padding in the first and last elements in the markdown.
+    margin-bottom: 0!important;
+    padding-bottom: 0!important;
+  }
+}
+</style>
diff --git a/tests/data_utils.ts b/tests/data_utils.ts
index e6dc2dfe..641e0a80 100644
--- a/tests/data_utils.ts
+++ b/tests/data_utils.ts
@@ -377,7 +377,8 @@ export function make_ag_test_suite_fdbk_config(
         show_setup_stderr: false,
         show_setup_stdout: false,
         show_setup_timed_out: false,
-        visible: false
+        visible: false,
+        show_student_description: false,
     };
     safe_assign(defaults, args);
     return defaults;
@@ -557,6 +558,8 @@ export function make_ag_test_command_result_feedback(
         pk: AG_TEST_COMMAND_RESULT_FEEDBACK_PKS.next().value,
         ag_test_command_pk: ag_test_command_pk,
         ag_test_command_name: `AG Test Command ${ag_test_command_pk}`,
+        student_description: null,
+        student_on_fail_description: null,
         fdbk_settings: make_ag_test_command_fdbk_config(),
         timed_out: null,
         return_code_correct: null,
@@ -587,6 +590,7 @@ export function make_ag_test_case_result_feedback(
         ag_test_case_pk: ag_test_case_pk,
         ag_test_case_name: `AG Test Case ${ag_test_case_pk}`,
         fdbk_settings: make_ag_test_case_feedback_config(),
+        student_description: null,
         total_points: 0,
         total_points_possible: 0,
         ag_test_command_results: []
@@ -604,6 +608,7 @@ export function make_ag_test_suite_result_feedback(
         pk: AG_TEST_SUITE_RESULT_FEEDBACK_PKS.next().value,
         ag_test_suite_pk: ag_test_suite_pk,
         ag_test_suite_name: `AG Test Suite ${ag_test_suite_pk}`,
+        student_description: null,
         fdbk_settings: make_ag_test_suite_fdbk_config(),
         total_points: 0,
         total_points_possible: 0,
diff --git a/tests/test_components/test_project_admin/test_ag_tests/test_ag_test_case_fdbk_config_panel.ts b/tests/test_components/test_project_admin/test_ag_tests/test_ag_test_case_fdbk_config_panel.ts
index 4346c625..ed707d47 100644
--- a/tests/test_components/test_project_admin/test_ag_tests/test_ag_test_case_fdbk_config_panel.ts
+++ b/tests/test_components/test_project_admin/test_ag_tests/test_ag_test_case_fdbk_config_panel.ts
@@ -63,6 +63,27 @@ describe('AGTestCaseFdbkConfigPanel tests', () => {
         expect(checkbox_is_checked(visible_input)).toEqual(true);
     });
 
+    test('show_student_description binding', async () => {
+        let show_student_description_input = wrapper.find('[data-testid=show_student_description]');
+
+        await show_student_description_input.setChecked(true);
+        expect(component.d_feedback_config!.show_student_description).toEqual(true);
+
+        await show_student_description_input.setChecked(false);
+        expect(component.d_feedback_config!.show_student_description).toEqual(false);
+
+        await show_student_description_input.setChecked(true);
+        expect(component.d_feedback_config!.show_student_description).toEqual(true);
+
+        expect(checkbox_is_checked(show_student_description_input)).toEqual(true);
+
+        await set_data(wrapper, {d_feedback_config: {show_student_description: false}});
+        expect(checkbox_is_checked(show_student_description_input)).toEqual(false);
+
+        await set_data(wrapper, {d_feedback_config: {show_student_description: true}});
+        expect(checkbox_is_checked(show_student_description_input)).toEqual(true);
+    });
+
     test('show_individual_commands binding', async () => {
         let show_individual_commands_input = wrapper.find('[data-testid=show_individual_commands]');
 
diff --git a/tests/test_components/test_project_admin/test_ag_tests/test_ag_test_case_settings.ts b/tests/test_components/test_project_admin/test_ag_tests/test_ag_test_case_settings.ts
index 7ac522a1..a847fe97 100644
--- a/tests/test_components/test_project_admin/test_ag_tests/test_ag_test_case_settings.ts
+++ b/tests/test_components/test_project_admin/test_ag_tests/test_ag_test_case_settings.ts
@@ -109,6 +109,43 @@ describe('AG test case settings form tests', () => {
         expect(api_errors.d_api_errors.length).toBe(1);
     });
 
+    test('Description fields binding', async () => {
+        let internal_admin_notes_input = wrapper.findComponent({ref: 'internal_admin_notes'});
+
+        set_validated_input_text(internal_admin_notes_input, "Test case level description");
+        await wrapper.vm.$nextTick();
+        expect(validated_input_is_valid(internal_admin_notes_input)).toBe(true);
+        expect(
+            component.d_ag_test_case!.internal_admin_notes
+        ).toEqual("Test case level description");
+
+        component.d_ag_test_case!.internal_admin_notes = "Another description";
+        await wrapper.vm.$nextTick();
+        expect(get_validated_input_text(internal_admin_notes_input)).toEqual("Another description");
+
+        let staff_description_input = wrapper.findComponent({ref: 'staff_description'});
+
+        set_validated_input_text(staff_description_input, "Test case level description");
+        await wrapper.vm.$nextTick();
+        expect(validated_input_is_valid(staff_description_input)).toBe(true);
+        expect(component.d_ag_test_case!.staff_description).toEqual("Test case level description");
+
+        component.d_ag_test_case!.staff_description = "Another description";
+        await wrapper.vm.$nextTick();
+        expect(get_validated_input_text(staff_description_input)).toEqual("Another description");
+
+        let student_description_input = wrapper.findComponent({ref: 'student_description'});
+
+        set_validated_input_text(student_description_input, "Student test descriptionnn");
+        await wrapper.vm.$nextTick();
+        expect(validated_input_is_valid(student_description_input)).toBe(true);
+        expect(component.d_ag_test_case!.student_description).toEqual("Student test descriptionnn");
+
+        component.d_ag_test_case!.student_description = "Weeee description";
+        await wrapper.vm.$nextTick();
+        expect(get_validated_input_text(student_description_input)).toEqual("Weeee description");
+    });
+
     test('Feedback config panels always visible', async () => {
         expect(component.d_ag_test_case!.ag_test_commands.length).toEqual(0);
         expect(wrapper.findComponent({ref: 'fdbk_panels'}).exists()).toBe(true);
diff --git a/tests/test_components/test_project_admin/test_ag_tests/test_ag_test_command_advanced_fdbk_settings.ts b/tests/test_components/test_project_admin/test_ag_tests/test_ag_test_command_advanced_fdbk_settings.ts
index 2fd52823..e830f2cd 100644
--- a/tests/test_components/test_project_admin/test_ag_tests/test_ag_test_command_advanced_fdbk_settings.ts
+++ b/tests/test_components/test_project_admin/test_ag_tests/test_ag_test_command_advanced_fdbk_settings.ts
@@ -79,6 +79,27 @@ describe('AGTestCommandAdvancedFdbkSettings tests', () => {
         expect(wrapper.findAll('[data-testid=cmd_is_visible]').length).toEqual(0);
     });
 
+    test('show_student_description binding', async () => {
+        let show_student_description_input = wrapper.find('[data-testid=show_student_description]');
+
+        await show_student_description_input.setChecked(true);
+        expect(wrapper.vm.d_feedback_config!.show_student_description).toEqual(true);
+
+        await show_student_description_input.setChecked(false);
+        expect(wrapper.vm.d_feedback_config!.show_student_description).toEqual(false);
+
+        await show_student_description_input.setChecked(true);
+        expect(wrapper.vm.d_feedback_config!.show_student_description).toEqual(true);
+
+        expect(checkbox_is_checked(show_student_description_input)).toEqual(true);
+
+        await set_data(wrapper, {d_feedback_config: {show_student_description: false}});
+        expect(checkbox_is_checked(show_student_description_input)).toEqual(false);
+
+        await set_data(wrapper, {d_feedback_config: {show_student_description: true}});
+        expect(checkbox_is_checked(show_student_description_input)).toEqual(true);
+    });
+
     test('return_code_fdbk_level binding', async () => {
         await set_data(wrapper, {d_is_open: true});
 
diff --git a/tests/test_components/test_project_admin/test_ag_tests/test_ag_test_command_settings.ts b/tests/test_components/test_project_admin/test_ag_tests/test_ag_test_command_settings.ts
index 1e55eabc..ac79e5bb 100644
--- a/tests/test_components/test_project_admin/test_ag_tests/test_ag_test_command_settings.ts
+++ b/tests/test_components/test_project_admin/test_ag_tests/test_ag_test_command_settings.ts
@@ -204,6 +204,71 @@ describe('AGTestCommandSettings tests', () => {
         return do_invalid_text_input_test(wrapper, {ref: "cmd"}, ' ', '.save-button');
     });
 
+    test('internal_admin_notes binding', async () => {
+        let internal_admin_notes_input = wrapper.findComponent({ref: 'internal_admin_notes'});
+        await set_validated_input_text(internal_admin_notes_input, 'vjhbre');
+
+        expect(wrapper.vm.d_ag_test_command!.internal_admin_notes).toEqual('vjhbre');
+        expect(validated_input_is_valid(internal_admin_notes_input)).toEqual(true);
+
+        await set_validated_input_text(internal_admin_notes_input, '');
+
+        expect(wrapper.vm.d_ag_test_command!.internal_admin_notes).toEqual('');
+        expect(validated_input_is_valid(internal_admin_notes_input)).toEqual(true);
+
+        await set_data(wrapper, {d_ag_test_command: {internal_admin_notes: 'hjdr'}});
+        expect(get_validated_input_text(internal_admin_notes_input)).toEqual('hjdr');
+    });
+
+    test('staff_description binding', async () => {
+        let staff_description_input = wrapper.findComponent({ref: 'staff_description'});
+        await set_validated_input_text(staff_description_input, 'qoieuy');
+
+        expect(wrapper.vm.d_ag_test_command!.staff_description).toEqual('qoieuy');
+        expect(validated_input_is_valid(staff_description_input)).toEqual(true);
+
+        await set_validated_input_text(staff_description_input, '');
+
+        expect(wrapper.vm.d_ag_test_command!.staff_description).toEqual('');
+        expect(validated_input_is_valid(staff_description_input)).toEqual(true);
+
+        await set_data(wrapper, {d_ag_test_command: {staff_description: 'djkfgh'}});
+        expect(get_validated_input_text(staff_description_input)).toEqual('djkfgh');
+    });
+
+    test('student_description binding', async () => {
+        let student_description_input = wrapper.findComponent({ref: 'student_description'});
+        await set_validated_input_text(student_description_input, 'vjhbre');
+
+        expect(wrapper.vm.d_ag_test_command!.student_description).toEqual('vjhbre');
+        expect(validated_input_is_valid(student_description_input)).toEqual(true);
+
+        await set_validated_input_text(student_description_input, '');
+
+        expect(wrapper.vm.d_ag_test_command!.student_description).toEqual('');
+        expect(validated_input_is_valid(student_description_input)).toEqual(true);
+
+        await set_data(wrapper, {d_ag_test_command: {student_description: 'hjdr'}});
+        expect(get_validated_input_text(student_description_input)).toEqual('hjdr');
+    });
+
+    test('student_on_fail_description binding', async () => {
+        let student_on_fail_description_input = wrapper.findComponent(
+            {ref: 'student_on_fail_description'});
+        await set_validated_input_text(student_on_fail_description_input, 'dsuhva');
+
+        expect(wrapper.vm.d_ag_test_command!.student_on_fail_description).toEqual('dsuhva');
+        expect(validated_input_is_valid(student_on_fail_description_input)).toEqual(true);
+
+        await set_validated_input_text(student_on_fail_description_input, '');
+
+        expect(wrapper.vm.d_ag_test_command!.student_on_fail_description).toEqual('');
+        expect(validated_input_is_valid(student_on_fail_description_input)).toEqual(true);
+
+        await set_data(wrapper, {d_ag_test_command: {student_on_fail_description: 'xcnmb'}});
+        expect(get_validated_input_text(student_on_fail_description_input)).toEqual('xcnmb');
+    });
+
     test('stdin_source binding', async () => {
         let stdin_source_input = wrapper.find('#stdin-source');
 
@@ -1200,7 +1265,8 @@ describe('AG test command feedback tests', () => {
             show_actual_return_code: true,
             show_actual_stdout: true,
             show_actual_stderr: true,
-            show_whether_timed_out: true
+            show_whether_timed_out: true,
+            show_student_description: true,
         });
 
         await checkbox.setChecked(false);
diff --git a/tests/test_components/test_project_admin/test_ag_tests/test_ag_test_suite_advanced_fdbk_settings.ts b/tests/test_components/test_project_admin/test_ag_tests/test_ag_test_suite_advanced_fdbk_settings.ts
index 78cfefdb..9ae7406d 100644
--- a/tests/test_components/test_project_admin/test_ag_tests/test_ag_test_suite_advanced_fdbk_settings.ts
+++ b/tests/test_components/test_project_admin/test_ag_tests/test_ag_test_suite_advanced_fdbk_settings.ts
@@ -6,7 +6,7 @@ import AGTestSuiteAdvancedFdbkSettings from '@/components/project_admin/ag_tests
 
 import { make_ag_test_suite_fdbk_config } from '@/tests/data_utils';
 import { managed_mount } from '@/tests/setup';
-import { checkbox_is_checked } from '@/tests/utils';
+import { checkbox_is_checked, set_data } from '@/tests/utils';
 
 
 describe('AGTestSuiteAdvancedFdbkSettings tests', () => {
@@ -49,15 +49,38 @@ describe('AGTestSuiteAdvancedFdbkSettings tests', () => {
         expect(checkbox_is_checked(visible_input)).toEqual(true);
     });
 
+    test('Toggle show_student_description', async () => {
+        let show_student_description_input = wrapper.find('[data-testid=show_student_description]');
+
+        await show_student_description_input.setChecked(true);
+        expect(wrapper.vm.d_feedback_config!.show_student_description).toEqual(true);
+
+        await show_student_description_input.setChecked(false);
+        expect(wrapper.vm.d_feedback_config!.show_student_description).toEqual(false);
+
+        await show_student_description_input.setChecked(true);
+        expect(wrapper.vm.d_feedback_config!.show_student_description).toEqual(true);
+
+        expect(checkbox_is_checked(show_student_description_input)).toEqual(true);
+
+        wrapper.vm.d_feedback_config!.show_student_description = false;
+        await wrapper.vm.$nextTick();
+        expect(checkbox_is_checked(show_student_description_input)).toEqual(false);
+
+        wrapper.vm.d_feedback_config!.show_student_description = true;
+        await wrapper.vm.$nextTick();
+        expect(checkbox_is_checked(show_student_description_input)).toEqual(true);
+    });
+
     test('show_individual_tests binding', async () => {
         await wrapper.setData({d_is_open: true});
 
         let show_individual_tests_input = wrapper.find('[data-testid=show_individual_tests]');
 
-        show_individual_tests_input.setChecked(true);
+        await show_individual_tests_input.setChecked(true);
         expect(wrapper.vm.d_feedback_config!.show_individual_tests).toEqual(true);
 
-        show_individual_tests_input.setChecked(false);
+        await show_individual_tests_input.setChecked(false);
         expect(wrapper.vm.d_feedback_config!.show_individual_tests).toEqual(false);
 
         await show_individual_tests_input.setChecked(true);
@@ -106,13 +129,13 @@ describe('AGTestSuiteAdvancedFdbkSettings tests', () => {
 
         let show_setup_timed_out_input = wrapper.find('[data-testid=show_setup_timed_out]');
 
-        show_setup_timed_out_input.setChecked(true);
+        await show_setup_timed_out_input.setChecked(true);
         expect(wrapper.vm.d_feedback_config!.show_setup_timed_out).toEqual(true);
 
-        show_setup_timed_out_input.setChecked(false);
+        await show_setup_timed_out_input.setChecked(false);
         expect(wrapper.vm.d_feedback_config!.show_setup_timed_out).toEqual(false);
 
-        show_setup_timed_out_input.setChecked(true);
+        await show_setup_timed_out_input.setChecked(true);
         await wrapper.vm.$nextTick();
         expect(wrapper.vm.d_feedback_config!.show_setup_timed_out).toEqual(true);
 
@@ -133,13 +156,13 @@ describe('AGTestSuiteAdvancedFdbkSettings tests', () => {
 
         let show_setup_stdout_input = wrapper.find('[data-testid=show_setup_stdout]');
 
-        show_setup_stdout_input.setChecked(true);
+        await show_setup_stdout_input.setChecked(true);
         expect(wrapper.vm.d_feedback_config!.show_setup_stdout).toEqual(true);
 
-        show_setup_stdout_input.setChecked(false);
+        await show_setup_stdout_input.setChecked(false);
         expect(wrapper.vm.d_feedback_config!.show_setup_stdout).toEqual(false);
 
-        show_setup_stdout_input.setChecked(true);
+        await show_setup_stdout_input.setChecked(true);
         await wrapper.vm.$nextTick();
         expect(wrapper.vm.d_feedback_config!.show_setup_stdout).toEqual(true);
         expect(checkbox_is_checked(show_setup_stdout_input)).toEqual(true);
@@ -159,13 +182,13 @@ describe('AGTestSuiteAdvancedFdbkSettings tests', () => {
 
         let show_setup_stderr_input = wrapper.find('[data-testid=show_setup_stderr]');
 
-        show_setup_stderr_input.setChecked(true);
+        await show_setup_stderr_input.setChecked(true);
         expect(wrapper.vm.d_feedback_config!.show_setup_stderr).toEqual(true);
 
-        show_setup_stderr_input.setChecked(false);
+        await show_setup_stderr_input.setChecked(false);
         expect(wrapper.vm.d_feedback_config!.show_setup_stderr).toEqual(false);
 
-        show_setup_stderr_input.setChecked(true);
+        await show_setup_stderr_input.setChecked(true);
         expect(wrapper.vm.d_feedback_config!.show_setup_stderr).toEqual(true);
 
         expect(checkbox_is_checked(show_setup_stderr_input)).toEqual(true);
@@ -186,7 +209,7 @@ describe('AGTestSuiteAdvancedFdbkSettings tests', () => {
             show_setup_stdout: !feedback_config.show_setup_stdout,
             show_setup_stderr: !feedback_config.show_setup_stderr,
         });
-        wrapper.setProps({'value': new_val});
+        await wrapper.setProps({'value': new_val});
         await wrapper.vm.$nextTick();
 
         expect(wrapper.vm.d_feedback_config!).toEqual(new_val);
@@ -201,10 +224,10 @@ describe('AGTestSuiteAdvancedFdbkSettings tests', () => {
         wrapper.vm.toggle_is_open();
         expect(wrapper.vm.d_is_open).toBe(false);
 
-        wrapper.find('.advanced-settings-label').trigger('click');
+        await wrapper.find('.advanced-settings-label').trigger('click');
         expect(wrapper.vm.d_is_open).toBe(true);
 
-        wrapper.find('.advanced-settings-label').trigger('click');
+        await wrapper.find('.advanced-settings-label').trigger('click');
         expect(wrapper.vm.d_is_open).toBe(false);
     });
 });
diff --git a/tests/test_components/test_project_admin/test_ag_tests/test_ag_test_suite_settings.ts b/tests/test_components/test_project_admin/test_ag_tests/test_ag_test_suite_settings.ts
index 3a407a91..5163631c 100644
--- a/tests/test_components/test_project_admin/test_ag_tests/test_ag_test_suite_settings.ts
+++ b/tests/test_components/test_project_admin/test_ag_tests/test_ag_test_suite_settings.ts
@@ -94,6 +94,38 @@ describe('AGTestSuiteSettings tests', () => {
         expect(wrapper.vm.d_ag_test_suite!.name).toEqual(new_name);
     });
 
+    test('Suite description bindings', async () => {
+        let internal_admin_notes_input = wrapper.findComponent({ref: 'internal_admin_notes'});
+        await set_validated_input_text(internal_admin_notes_input, 'a tall stick for magic');
+
+        expect(wrapper.vm.d_ag_test_suite!.internal_admin_notes).toEqual("a tall stick for magic");
+        expect(validated_input_is_valid(internal_admin_notes_input)).toEqual(true);
+
+        await set_validated_input_text(internal_admin_notes_input, '');
+        expect(wrapper.vm.d_ag_test_suite!.internal_admin_notes).toEqual("");
+        expect(validated_input_is_valid(internal_admin_notes_input)).toEqual(true);
+
+        let staff_description_input = wrapper.findComponent({ref: 'staff_description'});
+        await set_validated_input_text(staff_description_input, 'a tall stick for magic');
+
+        expect(wrapper.vm.d_ag_test_suite!.staff_description).toEqual("a tall stick for magic");
+        expect(validated_input_is_valid(staff_description_input)).toEqual(true);
+
+        await set_validated_input_text(staff_description_input, '');
+        expect(wrapper.vm.d_ag_test_suite!.staff_description).toEqual("");
+        expect(validated_input_is_valid(staff_description_input)).toEqual(true);
+
+        let student_description_input = wrapper.findComponent({ref: 'student_description'});
+        await set_validated_input_text(student_description_input, 'some student description');
+
+        expect(wrapper.vm.d_ag_test_suite!.student_description).toEqual("some student description");
+        expect(validated_input_is_valid(student_description_input)).toEqual(true);
+
+        await set_validated_input_text(student_description_input, '');
+        expect(wrapper.vm.d_ag_test_suite!.student_description).toEqual("");
+        expect(validated_input_is_valid(student_description_input)).toEqual(true);
+    });
+
     test('setup_suite_cmd_name binding', async () => {
         let setup_suite_cmd_name_input = wrapper.findComponent({ref: 'setup_suite_cmd_name'});
         await set_validated_input_text(setup_suite_cmd_name_input, 'sunflower');
diff --git a/tests/test_components/test_project_admin/test_feedback_config_panel.ts b/tests/test_components/test_project_admin/test_feedback_config_panel.ts
index 686b2568..7e79a76a 100644
--- a/tests/test_components/test_project_admin/test_feedback_config_panel.ts
+++ b/tests/test_components/test_project_admin/test_feedback_config_panel.ts
@@ -31,7 +31,8 @@ describe('FeedbackConfigPanel tests', () => {
                     show_setup_return_code: true,
                     show_setup_timed_out: true,
                     show_setup_stdout: true,
-                    show_setup_stderr: true
+                    show_setup_stderr: true,
+                    show_student_description: true,
                 }
             ],
             [
@@ -41,7 +42,8 @@ describe('FeedbackConfigPanel tests', () => {
                     show_setup_return_code: true,
                     show_setup_timed_out: true,
                     show_setup_stdout: false,
-                    show_setup_stderr: false
+                    show_setup_stderr: false,
+                    show_student_description: true,
                 }
             ],
             [
@@ -51,7 +53,8 @@ describe('FeedbackConfigPanel tests', () => {
                     show_setup_return_code: false,
                     show_setup_timed_out: false,
                     show_setup_stdout: false,
-                    show_setup_stderr: false
+                    show_setup_stderr: false,
+                    show_student_description: false,
                 }
             ]
         ]);
diff --git a/tests/test_components/test_project_view/test_submission_detail/test_ag_test_case_result_detail.ts b/tests/test_components/test_project_view/test_submission_detail/test_ag_test_case_result_detail.ts
index 481eab45..5bc74acb 100644
--- a/tests/test_components/test_project_view/test_submission_detail/test_ag_test_case_result_detail.ts
+++ b/tests/test_components/test_project_view/test_submission_detail/test_ag_test_case_result_detail.ts
@@ -1,11 +1,14 @@
 import { mount, Wrapper } from '@vue/test-utils';
 
 import * as ag_cli from 'ag-client-typescript';
+import * as sinon from 'sinon';
 
 import AGTestCaseResultDetail from '@/components/project_view/submission_detail/ag_test_case_result_detail.vue';
 import { CorrectnessLevel } from '@/components/project_view/submission_detail/correctness';
 
 import * as data_ut from '@/tests/data_utils';
+import { managed_shallow_mount } from '@/tests/setup';
+import { wait_fixed, wait_until } from '@/tests/utils';
 
 let group: ag_cli.Group;
 let project: ag_cli.Project;
@@ -13,25 +16,40 @@ let submission: ag_cli.Submission;
 let user: ag_cli.User;
 let ag_test_case_result: ag_cli.AGTestCaseResultFeedback;
 
+let get_ag_test_case_stub: sinon.SinonStub;
+
 beforeEach(() => {
     user = data_ut.make_user();
     project = data_ut.make_project(1);
     group = data_ut.make_group(project.pk, 1, {member_names: [user.username]});
     submission = data_ut.make_submission(group);
     ag_test_case_result = data_ut.make_ag_test_case_result_feedback(1);
+
+    get_ag_test_case_stub = sinon.stub(ag_cli.AGTestCase, 'get_by_pk');
 });
 
+function make_wrapper(user_roles: Partial<ag_cli.UserRoles> = {}) {
+    let wrapper = managed_shallow_mount(AGTestCaseResultDetail, {
+        propsData: {
+            submission: submission,
+            ag_test_case_result: ag_test_case_result,
+            fdbk_category: ag_cli.FeedbackCategory.max,
+        },
+        provide: {
+            globals: {
+                user_roles: data_ut.make_user_roles(user_roles),
+            },
+        },
+    });
+
+    return wrapper;
+}
+
 describe('command_result_correctness tests', () => {
     let wrapper: Wrapper<AGTestCaseResultDetail>;
 
     beforeEach(() => {
-        wrapper = mount(AGTestCaseResultDetail, {
-            propsData: {
-                ag_test_case_result: ag_test_case_result,
-                fdbk_category: ag_cli.FeedbackCategory.max,
-                submission: submission,
-            }
-        });
+        wrapper = make_wrapper();
     });
 
     test('command_result_correctness - return_code_correctness === not_available AND' +
@@ -622,13 +640,7 @@ describe('command_result_return_code_correctness tests', () => {
     let wrapper: Wrapper<AGTestCaseResultDetail>;
 
     beforeEach(() => {
-        wrapper = mount(AGTestCaseResultDetail, {
-            propsData: {
-                ag_test_case_result: ag_test_case_result,
-                fdbk_category: ag_cli.FeedbackCategory.max,
-                submission: submission
-            }
-        });
+        wrapper = make_wrapper();
     });
 
     test('command_result_return_code_correctness - return_code_correct === null', async () => {
@@ -691,13 +703,7 @@ describe('command_result_output_correctness tests', () => {
     let wrapper: Wrapper<AGTestCaseResultDetail>;
 
     beforeEach(() => {
-        wrapper = mount(AGTestCaseResultDetail, {
-            propsData: {
-                ag_test_case_result: ag_test_case_result,
-                fdbk_category: ag_cli.FeedbackCategory.max,
-                submission: submission
-            }
-        });
+        wrapper = make_wrapper();
     });
 
     test('command_result_output_correctness - output is not available', async () => {
@@ -751,13 +757,7 @@ describe('AGTestCaseResult tests concerning props', () => {
     let wrapper: Wrapper<AGTestCaseResultDetail>;
 
     beforeEach(() => {
-        wrapper = mount(AGTestCaseResultDetail, {
-            propsData: {
-                ag_test_case_result: ag_test_case_result,
-                fdbk_category: ag_cli.FeedbackCategory.max,
-                submission: submission,
-            }
-        });
+        wrapper = make_wrapper();
     });
 
     test('ag_test_case_result prop changes reflected in html', async () => {
@@ -822,3 +822,85 @@ describe('AGTestCaseResult tests concerning props', () => {
         )).toEqual(CorrectnessLevel.some_correct);
     });
 });
+
+describe('Test Case Descriptions', () => {
+    beforeEach(() => {
+        let test_case = data_ut.make_ag_test_case(
+            ag_test_case_result.ag_test_case_pk,
+            {staff_description: 'some staff test description'});
+        get_ag_test_case_stub.withArgs(
+            ag_test_case_result.ag_test_case_pk
+        ).resolves(test_case);
+
+        ag_test_case_result.ag_test_command_results = [
+            data_ut.make_ag_test_command_result_feedback(1, {})
+        ];
+    });
+
+    test('Staff description shown to staff', async () => {
+        let wrapper = make_wrapper({is_staff: true});
+
+        expect(await wait_until(wrapper, w => w.vm!.d_staff_description !== null)).toBe(true);
+        let staff_description = wrapper.findComponent({ref: 'staff_description'});
+        expect(staff_description.vm!.text).toEqual('some staff test description');
+    });
+
+    test('Staff description not shown when null', async () => {
+        let wrapper = make_wrapper({is_staff: true});
+
+        expect(await wait_until(wrapper, w => w.vm!.d_staff_description !== null)).toBe(true);
+        let staff_description = wrapper.findComponent({ref: 'staff_description'});
+        expect(staff_description.vm!.text).toEqual('some staff test description');
+
+        wrapper.vm!.d_staff_description = null;
+        await wait_fixed(wrapper, 10);
+
+        expect(wrapper.findComponent({ref: 'staff_description'}).exists()).toBe(false);
+    });
+
+    test('Staff description not shown when empty', async () => {
+        let wrapper = make_wrapper({is_staff: true});
+
+        expect(await wait_until(wrapper, w => w.vm!.d_staff_description !== null)).toBe(true);
+        let staff_description = wrapper.findComponent({ref: 'staff_description'});
+        expect(staff_description.vm!.text).toEqual('some staff test description');
+
+        wrapper.vm!.d_staff_description = '';
+        await wait_fixed(wrapper, 10);
+
+        expect(wrapper.findComponent({ref: 'staff_description'}).exists()).toBe(false);
+    });
+
+    test('Staff description not shown to student', async () => {
+        let wrapper = make_wrapper({is_staff: false, is_student: true});
+
+        await wait_fixed(wrapper, 10);
+        expect(wrapper.findComponent({ref: 'staff_description'}).exists()).toBe(false);
+    });
+
+    test('Student description visible', async () => {
+        ag_test_case_result.student_description = 'hellooo student';
+
+        let wrapper = make_wrapper();
+        let student_description = wrapper.findComponent({ref: 'student_description'});
+        expect(student_description.vm!.text).toEqual('hellooo student');
+    });
+
+    test('Student description hidden', async () => {
+        ag_test_case_result.student_description = null;
+
+        let wrapper = make_wrapper();
+        await wait_fixed(wrapper, 10);
+        let student_description = wrapper.findComponent({ref: 'student_description'});
+        expect(student_description.exists()).toBe(false);
+    });
+
+    test('Student description empty', async () => {
+        ag_test_case_result.student_description = '';
+
+        let wrapper = make_wrapper();
+        await wait_fixed(wrapper, 10);
+        let student_description = wrapper.findComponent({ref: 'student_description'});
+        expect(student_description.exists()).toBe(false);
+    });
+});
diff --git a/tests/test_components/test_project_view/test_submission_detail/test_ag_test_command_result_detail.ts b/tests/test_components/test_project_view/test_submission_detail/test_ag_test_command_result_detail.ts
index f69a9392..adc65464 100644
--- a/tests/test_components/test_project_view/test_submission_detail/test_ag_test_command_result_detail.ts
+++ b/tests/test_components/test_project_view/test_submission_detail/test_ag_test_command_result_detail.ts
@@ -21,6 +21,8 @@ let stderr_stub: sinon.SinonStub;
 let stdout_diff_stub: sinon.SinonStub;
 let stderr_diff_stub: sinon.SinonStub;
 
+let get_ag_test_cmd_stub: sinon.SinonStub;
+
 beforeEach(() => {
     let project = data_ut.make_project(data_ut.make_course().pk);
     group = data_ut.make_group(project.pk);
@@ -64,15 +66,22 @@ beforeEach(() => {
         ag_cli.ResultOutput,
         'get_ag_test_cmd_result_stderr_diff'
     ).rejects(new ag_cli.HttpError(500, 'Stub me'));
+
+    get_ag_test_cmd_stub = sinon.stub(ag_cli.AGTestCommand, 'get_by_pk');
 });
 
-async function make_wrapper() {
+async function make_wrapper(user_roles: Partial<ag_cli.UserRoles> = {}) {
     let wrapper = managed_mount(AGTestCommandResultDetail, {
         propsData: {
             submission: submission,
             ag_test_command_result: ag_test_command_result,
             fdbk_category: ag_cli.FeedbackCategory.max
-        }
+        },
+        provide: {
+            globals: {
+                user_roles: data_ut.make_user_roles(user_roles),
+            },
+        },
     });
     expect(await wait_until(wrapper, w => w.vm.d_output_size !== null));
     return wrapper;
@@ -470,3 +479,107 @@ test('Output reloaded on fdbk category change', async () => {
     expect(stdout_diff_stub.calledTwice).toBe(true);
     expect(stderr_diff_stub.calledTwice).toBe(true);
 });
+
+describe('Command Descriptions', () => {
+     beforeEach(() => {
+        let test_command = data_ut.make_ag_test_command(
+            ag_test_command_result.ag_test_command_pk,
+            {staff_description: 'some staff command description'});
+        get_ag_test_cmd_stub.withArgs(
+            ag_test_command_result.ag_test_command_pk
+        ).resolves(test_command);
+    });
+
+    test('Staff description shown to staff', async () => {
+        let wrapper = await make_wrapper({is_staff: true});
+
+        expect(await wait_until(wrapper, w => w.vm!.d_staff_description !== null)).toBe(true);
+        let staff_description = wrapper.findComponent({ref: 'staff_description'});
+        expect(staff_description.vm!.text).toEqual('some staff command description');
+    });
+
+    test('Staff description not shown when null', async () => {
+        let wrapper = await make_wrapper({is_staff: true});
+
+        expect(await wait_until(wrapper, w => w.vm!.d_staff_description !== null)).toBe(true);
+        let staff_description = wrapper.findComponent({ref: 'staff_description'});
+        expect(staff_description.vm!.text).toEqual('some staff command description');
+
+        wrapper.vm!.d_staff_description = null;
+        await wait_fixed(wrapper, 10);
+
+        expect(wrapper.findComponent({ref: 'staff_description'}).exists()).toBe(false);
+    });
+
+    test('Staff description not shown when empty', async () => {
+        let wrapper = await make_wrapper({is_staff: true});
+
+        expect(await wait_until(wrapper, w => w.vm!.d_staff_description !== null)).toBe(true);
+        let staff_description = wrapper.findComponent({ref: 'staff_description'});
+        expect(staff_description.vm!.text).toEqual('some staff command description');
+
+        wrapper.vm!.d_staff_description = '';
+        await wait_fixed(wrapper, 10);
+
+        expect(wrapper.findComponent({ref: 'staff_description'}).exists()).toBe(false);
+    });
+
+    test('Staff description not shown to student', async () => {
+        let wrapper = await make_wrapper({is_staff: false, is_student: true});
+
+        await wait_fixed(wrapper, 10);
+        expect(wrapper.findComponent({ref: 'staff_description'}).exists()).toBe(false);
+    });
+
+    test('Student description visible', async () => {
+        ag_test_command_result.student_description = 'hellooo student';
+
+        let wrapper = await make_wrapper();
+        let student_description = wrapper.findComponent({ref: 'student_description'});
+        expect(student_description.vm!.text).toEqual('hellooo student');
+    });
+
+    test('Student description hidden', async () => {
+        ag_test_command_result.student_description = null;
+
+        let wrapper = await make_wrapper();
+        await wait_fixed(wrapper, 10);
+        let student_description = wrapper.findComponent({ref: 'student_description'});
+        expect(student_description.exists()).toBe(false);
+    });
+
+    test('Student description empty', async () => {
+        ag_test_command_result.student_description = '';
+
+        let wrapper = await make_wrapper();
+        await wait_fixed(wrapper, 10);
+        let student_description = wrapper.findComponent({ref: 'student_description'});
+        expect(student_description.exists()).toBe(false);
+    });
+
+    test('Student on-fail description visible', async () => {
+        ag_test_command_result.student_on_fail_description = 'faaail';
+
+        let wrapper = await make_wrapper();
+        let student_description = wrapper.findComponent({ref: 'student_on_fail_description'});
+        expect(student_description.vm!.text).toEqual('faaail');
+    });
+
+    test('Student on-fail description hidden', async () => {
+        ag_test_command_result.student_on_fail_description = null;
+
+        let wrapper = await make_wrapper();
+        await wait_fixed(wrapper, 10);
+        let student_description = wrapper.findComponent({ref: 'student_on_fail_description'});
+        expect(student_description.exists()).toBe(false);
+    });
+
+    test('Student on-fail description empty', async () => {
+        ag_test_command_result.student_on_fail_description = '';
+
+        let wrapper = await make_wrapper();
+        await wait_fixed(wrapper, 10);
+        let student_description = wrapper.findComponent({ref: 'student_on_fail_description'});
+        expect(student_description.exists()).toBe(false);
+    });
+});
diff --git a/tests/test_components/test_project_view/test_submission_detail/test_ag_test_suite_result_detail.ts b/tests/test_components/test_project_view/test_submission_detail/test_ag_test_suite_result_detail.ts
index 2092e9d2..12dab662 100644
--- a/tests/test_components/test_project_view/test_submission_detail/test_ag_test_suite_result_detail.ts
+++ b/tests/test_components/test_project_view/test_submission_detail/test_ag_test_suite_result_detail.ts
@@ -1,6 +1,7 @@
 import { Wrapper } from '@vue/test-utils';
 
 import * as ag_cli from 'ag-client-typescript';
+import * as sinon from 'sinon';
 
 import AGTestSuiteResultDetail from '@/components/project_view/submission_detail/ag_test_suite_result_detail.vue';
 import { CorrectnessLevel } from '@/components/project_view/submission_detail/correctness';
@@ -8,6 +9,7 @@ import ResultPanel from '@/components/project_view/submission_detail/result_pane
 
 import * as data_ut from '@/tests/data_utils';
 import { managed_shallow_mount } from '@/tests/setup';
+import { wait_fixed, wait_until } from '@/tests/utils';
 
 let group: ag_cli.Group;
 let submission: ag_cli.Submission;
@@ -18,6 +20,8 @@ let ag_test_command_1_result: ag_cli.AGTestCommandResultFeedback;
 let ag_test_command_2_result: ag_cli.AGTestCommandResultFeedback;
 let ag_test_command_3_result: ag_cli.AGTestCommandResultFeedback;
 
+let get_ag_test_suite_stub: sinon.SinonStub;
+
 beforeEach(() => {
     user = data_ut.make_user();
     group = data_ut.make_group(1, 1, {member_names: [user.username]});
@@ -55,6 +59,10 @@ beforeEach(() => {
     ag_test_suite_result.ag_test_case_results = [
         ag_test_case_result
     ];
+
+    get_ag_test_suite_stub = sinon.stub(
+        ag_cli.AGTestSuite, 'get_by_pk'
+    ).resolves(data_ut.make_ag_test_suite(group.project));
 });
 
 function set_command_result_correctness(command: ag_cli.AGTestCommandResultFeedback,
@@ -78,14 +86,19 @@ function check_all_case_correctness_levels(wrapper: Wrapper<AGTestSuiteResultDet
     expect(wrapper.vm.case_result_correctness(case_result)).toEqual(overall_correctness);
 }
 
-function make_wrapper(is_first_suite: boolean) {
+function make_wrapper(is_first_suite: boolean, user_roles: Partial<ag_cli.UserRoles> = {}) {
     let wrapper = managed_shallow_mount(AGTestSuiteResultDetail, {
         propsData: {
             submission: submission,
             ag_test_suite_result: ag_test_suite_result,
             fdbk_category: ag_cli.FeedbackCategory.max,
             is_first_suite: is_first_suite
-        }
+        },
+        provide: {
+            globals: {
+                user_roles: data_ut.make_user_roles(user_roles),
+            },
+        },
     });
 
     return wrapper;
@@ -948,3 +961,80 @@ describe('First failed test case result panel open initially tests', () => {
         expect(second.open_initially).toBe(false);
     });
 });
+
+describe('Suite Descriptions', () => {
+    beforeEach(() => {
+        let suite = data_ut.make_ag_test_suite(
+            group.project, {staff_description: 'hello this is an description for the staff'});
+        get_ag_test_suite_stub.withArgs(
+            ag_test_suite_result.ag_test_suite_pk
+        ).resolves(suite);
+    });
+
+    test('Staff description shown to staff', async () => {
+        let wrapper = make_wrapper(true, {is_staff: true});
+
+        expect(await wait_until(wrapper, w => w.vm!.d_staff_description !== null)).toBe(true);
+        let staff_description = wrapper.findComponent({ref: 'staff_description'});
+        expect(staff_description.vm!.text).toEqual('hello this is an description for the staff');
+    });
+
+    test('Staff description not shown when null', async () => {
+        let wrapper = make_wrapper(true, {is_staff: true});
+
+        expect(await wait_until(wrapper, w => w.vm!.d_staff_description !== null)).toBe(true);
+        let staff_description = wrapper.findComponent({ref: 'staff_description'});
+        expect(staff_description.vm!.text).toEqual('hello this is an description for the staff');
+
+        wrapper.vm!.d_staff_description = null;
+        await wait_fixed(wrapper, 10);
+
+        expect(wrapper.findComponent({ref: 'staff_description'}).exists()).toBe(false);
+    });
+
+    test('Staff description not shown when empty', async () => {
+        let wrapper = make_wrapper(true, {is_staff: true});
+
+        expect(await wait_until(wrapper, w => w.vm!.d_staff_description !== null)).toBe(true);
+        let staff_description = wrapper.findComponent({ref: 'staff_description'});
+        expect(staff_description.vm!.text).toEqual('hello this is an description for the staff');
+
+        wrapper.vm!.d_staff_description = '';
+        await wait_fixed(wrapper, 10);
+
+        expect(wrapper.findComponent({ref: 'staff_description'}).exists()).toBe(false);
+    });
+
+    test('Staff description not shown to student', async () => {
+        let wrapper = make_wrapper(true, {is_staff: false, is_student: true});
+
+        await wait_fixed(wrapper, 10);
+        expect(wrapper.findComponent({ref: 'staff_description'}).exists()).toBe(false);
+    });
+
+    test('Student description visible', () => {
+        ag_test_suite_result.student_description = 'hello student';
+
+        let wrapper = make_wrapper(true);
+        let student_description = wrapper.findComponent({ref: 'student_description'});
+        expect(student_description.vm!.text).toEqual('hello student');
+    });
+
+    test('Student description hidden', async () => {
+        ag_test_suite_result.student_description = null;
+
+        let wrapper = make_wrapper(true);
+        await wait_fixed(wrapper, 10);
+        let student_description = wrapper.findComponent({ref: 'student_description'});
+        expect(student_description.exists()).toBe(false);
+    });
+
+    test('Student description empty', async () => {
+        ag_test_suite_result.student_description = '';
+
+        let wrapper = make_wrapper(true);
+        await wait_fixed(wrapper, 10);
+        let student_description = wrapper.findComponent({ref: 'student_description'});
+        expect(student_description.exists()).toBe(false);
+    });
+});