diff --git a/client/src/App.vue b/client/src/App.vue
index 4e4f6093..b5032a4a 100644
--- a/client/src/App.vue
+++ b/client/src/App.vue
@@ -6,15 +6,12 @@
     </div>
 
     <a-layout id="components-layout-demo-responsive">
-      <div class="logo" />
-      <Navigation />
       <a-layout>
-        <a-layout-header
-          :style="{ background: '#fff', padding: 0, height: 'auto' }"
-        >
+        <a-layout-header style="height: auto">
+          <Navigation />
         </a-layout-header>
         <a-layout-content
-          style="margin: '0px auto'; box-sizing: border-box; padding: 2rem 4rem; width: 100%; min-height: calc(100vh - 46px - 69px);"
+          style="margin: auto; box-sizing: border-box; padding: 0rem 4rem; width: 100%;"
         >
           <div :style="{ padding: '0px', minHeight: '360px', width: '100%' }">
             <router-view></router-view>
@@ -51,6 +48,11 @@ export default {
 .prototype-warning {
   border: 2px solid red;
   font-size: 20px;
+  height: 35px;
   background-color: #ffdddd;
 }
+
+  #components-layout-demo-responsive {
+    height: calc(100vh - 35px);
+  }
 </style>
diff --git a/client/src/api/Api.js b/client/src/api/Api.js
index c598c6de..475cd8e4 100644
--- a/client/src/api/Api.js
+++ b/client/src/api/Api.js
@@ -42,7 +42,27 @@ class Api {
   }
 
   /*
-   * ----------------------------------
+   * -----------IMPLEMENTED IN UI-----------
+   */
+
+  postInstitution(request) {
+    return this.executeRequest("/institutions", METHOD.POST, request);
+  }
+
+  postPatient(request) {
+    return this.executeRequest("/patients", METHOD.POST, request);
+  }
+
+  postLabTest(request) {
+    return this.executeRequest("/labtests", METHOD.POST, request);
+  }
+
+  putLabTest(testId, request) {
+    return this.executeRequest(`/labtests/${testId}`, METHOD.PUT, request);
+  }
+
+  /*
+   * ---------NOT IMPLEMENTED IN UI---------
    */
 
   postDoctorCreateAppointment({ doctorId, laboratoryId, patientId }) {
@@ -74,19 +94,7 @@ class Api {
   }
 
   deleteTestReport(testId) {
-    return this.executeRequest(`/test_report/${testId}`, METHOD.DELETE);
-  }
-
-  postInstitution(institution) {
-    return this.executeRequest("/institutions", METHOD.POST, institution);
-  }
-
-  postLabtest(labtest) {
-    return this.executeRequest("/labtest", METHOD.POST, labtest);
-  }
-
-  putLabtest({ updatedTestStatus }) {
-    return this.executeRequest("/labtest", METHOD.PUT, updatedTestStatus);
+    return this.executeRequest(`/test_reports/${testId}`, METHOD.DELETE);
   }
 
   getLabtestByPatient(patientId) {
@@ -97,10 +105,6 @@ class Api {
     return this.executeRequest("/patients", METHOD.GET);
   }
 
-  postPatient(patient) {
-    return this.executeRequest("/patients", METHOD.POST, patient);
-  }
-
   getPatient(id) {
     return this.executeRequest(`/patients/${id}`, METHOD.GET);
   }
diff --git a/client/src/components/Navigation.vue b/client/src/components/Navigation.vue
index c73827a2..1baf1759 100644
--- a/client/src/components/Navigation.vue
+++ b/client/src/components/Navigation.vue
@@ -19,15 +19,15 @@ const items = [
   },
   {
     key: "2",
-    url: "/link-sample-and-patient",
+    url: "/link-test-and-patient",
     type: "deployment-unit",
-    text: "Probe Zuordnen"
+    text: "Test Zuordnen"
   },
   {
     key: "3",
     url: "/link-test-result",
     type: "experiment",
-    text: "Laborresultate"
+    text: "Testresultat Zuordnen"
   },
   { key: "4", url: "/patient-overview", type: "user", text: "Patienten-Daten" },
   { key: "5", url: "/all-data", type: "team", text: "Alle Patienten" },
diff --git a/client/src/components/laboratory/LinkSampleAndPatient.vue b/client/src/components/laboratory/LinkSampleAndPatient.vue
deleted file mode 100644
index 2e7e5373..00000000
--- a/client/src/components/laboratory/LinkSampleAndPatient.vue
+++ /dev/null
@@ -1,91 +0,0 @@
-<template>
-  <a-card style="width: 500px; margin: 2rem auto; min-height: 300px">
-    <a-form
-      :label-col="{ span: 6 }"
-      :wrapper-col="{ span: 18 }"
-      :colon="false"
-      @submit="handleSubmit"
-    >
-      <a-form-item label="Patienten-ID">
-        <a-input
-          v-decorator="[
-            'note',
-            {
-              rules: [
-                {
-                  required: true,
-                  message: 'Bitte geben Sie die Patienten-ID ein.'
-                }
-              ]
-            }
-          ]"
-          placeholder="z.B 1337-4237-9438"
-        />
-      </a-form-item>
-      <a-form-item label="Proben-ID">
-        <a-input
-          v-decorator="[
-            'note',
-            {
-              rules: [
-                {
-                  required: true,
-                  message: 'Bitte geben Sie Ihre Proben-ID ein.'
-                }
-              ]
-            }
-          ]"
-          placeholder="z.B ae48-hr43-sk97"
-        />
-      </a-form-item>
-      <a-form-item label="Kommentar">
-        <a-textarea
-          placeholder="Kommentar hinzufügen"
-          :autoSize="{ minRows: 3, maxRows: 5 }"
-        />
-      </a-form-item>
-      <a-divider />
-      <a-form-item :wrapper-col="{ span: 24, offset: 0 }">
-        <a-button type="primary" html-type="submit">
-          Speichern
-        </a-button>
-      </a-form-item>
-    </a-form>
-  </a-card>
-</template>
-
-<script>
-// TODO: Use form from ant and to get the values from the <form> (see PatientDataCompontent)
-
-export default {
-  name: "LinkSampleAndPatient",
-  methods: {
-    handleSubmit(e) {
-      e.preventDefault();
-
-      // TODO: Send request to connect patient with sample
-      console.log("Handle connect patient with sample");
-
-      const patientId = "198424989813";
-      const sampleId = "91029310923";
-
-      // TODO: Handle response from server
-      const response = { type: "success" };
-      const { type } = response;
-
-      // Check notification type (success, info, warning, error)
-      const notification = {};
-      if (type === "success") {
-        notification.message = "Verknüpfung erfolgreich.";
-        notification.description = `Patienten ID: ${patientId} & Proben ID: ${sampleId}.`;
-      } else if (type === "error") {
-        notification.message = "Es is ein Fehler aufgetreten.";
-        notification.description = `Patienten ID: ${patientId} & Proben ID: ${sampleId}.`;
-      }
-      this.$notification[type](notification);
-    }
-  }
-};
-</script>
-
-<style></style>
diff --git a/client/src/components/laboratory/LinkTestAndPatient.vue b/client/src/components/laboratory/LinkTestAndPatient.vue
new file mode 100644
index 00000000..0d56584a
--- /dev/null
+++ b/client/src/components/laboratory/LinkTestAndPatient.vue
@@ -0,0 +1,122 @@
+<template>
+  <a-card style="width: 500px; margin: 2rem auto; min-height: 300px">
+    <div v-if="!createdLabTest">
+      <a-form
+        :label-col="{ span: 6 }"
+        :wrapper-col="{ span: 18 }"
+        :colon="false"
+        :form="form"
+        @submit="handleSubmit"
+      >
+        <a-form-item label="Patienten-ID">
+          <a-input
+            v-decorator="[
+              'patientId',
+              {
+                rules: [
+                  {
+                    required: true,
+                    message: 'Bitte geben Sie die Patienten-ID ein.'
+                  }
+                ]
+              }
+            ]"
+            placeholder="z.B 1337-4237-9438"
+          />
+        </a-form-item>
+        <a-form-item label="Test-ID">
+          <a-input
+            v-decorator="[
+              'testId',
+              {
+                rules: [
+                  {
+                    required: true,
+                    message: 'Bitte geben Sie die Test-ID ein.'
+                  }
+                ]
+              }
+            ]"
+            placeholder="z.B ae48-hr43-sk97"
+          />
+        </a-form-item>
+        <a-form-item label="Kommentar">
+          <a-textarea
+            v-decorator="['comment']"
+            placeholder="Kommentar hinzufügen"
+            :autoSize="{ minRows: 3, maxRows: 5 }"
+          />
+        </a-form-item>
+        <a-divider />
+        <a-form-item :wrapper-col="{ span: 24, offset: 0 }">
+          <a-button type="primary" html-type="submit">
+            Speichern
+          </a-button>
+        </a-form-item>
+      </a-form>
+    </div>
+    <div v-else>
+      <div>Der Test wurde erfolgreich angelegt.</div>
+      <br />
+      <div>Test ID: {{ createdLabTest.id }}</div>
+      <div>Test Status: {{ createdLabTest.testStatus }}</div>
+    </div>
+  </a-card>
+</template>
+
+<script>
+import Api from "../../api/Api";
+
+export default {
+  name: "LinkTestAndPatient",
+  props: {
+    laboratoryId: {
+      type: String,
+      required: true
+    }
+  },
+  data() {
+    return {
+      form: this.$form.createForm(this),
+      createdLabTest: null
+    };
+  },
+  methods: {
+    handleSubmit(e) {
+      e.preventDefault();
+
+      this.form.validateFields((err, values) => {
+        if (err) {
+          return;
+        }
+
+        const request = {
+          ...values,
+          laboratoryId: this.laboratoryId
+        };
+
+        Api.postLabTest(request)
+          .then(labTest => {
+            this.createdLabTest = labTest;
+
+            const notification = {
+              message: "Test angelegt und verknüpft.",
+              description:
+                "Der Test wurde erfolgreich angelegt und mit dem Patienten verknüpft."
+            };
+            this.$notification["success"](notification);
+          })
+          .catch(err => {
+            const notification = {
+              message: "Fehler beim Anlegen des Tests.",
+              description: err.message
+            };
+            this.$notification["error"](notification);
+          });
+      });
+    }
+  }
+};
+</script>
+
+<style></style>
diff --git a/client/src/components/laboratory/LinkTestResultAndPatient.vue b/client/src/components/laboratory/LinkTestResultAndPatient.vue
index fe2b9abd..5db3a0a3 100644
--- a/client/src/components/laboratory/LinkTestResultAndPatient.vue
+++ b/client/src/components/laboratory/LinkTestResultAndPatient.vue
@@ -1,84 +1,150 @@
 <template>
   <a-card style="width: 500px; margin: 2rem auto; min-height: 300px">
-    <a-form
-      :label-col="{ span: 6 }"
-      :wrapper-col="{ span: 18 }"
-      @submit="handleSubmit"
-    >
-      <a-form-item label="Proben-ID">
-        <a-input
-          v-decorator="[
-            'note',
-            {
-              rules: [
-                { required: true, message: 'Bitte geben Sie Ihre Test-ID ein.' }
-              ]
-            }
-          ]"
-          placeholder="z.B 1337-4237-9438"
-        />
-      </a-form-item>
-      <a-form-item label="Testresultat">
-        <a-radio-group v-decorator="['radio-group']">
-          <a-radio value="true">
-            Positiv
-          </a-radio>
-          <a-radio value="false">
-            Negativ
-          </a-radio>
-        </a-radio-group>
-      </a-form-item>
-      <a-form-item label="Kommentar">
-        <a-textarea
-          placeholder="Kommentar hinzufügen"
-          :autoSize="{ minRows: 3, maxRows: 5 }"
-        />
-      </a-form-item>
-      <a-form-item :wrapper-col="{ span: 24 }">
-        <!-- TODO: FILE UPLOAD! -->
-        <a-upload action="https://www.mocky.io/v2/5cc8019d300000980a055e76">
-          <a-button> <a-icon type="upload" />Test Report hochladen</a-button>
-        </a-upload>
-      </a-form-item>
-      <a-divider />
-      <a-form-item :wrapper-col="{ span: 24, offset: 0 }">
-        <a-button type="primary" html-type="submit">
-          Speichern
-        </a-button>
-      </a-form-item>
-    </a-form>
+    <div v-if="!updatedLabTest">
+      <a-form
+        :form="form"
+        :label-col="{ span: 6 }"
+        :wrapper-col="{ span: 18 }"
+        @submit="handleSubmit"
+      >
+        <a-form-item label="Test-ID">
+          <a-input
+            v-decorator="[
+              'testId',
+              {
+                rules: [
+                  {
+                    required: true,
+                    message: 'Bitte geben Sie Ihre Test-ID ein.'
+                  }
+                ]
+              }
+            ]"
+            placeholder="z.B 1337-4237-9438"
+          />
+        </a-form-item>
+        <a-form-item label="Testresultat">
+          <a-radio-group
+            v-decorator="[
+              'testResult',
+              {
+                rules: [
+                  {
+                    required: true,
+                    message: 'Bitte geben Sie das Testresultat an.'
+                  }
+                ]
+              }
+            ]"
+          >
+            <a-radio value="positive">
+              Positiv
+            </a-radio>
+            <a-radio value="negative">
+              Negativ
+            </a-radio>
+          </a-radio-group>
+        </a-form-item>
+        <a-form-item label="Kommentar">
+          <a-textarea
+            placeholder="Kommentar hinzufügen"
+            :autoSize="{ minRows: 3, maxRows: 5 }"
+            v-decorator="['comment']"
+          />
+        </a-form-item>
+        <a-form-item :wrapper-col="{ span: 24 }">
+          <a-upload
+            :accept="'pdf'"
+            :beforeUpload="beforeUpload"
+            :multiple="false"
+          >
+            <a-button> <a-icon type="upload" />Test Report hochladen</a-button>
+          </a-upload>
+        </a-form-item>
+        <a-divider />
+        <a-form-item :wrapper-col="{ span: 24, offset: 0 }">
+          <a-button type="primary" html-type="submit">
+            Speichern
+          </a-button>
+        </a-form-item>
+      </a-form>
+    </div>
+    <div v-else>
+      <div>Der Test wurde erfolgreich aktualisiert.</div>
+      <br />
+      <div>Test ID: {{ updatedLabTest.id }}</div>
+      <div>Test Status: {{ updatedLabTest.testStatus }}</div>
+    </div>
   </a-card>
 </template>
 
 <script>
-// TODO: Use form from ant and to get the values from the <form> (see PatientDataCompontent)
+import Api from "../../api/Api";
 
 export default {
   name: "LinkTestResultAndPatient",
+  data() {
+    return {
+      form: this.$form.createForm(this),
+      updatedLabTest: null,
+      fileBytes: null
+    };
+  },
   methods: {
+    beforeUpload(file) {
+      const setFileBytes = fileBytes => {
+        this.fileBytes = fileBytes;
+      };
+
+      const reader = new FileReader();
+      reader.onload = function(e) {
+        const utf8 = unescape(encodeURIComponent(e.target.result));
+        const array = [];
+        for (let i = 0; i < utf8.length; i++) {
+          array.push(utf8.charCodeAt(i));
+        }
+        setFileBytes(array);
+      };
+      reader.readAsDataURL(file);
+
+      return false;
+    },
     handleSubmit(e) {
       e.preventDefault();
 
-      // TODO: Send request to connect patient with test result
-      console.log("Handle connect patient with test result");
+      this.form.validateFields((err, values) => {
+        if (err) {
+          return;
+        }
 
-      const patientId = "198424989813";
-      const testResult = "negative";
+        const { testId } = values;
+        const request = {
+          status:
+            values.testResult === "positive"
+              ? "TEST_POSITIVE"
+              : "TEST_NEGATIVE",
+          comment: values.comment,
+          file: this.fileBytes
+        };
 
-      // TODO: Handle response from server
-      const response = { type: "success" };
-      const { type } = response;
+        Api.putLabTest(testId, request)
+          .then(labTest => {
+            this.updatedLabTest = labTest;
 
-      // Check notification type (success, info, warning, error)
-      const notification = {};
-      if (type === "success") {
-        notification.message = "Verknüpfung erfolgreich.";
-        notification.description = `Patienten ID: ${patientId} & Test Resultat: ${testResult}.`;
-      } else if (type === "error") {
-        notification.message = "Es is ein Fehler aufgetreten.";
-        notification.description = `Patienten ID: ${patientId} & Test Resultat: ${testResult}.`;
-      }
-      this.$notification[type](notification);
+            const notification = {
+              message: "Testergebnis hinzugefügt.",
+              description: "Das Testergebnis wurde erfolgreich hinzugefügt."
+            };
+            this.$notification["success"](notification);
+          })
+          .catch(err => {
+            const notification = {
+              message: "Fehler beim Hinzufügen des Testergebnisses.",
+              description: err.message
+            };
+            this.$notification["error"](notification);
+          });
+      });
     }
   }
 };
diff --git a/client/src/components/laboratory/Login.vue b/client/src/components/laboratory/Login.vue
index fb0953a2..4d439091 100644
--- a/client/src/components/laboratory/Login.vue
+++ b/client/src/components/laboratory/Login.vue
@@ -43,14 +43,12 @@
       </a-form-item>
     </a-form>
     <p class="test-acess">
-      Testzugang: Kennung <i><b>1234</b></i
-      >, Password <i><b>asdf</b></i>
+      Testzugang mit Password <i><b>asdf</b></i>
     </p>
   </a-card>
 </template>
 
 <script>
-// TODO: Use form from ant and to get the values from the <form> (see PatientDataCompontent)
 
 export default {
   name: "Login",
@@ -71,8 +69,8 @@ export default {
           return;
         }
 
-        if (values.id === "1234" && values.password === "asdf") {
-          this.$emit("on-login-success");
+        if (values.id && values.password === "asdf") {
+          this.$emit("on-login-success", values.id);
         } else {
           this.$notification["error"]({
             message: "Login Fehler",
diff --git a/client/src/components/page/LinkSampleAndPatientPage.vue b/client/src/components/page/LinkTestAndPatientPage.vue
similarity index 60%
rename from client/src/components/page/LinkSampleAndPatientPage.vue
rename to client/src/components/page/LinkTestAndPatientPage.vue
index b955e8a4..034cb65e 100644
--- a/client/src/components/page/LinkSampleAndPatientPage.vue
+++ b/client/src/components/page/LinkTestAndPatientPage.vue
@@ -5,17 +5,17 @@
         <Login
           @on-login-success="onLoginSuccess"
           :title="
-            'Bitte melden Sie sich hier mit Kennung und Passwort an um eine Probe einem Patienten zuzuordnen.'
+            'Bitte melden Sie sich hier mit Laborkennung und Passwort an um einen Test einem Patienten zuzuordnen.'
           "
         />
       </a-tab-pane>
       <a-tab-pane
-        tab="2. Probe zuordnen"
+        tab="2. Test zuordnen"
         key="2"
         forceRender
         :disabled="!isLoggedIn"
       >
-        <LinkSampleAndPatient />
+        <LinkTestAndPatient :laboratoryId="laboratoryId" />
       </a-tab-pane>
     </a-tabs>
   </div>
@@ -23,22 +23,24 @@
 
 <script>
 import Login from "../laboratory/Login";
-import LinkSampleAndPatient from "../laboratory/LinkSampleAndPatient";
+import LinkTestAndPatient from "../laboratory/LinkTestAndPatient";
 
 export default {
-  name: "LinkSampleAndPatientPage",
+  name: "LinkTestAndPatientPage",
   components: {
     Login,
-    LinkSampleAndPatient
+    LinkTestAndPatient
   },
   data() {
     return {
       activeKey: "1",
-      isLoggedIn: false
+      isLoggedIn: false,
+      laboratoryId: ""
     };
   },
   methods: {
-    onLoginSuccess() {
+    onLoginSuccess(laboratoryId) {
+      this.laboratoryId = laboratoryId;
       this.isLoggedIn = true;
       this.activeKey = "2";
     }
diff --git a/client/src/routes/routes.js b/client/src/routes/routes.js
index a3165056..d146c8b1 100644
--- a/client/src/routes/routes.js
+++ b/client/src/routes/routes.js
@@ -1,5 +1,5 @@
 import LinkTestResultAndPatientPage from "../components/page/LinkTestResultAndPatientPage";
-import LinkSampleAndPatientPage from "../components/page/LinkSampleAndPatientPage";
+import LinkTestAndPatientPage from "../components/page/LinkTestAndPatientPage";
 import RegisterInstitutionPage from "../components/page/RegisterInstitutionPage";
 import RegisterPatientPage from "../components/page/RegisterPatientPage";
 
@@ -34,7 +34,7 @@ export const routes = [
     component: ViewAllDataComponent
   },
   {
-    path: "/link-sample-and-patient",
-    component: LinkSampleAndPatientPage
+    path: "/link-test-and-patient",
+    component: LinkTestAndPatientPage
   }
 ];
diff --git a/server/src/main/java/de/coronavirus/imis/TestDataLoader.java b/server/src/main/java/de/coronavirus/imis/TestDataLoader.java
index 64197ab0..568b7e90 100644
--- a/server/src/main/java/de/coronavirus/imis/TestDataLoader.java
+++ b/server/src/main/java/de/coronavirus/imis/TestDataLoader.java
@@ -47,7 +47,6 @@ static Object makeDTO(String testFileName, Class clazz)
         Resource resource = new ClassPathResource("sample_data" + File.separator + testFileName);
         File file = resource.getFile();
 
-
         byte[] encoded = Files.readAllBytes(file.toPath());
 
         String str = new String(encoded, Charset.defaultCharset());
@@ -62,7 +61,6 @@ public void run(ApplicationArguments args) {
                 patientService.addPatient(createPersonDTO);
             }
 
-
             // SETUP OUR WORLD
             var createLaboratoryDTO = (CreateInstitutionDTO) makeDTO("createLaboratory.json", CreateInstitutionDTO.class);
             var laboratory = institutionService.createLaboratoryInstitution(createLaboratoryDTO);
@@ -87,13 +85,14 @@ public void run(ApplicationArguments args) {
             eventService.createScheduledEvent(person, laboratory.getId(), doctorsOffice.getId());
 
             // LAB RECEIVES SAMPLE AND PROCESSES IT
-            final String labInternalTestId = "42";
-            var labTest = labTestService.createLabTest(person.getId(), laboratory.getId(), labInternalTestId);
+            final String testId = "42";
+            final String comment = "comment";
+            var labTest = labTestService.createLabTest(person.getId(), laboratory.getId(), testId, comment);
 
 
             // LAB HAS RESULT AND SOTRES IT
             // FIXME: 22.03.20 report cannot be attached
-            labTestService.updateTestStatus(labTest.getId(), "TEST_POSITIVE");
+            labTestService.updateTestStatus(labTest.getId(), "TEST_POSITIVE", comment, null);
 
             // HEALTH OFFICE WANTS TO SEE ALL DATA
             var allPatients = patientService.getAllPatients();
diff --git a/server/src/main/java/de/coronavirus/imis/api/LabTestController.java b/server/src/main/java/de/coronavirus/imis/api/LabTestController.java
index 8c956ca1..0d232951 100644
--- a/server/src/main/java/de/coronavirus/imis/api/LabTestController.java
+++ b/server/src/main/java/de/coronavirus/imis/api/LabTestController.java
@@ -17,7 +17,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@RequestMapping("/labtest")
+@RequestMapping("/labtests")
 @AllArgsConstructor
 public class LabTestController {
 
@@ -25,20 +25,26 @@ public class LabTestController {
 
     @PostMapping
     public ResponseEntity<LabTest> createTestForPatient(@RequestBody CreateLabTestDTO createLabTestRequest) {
-        return ResponseEntity.ok(service.createLabTest(createLabTestRequest.getPatientId(),
+        return ResponseEntity.ok(service.createLabTest(
+                createLabTestRequest.getPatientId(),
                 createLabTestRequest.getLaboratoryId(),
-                createLabTestRequest.getLabInternalId()));
+                createLabTestRequest.getTestId(),
+                createLabTestRequest.getComment())
+        );
     }
 
     @GetMapping("/patient/{id}")
     public Set<LabTest> getLabTestForPatient(@PathVariable("id") String patientId) {
-        return service.getAllLabTestForPatient(patientId);
+        return service.getAllLabsTestForPatient(patientId);
     }
 
     @PutMapping("/{id}")
-    public PatientEvent updateTestStatus(@PathVariable("id") String id, @RequestBody UpdateTestStatusDTO statusDTO) {
-        return service.updateTestStatus(id, statusDTO.getUpdatedTestStatus());
+    public ResponseEntity<LabTest> updateTestStatus(@PathVariable("id") String id, @RequestBody UpdateTestStatusDTO statusDTO) {
+        return ResponseEntity.ok(service.updateTestStatus(
+                id,
+                statusDTO.getStatus(),
+                statusDTO.getComment(),
+                statusDTO.getFile())
+        );
     }
-
-
 }
diff --git a/server/src/main/java/de/coronavirus/imis/api/TestReportController.java b/server/src/main/java/de/coronavirus/imis/api/TestReportController.java
index 9d46289b..a84b132d 100644
--- a/server/src/main/java/de/coronavirus/imis/api/TestReportController.java
+++ b/server/src/main/java/de/coronavirus/imis/api/TestReportController.java
@@ -1,14 +1,14 @@
 package de.coronavirus.imis.api;
 
-import com.google.cloud.storage.Blob;
+import de.coronavirus.imis.domain.TestReport;
 import de.coronavirus.imis.services.TestReportService;
+import java.util.List;
 import lombok.RequiredArgsConstructor;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.List;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @RequestMapping("/test_reports")
@@ -18,40 +18,17 @@ public class TestReportController {
     // Instance of the storage service.
     private final TestReportService testReportService;
 
-    /***
-     * Endpoint to upload a file.
-     * @param file: The file to upload.
-     * @param id: The id of the test report the file belongs to.
-     * @return A redirection.
-     */
-    @PostMapping("/{id}")
-    public ResponseEntity<HttpStatus> uploadTestReport(
-            @RequestParam("file") MultipartFile file,
-            @PathVariable("id") String id
-    ) {
-        try {
-            testReportService.addTestReport(id, file.getBytes());
-        } catch (Exception e) {
-            return ResponseEntity.status(500).build();
-        }
-
-        return ResponseEntity.ok().build();
-    }
-
     /***
      * Endpoint to receive a test report.
-     * @param id: The id of the test report to retrieve.
+     * @param testId: The testId of the test report to retrieve.
      * @return The test report.
      */
-    @GetMapping("/{id}")
-    public ResponseEntity<byte[]> getTestReport(
-            @PathVariable String id
-    ) {
-        byte[] testReport = testReportService
-                .findTestReportById(id)
-                .getContent();
-
-        return ResponseEntity.ok().body(testReport);
+    @GetMapping("/{testId}")
+    public ResponseEntity<TestReport> getTestReport(@PathVariable String testId) {
+        return testReportService
+                .findTestReportByTestId(testId)
+                .map(ResponseEntity::ok)
+                .orElse(ResponseEntity.notFound().build());
     }
 
     /***
@@ -59,7 +36,7 @@ public ResponseEntity<byte[]> getTestReport(
      * @return All saved test reports..
      */
     @GetMapping()
-    public List<Blob> getAllTestReports() {
+    public List<TestReport> getAllTestReports() {
         return testReportService.getAllTestReports();
     }
 }
diff --git a/server/src/main/java/de/coronavirus/imis/api/dto/CreateLabTestDTO.java b/server/src/main/java/de/coronavirus/imis/api/dto/CreateLabTestDTO.java
index f9a80099..4c267611 100644
--- a/server/src/main/java/de/coronavirus/imis/api/dto/CreateLabTestDTO.java
+++ b/server/src/main/java/de/coronavirus/imis/api/dto/CreateLabTestDTO.java
@@ -6,5 +6,6 @@
 public class CreateLabTestDTO {
     private String patientId;
     private String laboratoryId;
-    private String labInternalId;
+    private String testId;
+    private String comment;
 }
diff --git a/server/src/main/java/de/coronavirus/imis/api/dto/UpdateTestStatusDTO.java b/server/src/main/java/de/coronavirus/imis/api/dto/UpdateTestStatusDTO.java
index 5cf1c2e3..47efd3ff 100644
--- a/server/src/main/java/de/coronavirus/imis/api/dto/UpdateTestStatusDTO.java
+++ b/server/src/main/java/de/coronavirus/imis/api/dto/UpdateTestStatusDTO.java
@@ -4,5 +4,7 @@
 
 @Data
 public class UpdateTestStatusDTO {
-    private String updatedTestStatus;
+    private String status;
+    private String comment;
+    private byte[] file;
 }
diff --git a/server/src/main/java/de/coronavirus/imis/domain/LabTest.java b/server/src/main/java/de/coronavirus/imis/domain/LabTest.java
index c40cfe77..e1a3ed16 100644
--- a/server/src/main/java/de/coronavirus/imis/domain/LabTest.java
+++ b/server/src/main/java/de/coronavirus/imis/domain/LabTest.java
@@ -1,19 +1,17 @@
 package de.coronavirus.imis.domain;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToOne;
-
-import org.hibernate.annotations.GenericGenerator;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.GenericGenerator;
 
 @Entity
 @Data
@@ -27,8 +25,7 @@ public class LabTest {
     @GenericGenerator(name = "uuid2", strategy = "uuid2")
     private String id;
 
-
-    private String laborTestID;
+    private String testId;
 
     @ManyToOne
     @JsonIgnore
@@ -36,6 +33,8 @@ public class LabTest {
 
     private TestStatus testStatus;
 
+    private String comment;
+
     @OneToOne
     private byte[] report;
 
diff --git a/server/src/main/java/de/coronavirus/imis/domain/Laboratory.java b/server/src/main/java/de/coronavirus/imis/domain/Laboratory.java
index fdc9238b..6f8e80b2 100644
--- a/server/src/main/java/de/coronavirus/imis/domain/Laboratory.java
+++ b/server/src/main/java/de/coronavirus/imis/domain/Laboratory.java
@@ -1,21 +1,19 @@
 package de.coronavirus.imis.domain;
 
 import java.util.List;
-
 import javax.persistence.Entity;
 import javax.persistence.OneToMany;
-
-import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
 
 @EqualsAndHashCode(callSuper = true)
 @Entity
-@Data
+@Getter
+@Setter
 public class Laboratory extends Institution {
 
 
     @OneToMany(mappedBy = "laboratory")
     private List<LabTest> assignedLabTest;
-
-
 }
diff --git a/server/src/main/java/de/coronavirus/imis/domain/TestReport.java b/server/src/main/java/de/coronavirus/imis/domain/TestReport.java
new file mode 100644
index 00000000..cc624045
--- /dev/null
+++ b/server/src/main/java/de/coronavirus/imis/domain/TestReport.java
@@ -0,0 +1,30 @@
+package de.coronavirus.imis.domain;
+
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Lob;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+
+/***
+ * An entity representing a test report.
+ */
+@Entity
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class TestReport {
+
+    @Id
+    private String testId;
+
+    // Binary of the test files.
+    @Lob
+    private byte[] file;
+}
+
diff --git a/server/src/main/java/de/coronavirus/imis/repositories/TestReportRepository.java b/server/src/main/java/de/coronavirus/imis/repositories/TestReportRepository.java
new file mode 100644
index 00000000..2b012f7c
--- /dev/null
+++ b/server/src/main/java/de/coronavirus/imis/repositories/TestReportRepository.java
@@ -0,0 +1,14 @@
+package de.coronavirus.imis.repositories;
+
+import de.coronavirus.imis.domain.TestReport;
+import java.util.Optional;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+/***
+ * Repository for file storage.
+ */
+@Repository
+public interface TestReportRepository extends JpaRepository<TestReport, String> {
+    Optional<TestReport> findByTestId(String testId);
+}
diff --git a/server/src/main/java/de/coronavirus/imis/services/LabTestService.java b/server/src/main/java/de/coronavirus/imis/services/LabTestService.java
index 28375449..30fbc27e 100644
--- a/server/src/main/java/de/coronavirus/imis/services/LabTestService.java
+++ b/server/src/main/java/de/coronavirus/imis/services/LabTestService.java
@@ -1,19 +1,8 @@
 package de.coronavirus.imis.services;
 
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import javax.transaction.Transactional;
-
-import org.springframework.stereotype.Component;
-
-import lombok.RequiredArgsConstructor;
-
 import de.coronavirus.imis.domain.EventType;
 import de.coronavirus.imis.domain.LabTest;
+import de.coronavirus.imis.domain.LabTestNotFoundException;
 import de.coronavirus.imis.domain.Laboratory;
 import de.coronavirus.imis.domain.LaboratoryNotFoundException;
 import de.coronavirus.imis.domain.Patient;
@@ -23,54 +12,88 @@
 import de.coronavirus.imis.repositories.LabTestRepository;
 import de.coronavirus.imis.repositories.LaboratoryRepository;
 import de.coronavirus.imis.repositories.PatientEventRepository;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+import javax.transaction.Transactional;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
 
 @Component
 @RequiredArgsConstructor
+@Slf4j
 public class LabTestService {
+
     private final PatientService patientService;
     private final PatientEventService eventService;
+    private final TestReportService testReportService;
     private final LaboratoryRepository laboratoryRepository;
     private final LabTestRepository labTestRepository;
     private final PatientEventRepository eventRepository;
 
-
     @Transactional
-    public LabTest createLabTest(String patientId, String labId, String labInternalId) {
-        final Patient patient = patientService.findPatientById(patientId).orElseThrow(PatientNotFoundException::new);
-        final Laboratory laboratory = laboratoryRepository.findById(labId).orElseThrow(LaboratoryNotFoundException::new);
-        final LabTest labTest = LabTest.builder().
-                laboratory(laboratory).testStatus(TestStatus.TEST_SUBMITTED)
-                .laborTestID(labInternalId)
+    public LabTest createLabTest(String patientId, String laboratoryId, String testId, String comment) {
+        final Patient patient = patientService
+                .findPatientById(patientId)
+                .orElseThrow(PatientNotFoundException::new);
+        final Laboratory laboratory = laboratoryRepository
+                .findById(laboratoryId)
+                .orElseThrow(LaboratoryNotFoundException::new);
+        final LabTest labTest = LabTest.builder()
+                .laboratory(laboratory)
+                .testStatus(TestStatus.TEST_SUBMITTED)
+                .testId(testId)
+                .comment(comment)
                 .build();
+
         labTestRepository.save(labTest);
         eventService.createLabTestEvent(patient, labTest, Optional.empty());
         return labTest;
     }
 
     @Transactional
-    public Set<LabTest> getAllLabTestForPatient(String patiendId) {
+    public Set<LabTest> getAllLabsTestForPatient(String patiendId) {
         final Patient patient = patientService.findPatientById(patiendId).orElseThrow(PatientNotFoundException::new);
         final var events = eventService.getAllForPatient(patient);
         return events.stream().map(PatientEvent::getLabTest).collect(Collectors.toSet());
     }
 
     @Transactional
-    public PatientEvent updateTestStatus(String testId, final String statusString) {
+    public LabTest updateTestStatus(final String testId, final String statusString, final String comment, final byte[] file) {
         TestStatus statusToSet = TestStatus.valueOf(statusString.toUpperCase());
-        var labTest = labTestRepository.findById(testId).orElseThrow();
-        final List<PatientEvent> event = eventService.getForLabTest(labTest);
+
+        var labTest = labTestRepository.findById(testId)
+                .orElseThrow(LabTestNotFoundException::new);
         labTest.setTestStatus(statusToSet);
+
+        final List<PatientEvent> event = eventService.getForLabTest(labTest);
         var eventType = testStatusToEvent(statusToSet);
-        var patient = event.stream().map(PatientEvent::getPatient).findFirst().orElseThrow();
-        var doctor = event.stream().map(PatientEvent::getResponsibleDoctor)
-                .filter(Objects::nonNull).findFirst();
+
+        var patient = event.stream()
+                .map(PatientEvent::getPatient)
+                .findFirst()
+                .orElseThrow();
 
         var changeEvent = new PatientEvent()
                 .setEventType(eventType)
                 .setLabTest(labTest)
-                .setPatient(patient);
-        doctor.ifPresent(changeEvent::setResponsibleDoctor);
-        return eventRepository.save(changeEvent);
+                .setPatient(patient)
+                .setComment(comment);
+
+        event.stream()
+                .map(PatientEvent::getResponsibleDoctor)
+                .filter(Objects::nonNull)
+                .findFirst()
+                .ifPresent(changeEvent::setResponsibleDoctor);
+
+        eventRepository.save(changeEvent);
+
+        Optional.ofNullable(file).ifPresent((bytes) -> testReportService.addTestReport(labTest.getId(), bytes));
+
+        return labTest;
     }
 
     private EventType testStatusToEvent(TestStatus input) {
diff --git a/server/src/main/java/de/coronavirus/imis/services/TestReportService.java b/server/src/main/java/de/coronavirus/imis/services/TestReportService.java
index c3bc873e..f5372f3d 100644
--- a/server/src/main/java/de/coronavirus/imis/services/TestReportService.java
+++ b/server/src/main/java/de/coronavirus/imis/services/TestReportService.java
@@ -1,12 +1,10 @@
 package de.coronavirus.imis.services;
 
-import com.google.api.gax.paging.Page;
-import com.google.cloud.storage.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
+import de.coronavirus.imis.domain.TestReport;
+import de.coronavirus.imis.repositories.TestReportRepository;
 import java.util.List;
+import java.util.Optional;
+import org.springframework.stereotype.Service;
 
 /***
  * Implements functionality to save files related to a test to the database.
@@ -14,42 +12,42 @@
 @Service
 public class TestReportService {
 
-    @Autowired
-    private Storage storage = StorageOptions.getDefaultInstance().getService();
-    private Bucket bucket = storage.create(BucketInfo.of("test_reports"));
+    // The data repository.
+    private TestReportRepository testReportRepository;
+
+    /***
+     * Initializes the service with its repository.
+     * @param testReportRepository: The data repository.
+     */
+    public TestReportService(TestReportRepository testReportRepository) {
+        this.testReportRepository = testReportRepository;
+    }
 
     /***
      * Returns all saved test reports.
      * @return all saved test reports.
      */
-    public List<Blob> getAllTestReports() {
-        List<Blob> result = new ArrayList<>();
-        Page<Blob> blobs = bucket.list();
-
-        for (Blob blob: blobs.getValues()) {
-            result.add(blob);
-        }
-
-        return result;
+    public List<TestReport> getAllTestReports() {
+        return testReportRepository.findAll();
     }
 
     /***
-     * Returns a test report by its id from the database.
-     * @param id: The id of the desired test report.
+     * Returns a test report by its testId from the database.
+     * @param testId: The testId of the desired test report.
      * @return the desired test report.
      */
-    public Blob findTestReportById(String id) {
-        return storage.get(BlobId.of(bucket.getName(), id));
+    public Optional<TestReport> findTestReportByTestId(String testId) {
+        return testReportRepository.findByTestId(testId);
     }
 
     /***
      * Creates a test report and saves it in the database.
-     * @param id: Id of the test report.
+     * @param testId: Id of the test report.
      * @param file: Binary data of the test report.
      */
-    public void addTestReport(String id, byte[] file) {
-        BlobId blobId = BlobId.of(bucket.getName(), id);
-        BlobInfo blobInfo = BlobInfo.newBuilder(blobId).build();
-        storage.create(blobInfo, file);
+    public TestReport addTestReport(String testId, byte[] file) {
+        TestReport testReport = new TestReport(testId, file);
+        testReportRepository.save(testReport);
+        return testReport;
     }
 }
diff --git a/server/src/main/resources/sample_data/createLabTest.json b/server/src/main/resources/sample_data/createLabTest.json
index fedc2ac8..a6c0d89e 100644
--- a/server/src/main/resources/sample_data/createLabTest.json
+++ b/server/src/main/resources/sample_data/createLabTest.json
@@ -1,5 +1,6 @@
 {
-  "labInternalId": "string",
+  "testId": "string",
   "laboratoryId": "string",
-  "patientId": "string"
+  "patientId": "string",
+  "comment": "string"
 }
\ No newline at end of file