diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0b6d05c2932315795a5468033cddcb6b283475b5..7e70460df73e558b100afaa28f2bd87319a006bb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,11 +1,10 @@
 # Include templates for security scans and code quality reports
 include:
-  - template: Code-Quality.gitlab-ci.yml
-  - template: Security/Dependency-Scanning.gitlab-ci.yml
+  - template: Jobs/Code-Quality.gitlab-ci.yml
+  - template: Jobs/Dependency-Scanning.gitlab-ci.yml
+  - template: Jobs/SAST.gitlab-ci.yml
+  - template: Jobs/Secret-Detection.gitlab-ci.yml
   - template: Security/DAST.gitlab-ci.yml
-  - template: Security/SAST.gitlab-ci.yml
-  - template: Security/License-Scanning.gitlab-ci.yml
-  - template: Security/Secret-Detection.gitlab-ci.yml
   - template: Verify/Accessibility.gitlab-ci.yml
   - template: Verify/Browser-Performance.gitlab-ci.yml
 
@@ -526,7 +525,7 @@ secret_detection:
 dependency_scanning:
   stage: report
 
-gemnasium-dependency_scanning:
+gemnasium-maven-dependency_scanning:
   rules:
     - if: $CI_PIPELINE_SOURCE == "trigger" ||
         $CI_MERGE_REQUEST_EVENT_TYPE == "merge_train"
@@ -539,22 +538,6 @@ gemnasium-dependency_scanning:
   dependencies:
     - gradle_build
 
-# License scanning reporter for checking the licenses of dependencies.
-license_scanning:
-  extends:
-    - .build_cached
-    - .gitlab_reporter
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "trigger" ||
-        $CI_MERGE_REQUEST_EVENT_TYPE == "merge_train"
-      when: never
-    - if: $CI_COMMIT_BRANCH == "master" ||
-        $CI_COMMIT_BRANCH == "dev" ||
-        $CI_MERGE_REQUEST_ID
-  stage: report
-  variables:
-    LM_JAVA_VERSION: 17
-
 # Accessibility testing
 a11y:
   extends:
diff --git a/build.gradle.kts b/build.gradle.kts
index 13d280eb72a74443e05a625cdc819d59b19a15d7..860bfd3e1e76c5bf8fc68a5e960d68b185897e67 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -12,19 +12,12 @@ val labradoorVersion = "1.3.2-SNAPSHOT"
 val libradorVersion = "1.2.2-SNAPSHOT"
 val chihuahUIVersion = "1.0.0"
 val samlVersion = "1.17"
-val springBootVersion = "2.4.4"
-val hibernateVersion = "5.4.30.Final"
-val lombokVersion = "1.18.18"
-val springDocVersion = "1.2.32"
 val guavaVersion = "30.1.1-jre"
-val liquibaseVersion = "3.8.9"
 val sentryVersion = "5.0.1"
 val csvVersion = "5.5.1"
 
 val genSourceDir = file("$buildDir/submit/src/main/java")
 
-ext["log4j2.version"] = "2.16.0"
-
 // The repositories used to lookup dependencies.
 repositories {
     mavenLocal()
@@ -61,12 +54,12 @@ plugins {
 
     // Spring plugins for managing dependencies and creating
     // a nice Spring Boot application.
-    id("org.springframework.boot").version("2.7.3")
-    id("io.spring.dependency-management").version("1.0.13.RELEASE")
-	id("com.github.ben-manes.versions").version("0.39.0")
+    id("org.springframework.boot").version("2.7.14")
+    id("io.spring.dependency-management").version("1.1.3")
+	id("com.github.ben-manes.versions").version("0.47.0")
 
     // Spotless plugin for checking style of Java code.
-    id("com.diffplug.spotless").version("6.10.0")
+    id("com.diffplug.spotless").version("6.19.0")
 
     // Plugin for checking license headers within our code and files.
     id("com.github.hierynomus.license").version("0.16.1")
@@ -248,7 +241,7 @@ dependencies {
     // Database migration + database driver dependencies
     implementation("org.liquibase:liquibase-core")
     implementation("com.h2database:h2")
-	implementation("mysql:mysql-connector-java")
+	implementation("com.mysql:mysql-connector-j")
 	implementation("org.mariadb.jdbc:mariadb-java-client")
 	implementation("org.postgresql:postgresql")
 
diff --git a/src/main/java/nl/tudelft/submit/DevDatabaseLoader.java b/src/main/java/nl/tudelft/submit/DevDatabaseLoader.java
index a31ae6fd1eca36c59c699e47a66235c20dc53a7b..cdb9f46053e9791a5e555531a412044d87acf987 100644
--- a/src/main/java/nl/tudelft/submit/DevDatabaseLoader.java
+++ b/src/main/java/nl/tudelft/submit/DevDatabaseLoader.java
@@ -19,15 +19,15 @@ package nl.tudelft.submit;
 
 import javax.annotation.PostConstruct;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Profile;
+import org.springframework.stereotype.Service;
+
 import nl.tudelft.labracore.api.dto.*;
 import nl.tudelft.submit.model.*;
 import nl.tudelft.submit.model.api.EditionApiKey;
 import nl.tudelft.submit.repository.*;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Profile;
-import org.springframework.stereotype.Service;
-
 @Service
 @Profile("dev")
 public class DevDatabaseLoader {
diff --git a/src/main/java/nl/tudelft/submit/SubmitApplication.java b/src/main/java/nl/tudelft/submit/SubmitApplication.java
index 21290981ef96cc0bdd4b546133bfcdf5ef024993..a3d7c56dc082f45fdc4221e1f0bc402b72434852 100644
--- a/src/main/java/nl/tudelft/submit/SubmitApplication.java
+++ b/src/main/java/nl/tudelft/submit/SubmitApplication.java
@@ -17,13 +17,13 @@
  */
 package nl.tudelft.submit;
 
-import nl.tudelft.labracore.lib.LabracoreApiConfig;
-import nl.tudelft.librador.EnableLibrador;
-
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Import;
 
+import nl.tudelft.labracore.lib.LabracoreApiConfig;
+import nl.tudelft.librador.EnableLibrador;
+
 @EnableLibrador
 @Import(LabracoreApiConfig.class)
 @SpringBootApplication(scanBasePackageClasses = SubmitApplication.class)
diff --git a/src/main/java/nl/tudelft/submit/cache/AssignmentCacheManager.java b/src/main/java/nl/tudelft/submit/cache/AssignmentCacheManager.java
index 156c03544494f36ccd0cac874a2a73be8aa977ec..dec7be510ee25dfe77972a4366d60101827528d8 100644
--- a/src/main/java/nl/tudelft/submit/cache/AssignmentCacheManager.java
+++ b/src/main/java/nl/tudelft/submit/cache/AssignmentCacheManager.java
@@ -19,13 +19,13 @@ package nl.tudelft.submit.cache;
 
 import java.util.List;
 
-import nl.tudelft.labracore.api.AssignmentControllerApi;
-import nl.tudelft.labracore.api.dto.AssignmentDetailsDTO;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.RequestScope;
 
+import nl.tudelft.labracore.api.AssignmentControllerApi;
+import nl.tudelft.labracore.api.dto.AssignmentDetailsDTO;
+
 @Component
 @RequestScope
 public class AssignmentCacheManager extends CoreCacheManager<Long, AssignmentDetailsDTO> {
diff --git a/src/main/java/nl/tudelft/submit/cache/EditionCacheManager.java b/src/main/java/nl/tudelft/submit/cache/EditionCacheManager.java
index fe2c54058cbb38bf7eec49e6ac971705155ef2a8..55533007215de6eb889f43340dd45a39d68188c2 100644
--- a/src/main/java/nl/tudelft/submit/cache/EditionCacheManager.java
+++ b/src/main/java/nl/tudelft/submit/cache/EditionCacheManager.java
@@ -19,14 +19,14 @@ package nl.tudelft.submit.cache;
 
 import java.util.List;
 
-import nl.tudelft.labracore.api.EditionControllerApi;
-import nl.tudelft.labracore.api.dto.EditionDetailsDTO;
-
 import org.modelmapper.ModelMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.RequestScope;
 
+import nl.tudelft.labracore.api.EditionControllerApi;
+import nl.tudelft.labracore.api.dto.EditionDetailsDTO;
+
 @Component
 @RequestScope
 public class EditionCacheManager extends CoreCacheManager<Long, EditionDetailsDTO> {
diff --git a/src/main/java/nl/tudelft/submit/cache/EditionRolesCacheManager.java b/src/main/java/nl/tudelft/submit/cache/EditionRolesCacheManager.java
index 91e7463c27e17c47653b113f52a2e8567848cf4f..8149f584ee2595a5a7bed5e5bf6a59f466d42b9a 100644
--- a/src/main/java/nl/tudelft/submit/cache/EditionRolesCacheManager.java
+++ b/src/main/java/nl/tudelft/submit/cache/EditionRolesCacheManager.java
@@ -20,15 +20,15 @@ package nl.tudelft.submit.cache;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.annotation.RequestScope;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import nl.tudelft.labracore.api.EditionControllerApi;
 import nl.tudelft.labracore.api.dto.RolePersonDetailsDTO;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.web.context.annotation.RequestScope;
-
 @Component
 @RequestScope
 public class EditionRolesCacheManager extends CoreCacheManager<Long, EditionRolesCacheManager.RoleHolder> {
diff --git a/src/main/java/nl/tudelft/submit/cache/ModuleCacheManager.java b/src/main/java/nl/tudelft/submit/cache/ModuleCacheManager.java
index a881944cf08a5549c5354fb26aaf0d31f313cdf9..140e56895041b063704fb94cc1f77e713bd42003 100644
--- a/src/main/java/nl/tudelft/submit/cache/ModuleCacheManager.java
+++ b/src/main/java/nl/tudelft/submit/cache/ModuleCacheManager.java
@@ -19,13 +19,13 @@ package nl.tudelft.submit.cache;
 
 import java.util.List;
 
-import nl.tudelft.labracore.api.ModuleControllerApi;
-import nl.tudelft.labracore.api.dto.ModuleDetailsDTO;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.RequestScope;
 
+import nl.tudelft.labracore.api.ModuleControllerApi;
+import nl.tudelft.labracore.api.dto.ModuleDetailsDTO;
+
 @Component
 @RequestScope
 public class ModuleCacheManager extends CoreCacheManager<Long, ModuleDetailsDTO> {
diff --git a/src/main/java/nl/tudelft/submit/cache/PersonCacheManager.java b/src/main/java/nl/tudelft/submit/cache/PersonCacheManager.java
index 689cabe7a155c1dde9063e69c059b7aed51e7154..668a3423b8b3f85bc71f663d0ccc9df7f38fd42f 100644
--- a/src/main/java/nl/tudelft/submit/cache/PersonCacheManager.java
+++ b/src/main/java/nl/tudelft/submit/cache/PersonCacheManager.java
@@ -21,15 +21,15 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import nl.tudelft.labracore.api.PersonControllerApi;
-import nl.tudelft.labracore.api.dto.PersonSummaryDTO;
-
 import org.modelmapper.ModelMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.ApplicationScope;
 
+import nl.tudelft.labracore.api.PersonControllerApi;
+import nl.tudelft.labracore.api.dto.PersonSummaryDTO;
+
 @Component
 @ApplicationScope
 public class PersonCacheManager extends TimedCacheManager<Long, PersonSummaryDTO> {
diff --git a/src/main/java/nl/tudelft/submit/cache/RoleCacheManager.java b/src/main/java/nl/tudelft/submit/cache/RoleCacheManager.java
index 24d75aa9402d64b8779cd780f85bd3d83f4f7198..7ea44fd2d0b985cdda768e5c3d83cf16fdf04b51 100644
--- a/src/main/java/nl/tudelft/submit/cache/RoleCacheManager.java
+++ b/src/main/java/nl/tudelft/submit/cache/RoleCacheManager.java
@@ -20,14 +20,14 @@ package nl.tudelft.submit.cache;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import nl.tudelft.labracore.api.RoleControllerApi;
-import nl.tudelft.labracore.api.dto.Id;
-import nl.tudelft.labracore.api.dto.RoleDetailsDTO;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.RequestScope;
 
+import nl.tudelft.labracore.api.RoleControllerApi;
+import nl.tudelft.labracore.api.dto.Id;
+import nl.tudelft.labracore.api.dto.RoleDetailsDTO;
+
 @Component
 @RequestScope
 public class RoleCacheManager extends CoreCacheManager<Id, RoleDetailsDTO> {
diff --git a/src/main/java/nl/tudelft/submit/cache/StudentGroupCacheManager.java b/src/main/java/nl/tudelft/submit/cache/StudentGroupCacheManager.java
index ec9ee5f4f1b34ca3bdee36f57b9fa6a932ac453b..a36d50ea282b7c293698c6f21b79aa5841ab53f9 100644
--- a/src/main/java/nl/tudelft/submit/cache/StudentGroupCacheManager.java
+++ b/src/main/java/nl/tudelft/submit/cache/StudentGroupCacheManager.java
@@ -21,14 +21,14 @@ import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
-import nl.tudelft.labracore.api.StudentGroupControllerApi;
-import nl.tudelft.labracore.api.dto.RolePersonLayer1DTO;
-import nl.tudelft.labracore.api.dto.StudentGroupDetailsDTO;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.RequestScope;
 
+import nl.tudelft.labracore.api.StudentGroupControllerApi;
+import nl.tudelft.labracore.api.dto.RolePersonLayer1DTO;
+import nl.tudelft.labracore.api.dto.StudentGroupDetailsDTO;
+
 @Component
 @RequestScope
 public class StudentGroupCacheManager extends CoreCacheManager<Long, StudentGroupDetailsDTO> {
diff --git a/src/main/java/nl/tudelft/submit/cache/SubmissionCacheManager.java b/src/main/java/nl/tudelft/submit/cache/SubmissionCacheManager.java
index 448b1a451a849ff332f73dee98a1df70d85515ac..4357c5d7ca60bbe19be4081a7737842540781c55 100644
--- a/src/main/java/nl/tudelft/submit/cache/SubmissionCacheManager.java
+++ b/src/main/java/nl/tudelft/submit/cache/SubmissionCacheManager.java
@@ -19,13 +19,13 @@ package nl.tudelft.submit.cache;
 
 import java.util.List;
 
-import nl.tudelft.labracore.api.SubmissionControllerApi;
-import nl.tudelft.labracore.api.dto.SubmissionDetailsDTO;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.RequestScope;
 
+import nl.tudelft.labracore.api.SubmissionControllerApi;
+import nl.tudelft.labracore.api.dto.SubmissionDetailsDTO;
+
 @Component
 @RequestScope
 public class SubmissionCacheManager extends CoreCacheManager<Long, SubmissionDetailsDTO> {
diff --git a/src/main/java/nl/tudelft/submit/config/LibradorConfiguration.java b/src/main/java/nl/tudelft/submit/config/LibradorConfiguration.java
index 0d35858fa8677dccc9e75e7ee64e9fd60b07661c..c5a7dcf1b79ef232b3f76467ded4533e0514d894 100644
--- a/src/main/java/nl/tudelft/submit/config/LibradorConfiguration.java
+++ b/src/main/java/nl/tudelft/submit/config/LibradorConfiguration.java
@@ -17,6 +17,9 @@
  */
 package nl.tudelft.submit.config;
 
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
 import nl.tudelft.librador.EnableLibrador;
 import nl.tudelft.librador.dto.id.IdMapperBuilder;
 import nl.tudelft.submit.dto.id.*;
@@ -29,9 +32,6 @@ import nl.tudelft.submit.model.script.Script;
 import nl.tudelft.submit.model.script.ScriptTrain;
 import nl.tudelft.submit.model.script.ScriptWagon;
 
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
 @Configuration
 @EnableLibrador
 public class LibradorConfiguration {
diff --git a/src/main/java/nl/tudelft/submit/config/WebConfig.java b/src/main/java/nl/tudelft/submit/config/WebConfig.java
index b9871ca27687118ace2aff12efc5b828d95c615b..e36ad7242c99e3f9b6c7cbcefe2269969c68fc41 100644
--- a/src/main/java/nl/tudelft/submit/config/WebConfig.java
+++ b/src/main/java/nl/tudelft/submit/config/WebConfig.java
@@ -21,9 +21,6 @@ import java.util.Locale;
 
 import javax.validation.constraints.NotNull;
 
-import nl.tudelft.labracore.api.dto.*;
-import nl.tudelft.submit.dto.id.VersionIdDTO;
-
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.convert.converter.Converter;
@@ -34,6 +31,9 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 import org.springframework.web.servlet.i18n.CookieLocaleResolver;
 import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
 
+import nl.tudelft.labracore.api.dto.*;
+import nl.tudelft.submit.dto.id.VersionIdDTO;
+
 @Configuration
 public class WebConfig implements WebMvcConfigurer {
 
diff --git a/src/main/java/nl/tudelft/submit/controller/AnnouncementController.java b/src/main/java/nl/tudelft/submit/controller/AnnouncementController.java
index 10042d5baf54e48c0fa4fdd0239f8951daae4647..b1af0eb8aefa2edb7ee1b5bb9873e004d473b357 100644
--- a/src/main/java/nl/tudelft/submit/controller/AnnouncementController.java
+++ b/src/main/java/nl/tudelft/submit/controller/AnnouncementController.java
@@ -17,16 +17,16 @@
  */
 package nl.tudelft.submit.controller;
 
-import nl.tudelft.submit.dto.create.announcement.EditionAnnouncementCreateDTO;
-import nl.tudelft.submit.dto.create.announcement.GlobalAnnouncementCreateDTO;
-import nl.tudelft.submit.service.AnnouncementService;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 
+import nl.tudelft.submit.dto.create.announcement.EditionAnnouncementCreateDTO;
+import nl.tudelft.submit.dto.create.announcement.GlobalAnnouncementCreateDTO;
+import nl.tudelft.submit.service.AnnouncementService;
+
 @Controller
 @RequestMapping("/announcement")
 public class AnnouncementController {
diff --git a/src/main/java/nl/tudelft/submit/controller/AssignmentController.java b/src/main/java/nl/tudelft/submit/controller/AssignmentController.java
index 9301fb2867afe37584b79a2088f4a723f637d199..15ba9ec17b9cc9d5b44dffe2441776b4734bc52e 100644
--- a/src/main/java/nl/tudelft/submit/controller/AssignmentController.java
+++ b/src/main/java/nl/tudelft/submit/controller/AssignmentController.java
@@ -29,6 +29,16 @@ import java.util.stream.Collectors;
 import javax.transaction.Transactional;
 import javax.validation.Valid;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.opencsv.exceptions.CsvValidationException;
+
 import nl.tudelft.labracore.api.dto.*;
 import nl.tudelft.labracore.lib.security.user.AuthenticatedPerson;
 import nl.tudelft.labracore.lib.security.user.Person;
@@ -55,16 +65,6 @@ import nl.tudelft.submit.model.Signature;
 import nl.tudelft.submit.security.AuthorizationService;
 import nl.tudelft.submit.service.*;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import com.opencsv.exceptions.CsvValidationException;
-
 @Transactional
 @RequestMapping("/assignment")
 @Controller
diff --git a/src/main/java/nl/tudelft/submit/controller/EditionController.java b/src/main/java/nl/tudelft/submit/controller/EditionController.java
index bf14d399609a49db16b35088a6f9e44ce998a850..06084a20912dfaee6179eecfd14ff3267f112c6c 100644
--- a/src/main/java/nl/tudelft/submit/controller/EditionController.java
+++ b/src/main/java/nl/tudelft/submit/controller/EditionController.java
@@ -28,6 +28,22 @@ import java.util.stream.Collectors;
 import javax.transaction.Transactional;
 import javax.validation.Valid;
 
+import org.modelmapper.ModelMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.Resource;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.opencsv.exceptions.CsvValidationException;
+
 import nl.tudelft.labracore.api.dto.*;
 import nl.tudelft.labracore.lib.security.user.AuthenticatedPerson;
 import nl.tudelft.labracore.lib.security.user.Person;
@@ -46,22 +62,6 @@ import nl.tudelft.submit.dto.view.statistics.EditionTableRowDTO;
 import nl.tudelft.submit.security.AuthorizationService;
 import nl.tudelft.submit.service.*;
 
-import org.modelmapper.ModelMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.Resource;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import com.opencsv.exceptions.CsvValidationException;
-
 @Transactional
 @Controller
 @RequestMapping("/edition")
diff --git a/src/main/java/nl/tudelft/submit/controller/ErrorController.java b/src/main/java/nl/tudelft/submit/controller/ErrorController.java
index 013d151c528e055711b9ad6697587e4de6ff9c99..fe5327ac0b6c0f3eddf74131d6f740a430bcd6f8 100644
--- a/src/main/java/nl/tudelft/submit/controller/ErrorController.java
+++ b/src/main/java/nl/tudelft/submit/controller/ErrorController.java
@@ -19,10 +19,6 @@ package nl.tudelft.submit.controller;
 
 import javax.servlet.http.HttpServletResponse;
 
-import nl.tudelft.librador.exception.DTOValidationException;
-import nl.tudelft.submit.exception.DisallowedUploadException;
-import nl.tudelft.submit.exception.ScoreFormatException;
-
 import org.springframework.data.rest.webmvc.ResourceNotFoundException;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.access.AccessDeniedException;
@@ -35,6 +31,9 @@ import org.springframework.web.server.ResponseStatusException;
 import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
 
 import io.sentry.Sentry;
+import nl.tudelft.librador.exception.DTOValidationException;
+import nl.tudelft.submit.exception.DisallowedUploadException;
+import nl.tudelft.submit.exception.ScoreFormatException;
 
 @ControllerAdvice
 public class ErrorController extends ResponseEntityExceptionHandler {
diff --git a/src/main/java/nl/tudelft/submit/controller/GradeController.java b/src/main/java/nl/tudelft/submit/controller/GradeController.java
index 92e2ca899b8a18f9db88d1207e864de4e3c60087..9238a9a8946a5898c0f142c4acca24cca419a149 100644
--- a/src/main/java/nl/tudelft/submit/controller/GradeController.java
+++ b/src/main/java/nl/tudelft/submit/controller/GradeController.java
@@ -25,6 +25,11 @@ import javax.transaction.Transactional;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
 import nl.tudelft.labracore.lib.api.GradeScheme;
 import nl.tudelft.labracore.lib.security.user.AuthenticatedPerson;
 import nl.tudelft.labracore.lib.security.user.Person;
@@ -37,11 +42,6 @@ import nl.tudelft.submit.model.grading.GradingFormula;
 import nl.tudelft.submit.service.AssignmentService;
 import nl.tudelft.submit.service.GradeService;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
 @Transactional
 @RequestMapping("/grade")
 @Controller
diff --git a/src/main/java/nl/tudelft/submit/controller/HomeController.java b/src/main/java/nl/tudelft/submit/controller/HomeController.java
index 52fdec04cd8f13cdd8cbc33a330d1faa6db8556f..41b8891ee316c1629b95bcfe17f795fbc21293cc 100644
--- a/src/main/java/nl/tudelft/submit/controller/HomeController.java
+++ b/src/main/java/nl/tudelft/submit/controller/HomeController.java
@@ -17,14 +17,14 @@
  */
 package nl.tudelft.submit.controller;
 
-import nl.tudelft.labracore.lib.security.user.AuthenticatedPerson;
-import nl.tudelft.labracore.lib.security.user.Person;
-
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import nl.tudelft.labracore.lib.security.user.AuthenticatedPerson;
+import nl.tudelft.labracore.lib.security.user.Person;
+
 @RequestMapping
 @Controller
 public class HomeController {
diff --git a/src/main/java/nl/tudelft/submit/controller/ModuleController.java b/src/main/java/nl/tudelft/submit/controller/ModuleController.java
index 86568b1988bbb8399a36797e516c600e14f6a084..ee861a11b266f4e96a0ce85fecdc3c02bbf74af8 100644
--- a/src/main/java/nl/tudelft/submit/controller/ModuleController.java
+++ b/src/main/java/nl/tudelft/submit/controller/ModuleController.java
@@ -26,6 +26,15 @@ import java.util.stream.Collectors;
 
 import javax.validation.Valid;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.Resource;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.*;
+
 import nl.tudelft.labracore.api.dto.*;
 import nl.tudelft.labracore.lib.security.user.AuthenticatedPerson;
 import nl.tudelft.labracore.lib.security.user.Person;
@@ -43,15 +52,6 @@ import nl.tudelft.submit.enums.GradeStatistics;
 import nl.tudelft.submit.security.AuthorizationService;
 import nl.tudelft.submit.service.*;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.Resource;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
-
 @Transactional
 @RequestMapping("/module")
 @Controller
diff --git a/src/main/java/nl/tudelft/submit/controller/NotificationController.java b/src/main/java/nl/tudelft/submit/controller/NotificationController.java
index 8048c5c368e2a481cac9eb249ec6736c0545cd32..9c980b857b3feff545990d0c8fb702c85abeb621 100644
--- a/src/main/java/nl/tudelft/submit/controller/NotificationController.java
+++ b/src/main/java/nl/tudelft/submit/controller/NotificationController.java
@@ -19,12 +19,6 @@ package nl.tudelft.submit.controller;
 
 import java.util.List;
 
-import nl.tudelft.labracore.lib.security.user.AuthenticatedPerson;
-import nl.tudelft.labracore.lib.security.user.Person;
-import nl.tudelft.submit.dto.view.NotificationViewDTO;
-import nl.tudelft.submit.security.AuthorizationService;
-import nl.tudelft.submit.service.NotificationService;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -33,6 +27,12 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import nl.tudelft.labracore.lib.security.user.AuthenticatedPerson;
+import nl.tudelft.labracore.lib.security.user.Person;
+import nl.tudelft.submit.dto.view.NotificationViewDTO;
+import nl.tudelft.submit.security.AuthorizationService;
+import nl.tudelft.submit.service.NotificationService;
+
 @Controller
 @RequestMapping("/notification")
 public class NotificationController {
diff --git a/src/main/java/nl/tudelft/submit/controller/PersonController.java b/src/main/java/nl/tudelft/submit/controller/PersonController.java
index ab5ca9bfb69f942dc97a64b9419618049f2242a3..d4b04044dca0e229ef7442fb822600108695a92f 100644
--- a/src/main/java/nl/tudelft/submit/controller/PersonController.java
+++ b/src/main/java/nl/tudelft/submit/controller/PersonController.java
@@ -21,6 +21,12 @@ import java.util.*;
 
 import javax.transaction.Transactional;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.*;
+
 import nl.tudelft.labracore.api.dto.*;
 import nl.tudelft.labracore.lib.security.user.AuthenticatedPerson;
 import nl.tudelft.labracore.lib.security.user.Person;
@@ -28,12 +34,6 @@ import nl.tudelft.submit.service.ModuleService;
 import nl.tudelft.submit.service.PersonService;
 import nl.tudelft.submit.service.StudentGroupService;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
-
 @Transactional
 @RequestMapping("/person")
 @Controller
diff --git a/src/main/java/nl/tudelft/submit/controller/RoleController.java b/src/main/java/nl/tudelft/submit/controller/RoleController.java
index e2e3cbc4af48f15dfa94a5c7ec4a6f3b0c8d5ab3..55d49e06b84b60a8dd6706b8704b5556cb59af38 100644
--- a/src/main/java/nl/tudelft/submit/controller/RoleController.java
+++ b/src/main/java/nl/tudelft/submit/controller/RoleController.java
@@ -22,6 +22,12 @@ import java.time.LocalDateTime;
 import javax.transaction.Transactional;
 import javax.validation.Valid;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.stereotype.Controller;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
 import nl.tudelft.labracore.api.dto.RolePatchDTO;
 import nl.tudelft.labracore.lib.security.user.AuthenticatedPerson;
 import nl.tudelft.labracore.lib.security.user.Person;
@@ -30,12 +36,6 @@ import nl.tudelft.submit.model.Signature;
 import nl.tudelft.submit.service.NoteService;
 import nl.tudelft.submit.service.RoleService;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.stereotype.Controller;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
 @Transactional
 @Controller
 @RequestMapping("/role")
diff --git a/src/main/java/nl/tudelft/submit/controller/ScriptController.java b/src/main/java/nl/tudelft/submit/controller/ScriptController.java
index aef40a0b8941d013f3ee64dbb012a5c6e89e6809..61996cd6ffe100459b3c9f7167fe682a2549307a 100644
--- a/src/main/java/nl/tudelft/submit/controller/ScriptController.java
+++ b/src/main/java/nl/tudelft/submit/controller/ScriptController.java
@@ -17,6 +17,14 @@
  */
 package nl.tudelft.submit.controller;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.*;
+
 import nl.tudelft.labracore.api.dto.*;
 import nl.tudelft.submit.dto.create.script.ScriptCreateDTO;
 import nl.tudelft.submit.dto.create.script.ScriptFeedbackReceiveDTO;
@@ -31,14 +39,6 @@ import nl.tudelft.submit.model.script.Script;
 import nl.tudelft.submit.model.script.ScriptTrain;
 import nl.tudelft.submit.service.*;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
-
 @Controller
 @RequestMapping("/script")
 public class ScriptController {
diff --git a/src/main/java/nl/tudelft/submit/controller/StudentGroupController.java b/src/main/java/nl/tudelft/submit/controller/StudentGroupController.java
index d085a4c32b909d1bcae9c5a87047f89beaa529dd..db3b0d6406f930784f8bf2a436fc0177bf1af0ad 100644
--- a/src/main/java/nl/tudelft/submit/controller/StudentGroupController.java
+++ b/src/main/java/nl/tudelft/submit/controller/StudentGroupController.java
@@ -24,6 +24,12 @@ import java.util.stream.Collectors;
 
 import javax.transaction.Transactional;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.*;
+
 import nl.tudelft.labracore.api.dto.*;
 import nl.tudelft.labracore.lib.security.user.AuthenticatedPerson;
 import nl.tudelft.labracore.lib.security.user.Person;
@@ -38,12 +44,6 @@ import nl.tudelft.submit.model.Signature;
 import nl.tudelft.submit.security.AuthorizationService;
 import nl.tudelft.submit.service.*;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
-
 @Transactional
 @RequestMapping("/group")
 @Controller
diff --git a/src/main/java/nl/tudelft/submit/controller/SubmissionController.java b/src/main/java/nl/tudelft/submit/controller/SubmissionController.java
index f133221f6208f0c74258ae883e7e826ddd754af5..18e3c113c5c2d87bfc495e232d92de15756d06a5 100644
--- a/src/main/java/nl/tudelft/submit/controller/SubmissionController.java
+++ b/src/main/java/nl/tudelft/submit/controller/SubmissionController.java
@@ -23,18 +23,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import nl.tudelft.labracore.api.dto.*;
-import nl.tudelft.labracore.lib.security.user.AuthenticatedPerson;
-import nl.tudelft.labracore.lib.security.user.Person;
-import nl.tudelft.submit.dto.create.MailMessageCreateDTO;
-import nl.tudelft.submit.dto.create.SubmissionDownloadConfigCreateDTO;
-import nl.tudelft.submit.dto.create.note.SubmissionNoteCreateDTO;
-import nl.tudelft.submit.dto.view.VersionViewDTO;
-import nl.tudelft.submit.exception.DisallowedUploadException;
-import nl.tudelft.submit.model.Signature;
-import nl.tudelft.submit.security.AuthorizationService;
-import nl.tudelft.submit.service.*;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.Resource;
@@ -49,6 +37,18 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 
+import nl.tudelft.labracore.api.dto.*;
+import nl.tudelft.labracore.lib.security.user.AuthenticatedPerson;
+import nl.tudelft.labracore.lib.security.user.Person;
+import nl.tudelft.submit.dto.create.MailMessageCreateDTO;
+import nl.tudelft.submit.dto.create.SubmissionDownloadConfigCreateDTO;
+import nl.tudelft.submit.dto.create.note.SubmissionNoteCreateDTO;
+import nl.tudelft.submit.dto.view.VersionViewDTO;
+import nl.tudelft.submit.exception.DisallowedUploadException;
+import nl.tudelft.submit.model.Signature;
+import nl.tudelft.submit.security.AuthorizationService;
+import nl.tudelft.submit.service.*;
+
 @Controller
 @RequestMapping("/submission")
 public class SubmissionController {
diff --git a/src/main/java/nl/tudelft/submit/controller/UserSettingsController.java b/src/main/java/nl/tudelft/submit/controller/UserSettingsController.java
index 9aa13f7416e04e28b561fcbc9474b289adffa318..22678d72c1c4238d68f0147c3b54bcfbb6b1323b 100644
--- a/src/main/java/nl/tudelft/submit/controller/UserSettingsController.java
+++ b/src/main/java/nl/tudelft/submit/controller/UserSettingsController.java
@@ -17,17 +17,17 @@
  */
 package nl.tudelft.submit.controller;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
 import nl.tudelft.labracore.api.dto.PersonIdDTO;
 import nl.tudelft.labracore.lib.security.user.AuthenticatedPerson;
 import nl.tudelft.labracore.lib.security.user.Person;
 import nl.tudelft.submit.dto.patch.UserSettingsPatchDTO;
 import nl.tudelft.submit.service.UserSettingsService;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
 @Controller
 @RequestMapping("/settings")
 public class UserSettingsController {
diff --git a/src/main/java/nl/tudelft/submit/controller/VersionController.java b/src/main/java/nl/tudelft/submit/controller/VersionController.java
index b393e8c1926ea848fb594ad5ef4db7fcde200c52..cad80c21ac1102e5068632c18351b1b4fb907381 100644
--- a/src/main/java/nl/tudelft/submit/controller/VersionController.java
+++ b/src/main/java/nl/tudelft/submit/controller/VersionController.java
@@ -20,18 +20,18 @@ package nl.tudelft.submit.controller;
 import javax.transaction.Transactional;
 import javax.validation.Valid;
 
-import nl.tudelft.submit.dto.create.VersionCreateDTO;
-import nl.tudelft.submit.dto.patch.VersionPatchDTO;
-import nl.tudelft.submit.service.AssignmentService;
-import nl.tudelft.submit.service.StudentGroupService;
-import nl.tudelft.submit.service.VersionService;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import nl.tudelft.submit.dto.create.VersionCreateDTO;
+import nl.tudelft.submit.dto.patch.VersionPatchDTO;
+import nl.tudelft.submit.service.AssignmentService;
+import nl.tudelft.submit.service.StudentGroupService;
+import nl.tudelft.submit.service.VersionService;
+
 @Transactional
 @RequestMapping("/version")
 @Controller
diff --git a/src/main/java/nl/tudelft/submit/dto/create/FeedbackCreateDTO.java b/src/main/java/nl/tudelft/submit/dto/create/FeedbackCreateDTO.java
index 43d3154114b42afa964b09fd0223171d632b54b4..423bf3b914034ef1dae2751333bef4eec212a696 100644
--- a/src/main/java/nl/tudelft/submit/dto/create/FeedbackCreateDTO.java
+++ b/src/main/java/nl/tudelft/submit/dto/create/FeedbackCreateDTO.java
@@ -22,14 +22,14 @@ import java.time.LocalDateTime;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 
+import org.modelmapper.ModelMapper;
+import org.modelmapper.convention.MatchingStrategies;
+
 import lombok.*;
 import nl.tudelft.labracore.api.dto.RoleSummaryDTO;
 import nl.tudelft.librador.dto.create.Create;
 import nl.tudelft.submit.model.Feedback;
 
-import org.modelmapper.ModelMapper;
-import org.modelmapper.convention.MatchingStrategies;
-
 @Data
 @Builder
 @NoArgsConstructor
diff --git a/src/main/java/nl/tudelft/submit/dto/create/SubmissionDownloadConfigCreateDTO.java b/src/main/java/nl/tudelft/submit/dto/create/SubmissionDownloadConfigCreateDTO.java
index b636108a7c05234402b297aaa00e3e97f82073c7..62d59a07decdcbb0cbe11e63e905ca70f6017c6a 100644
--- a/src/main/java/nl/tudelft/submit/dto/create/SubmissionDownloadConfigCreateDTO.java
+++ b/src/main/java/nl/tudelft/submit/dto/create/SubmissionDownloadConfigCreateDTO.java
@@ -17,14 +17,14 @@
  */
 package nl.tudelft.submit.dto.create;
 
+import com.sun.istack.NotNull;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import nl.tudelft.submit.enums.SubmissionDownloadPreference;
 
-import com.sun.istack.NotNull;
-
 @Data
 @Builder
 @NoArgsConstructor
diff --git a/src/main/java/nl/tudelft/submit/dto/create/SubmitAssignmentCreateDTO.java b/src/main/java/nl/tudelft/submit/dto/create/SubmitAssignmentCreateDTO.java
index a45755d0502b5fb0f3038f8617755920897a8aef..db08838c79ba1d04baeba9a72155b8eabd8b31fc 100644
--- a/src/main/java/nl/tudelft/submit/dto/create/SubmitAssignmentCreateDTO.java
+++ b/src/main/java/nl/tudelft/submit/dto/create/SubmitAssignmentCreateDTO.java
@@ -22,6 +22,8 @@ import java.util.List;
 
 import javax.validation.constraints.NotNull;
 
+import org.springframework.format.annotation.DateTimeFormat;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -32,8 +34,6 @@ import nl.tudelft.labracore.lib.api.GradeScheme;
 import nl.tudelft.librador.dto.create.Create;
 import nl.tudelft.submit.model.SubmitAssignment;
 
-import org.springframework.format.annotation.DateTimeFormat;
-
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
diff --git a/src/main/java/nl/tudelft/submit/dto/create/SubmitEditionCreateDTO.java b/src/main/java/nl/tudelft/submit/dto/create/SubmitEditionCreateDTO.java
index 9c99522739c550fec9710e7336bea3b14c8881b4..2a0cce9cf089f1db02f11f0a351968f39cf5cb51 100644
--- a/src/main/java/nl/tudelft/submit/dto/create/SubmitEditionCreateDTO.java
+++ b/src/main/java/nl/tudelft/submit/dto/create/SubmitEditionCreateDTO.java
@@ -22,6 +22,8 @@ import java.time.LocalDateTime;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
+import org.springframework.format.annotation.DateTimeFormat;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -29,8 +31,6 @@ import lombok.NoArgsConstructor;
 import nl.tudelft.labracore.api.dto.CohortIdDTO;
 import nl.tudelft.labracore.api.dto.CourseIdDTO;
 
-import org.springframework.format.annotation.DateTimeFormat;
-
 @Data
 @Builder
 @AllArgsConstructor
diff --git a/src/main/java/nl/tudelft/submit/dto/create/VersionCreateDTO.java b/src/main/java/nl/tudelft/submit/dto/create/VersionCreateDTO.java
index ec3162d756ed8f7e00b2db1956e80f96b1221054..ea6285be6d6164b789d50d200baffab59e14b7d5 100644
--- a/src/main/java/nl/tudelft/submit/dto/create/VersionCreateDTO.java
+++ b/src/main/java/nl/tudelft/submit/dto/create/VersionCreateDTO.java
@@ -26,6 +26,8 @@ import java.util.stream.Collectors;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
+import org.springframework.format.annotation.DateTimeFormat;
+
 import lombok.*;
 import nl.tudelft.labracore.api.dto.*;
 import nl.tudelft.librador.SpringContext;
@@ -34,8 +36,6 @@ import nl.tudelft.submit.model.SubmitGroup;
 import nl.tudelft.submit.model.Version;
 import nl.tudelft.submit.service.SubmitGroupService;
 
-import org.springframework.format.annotation.DateTimeFormat;
-
 @Data
 @Builder
 @NoArgsConstructor
diff --git a/src/main/java/nl/tudelft/submit/dto/create/announcement/AnnouncementCreateDTO.java b/src/main/java/nl/tudelft/submit/dto/create/announcement/AnnouncementCreateDTO.java
index 7d023e18207b7e864f91a1660e5fb1b89198e443..52713f74d0dee9b69f44c87e7a782136e8e3f08e 100644
--- a/src/main/java/nl/tudelft/submit/dto/create/announcement/AnnouncementCreateDTO.java
+++ b/src/main/java/nl/tudelft/submit/dto/create/announcement/AnnouncementCreateDTO.java
@@ -25,14 +25,14 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
 
+import org.springframework.format.annotation.DateTimeFormat;
+
 import lombok.*;
 import lombok.experimental.SuperBuilder;
 import nl.tudelft.librador.dto.create.Create;
 import nl.tudelft.submit.model.announcement.Announcement;
 import nl.tudelft.submit.repository.announcement.AnnouncementRepository;
 
-import org.springframework.format.annotation.DateTimeFormat;
-
 @Data
 @SuperBuilder
 @NoArgsConstructor
diff --git a/src/main/java/nl/tudelft/submit/dto/create/note/NoteCreateDTO.java b/src/main/java/nl/tudelft/submit/dto/create/note/NoteCreateDTO.java
index 01965659a3983be32fcdf1c7b5fdcb0930443620..252dfd2c5836d2f2f0274e73828e23710ba0b230 100644
--- a/src/main/java/nl/tudelft/submit/dto/create/note/NoteCreateDTO.java
+++ b/src/main/java/nl/tudelft/submit/dto/create/note/NoteCreateDTO.java
@@ -19,15 +19,15 @@ package nl.tudelft.submit.dto.create.note;
 
 import javax.validation.constraints.NotNull;
 
+import org.modelmapper.ModelMapper;
+import org.modelmapper.convention.MatchingStrategies;
+
 import lombok.*;
 import nl.tudelft.librador.dto.create.Create;
 import nl.tudelft.submit.model.Signature;
 import nl.tudelft.submit.model.note.Note;
 import nl.tudelft.submit.repository.note.NoteRepository;
 
-import org.modelmapper.ModelMapper;
-import org.modelmapper.convention.MatchingStrategies;
-
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
diff --git a/src/main/java/nl/tudelft/submit/dto/id/AssignmentNoteIdDTO.java b/src/main/java/nl/tudelft/submit/dto/id/AssignmentNoteIdDTO.java
index 280596f6fcdd9a490ffdc637966ee40a6e806695..b4a828c4ac924b60d4bc4dcbd1a1ebc21583c4b3 100644
--- a/src/main/java/nl/tudelft/submit/dto/id/AssignmentNoteIdDTO.java
+++ b/src/main/java/nl/tudelft/submit/dto/id/AssignmentNoteIdDTO.java
@@ -17,12 +17,12 @@
  */
 package nl.tudelft.submit.dto.id;
 
+import org.springframework.data.repository.CrudRepository;
+
 import nl.tudelft.librador.dto.id.IdDTO;
 import nl.tudelft.submit.model.note.AssignmentNote;
 import nl.tudelft.submit.repository.note.AssignmentNoteRepository;
 
-import org.springframework.data.repository.CrudRepository;
-
 public class AssignmentNoteIdDTO extends IdDTO<AssignmentNote, Long> {
 
 	public AssignmentNoteIdDTO() {
diff --git a/src/main/java/nl/tudelft/submit/dto/id/GroupNoteIdDTO.java b/src/main/java/nl/tudelft/submit/dto/id/GroupNoteIdDTO.java
index adfc6670f05646d3377619f175e0ac3b40129731..83edf8b3f54abbcf045368f876287c74b05f9310 100644
--- a/src/main/java/nl/tudelft/submit/dto/id/GroupNoteIdDTO.java
+++ b/src/main/java/nl/tudelft/submit/dto/id/GroupNoteIdDTO.java
@@ -17,12 +17,12 @@
  */
 package nl.tudelft.submit.dto.id;
 
+import org.springframework.data.repository.CrudRepository;
+
 import nl.tudelft.librador.dto.id.IdDTO;
 import nl.tudelft.submit.model.note.GroupNote;
 import nl.tudelft.submit.repository.note.GroupNoteRepository;
 
-import org.springframework.data.repository.CrudRepository;
-
 public class GroupNoteIdDTO extends IdDTO<GroupNote, Long> {
 
 	public GroupNoteIdDTO() {
diff --git a/src/main/java/nl/tudelft/submit/dto/id/RoleNoteIdDTO.java b/src/main/java/nl/tudelft/submit/dto/id/RoleNoteIdDTO.java
index 33c890c9ac669a40fc3b668092db53d5f787cca4..6c4e7973e5479ef0431e188a357118e99ed6a7ce 100644
--- a/src/main/java/nl/tudelft/submit/dto/id/RoleNoteIdDTO.java
+++ b/src/main/java/nl/tudelft/submit/dto/id/RoleNoteIdDTO.java
@@ -17,12 +17,12 @@
  */
 package nl.tudelft.submit.dto.id;
 
+import org.springframework.data.repository.CrudRepository;
+
 import nl.tudelft.librador.dto.id.IdDTO;
 import nl.tudelft.submit.model.note.RoleNote;
 import nl.tudelft.submit.repository.note.RoleNoteRepository;
 
-import org.springframework.data.repository.CrudRepository;
-
 public class RoleNoteIdDTO extends IdDTO<RoleNote, Long> {
 
 	public RoleNoteIdDTO() {
diff --git a/src/main/java/nl/tudelft/submit/dto/id/ScriptIdDTO.java b/src/main/java/nl/tudelft/submit/dto/id/ScriptIdDTO.java
index dc67f3bdff61774c4db298219ea908ea18de9af4..24d21d0271867b56c26df8a661b1236a64b40835 100644
--- a/src/main/java/nl/tudelft/submit/dto/id/ScriptIdDTO.java
+++ b/src/main/java/nl/tudelft/submit/dto/id/ScriptIdDTO.java
@@ -17,12 +17,12 @@
  */
 package nl.tudelft.submit.dto.id;
 
+import org.springframework.data.repository.CrudRepository;
+
 import nl.tudelft.librador.dto.id.IdDTO;
 import nl.tudelft.submit.model.script.Script;
 import nl.tudelft.submit.repository.script.ScriptRepository;
 
-import org.springframework.data.repository.CrudRepository;
-
 public class ScriptIdDTO extends IdDTO<Script, Long> {
 
 	public ScriptIdDTO() {
diff --git a/src/main/java/nl/tudelft/submit/dto/id/ScriptTrainIdDTO.java b/src/main/java/nl/tudelft/submit/dto/id/ScriptTrainIdDTO.java
index a2be6a50d340f28117e9548dfc3b2392a04ef193..5993a6aa2369235fea28e444d81f69a01de37b55 100644
--- a/src/main/java/nl/tudelft/submit/dto/id/ScriptTrainIdDTO.java
+++ b/src/main/java/nl/tudelft/submit/dto/id/ScriptTrainIdDTO.java
@@ -17,12 +17,12 @@
  */
 package nl.tudelft.submit.dto.id;
 
+import org.springframework.data.repository.CrudRepository;
+
 import nl.tudelft.librador.dto.id.IdDTO;
 import nl.tudelft.submit.model.script.ScriptTrain;
 import nl.tudelft.submit.repository.script.ScriptTrainRepository;
 
-import org.springframework.data.repository.CrudRepository;
-
 public class ScriptTrainIdDTO extends IdDTO<ScriptTrain, Long> {
 
 	public ScriptTrainIdDTO() {
diff --git a/src/main/java/nl/tudelft/submit/dto/id/ScriptWagonIdDTO.java b/src/main/java/nl/tudelft/submit/dto/id/ScriptWagonIdDTO.java
index 2e16a3f5fc21e377681a291f4c201cb0b956fa2d..b9bd708a0b6eadd96b5a9e192208e9a93466b3af 100644
--- a/src/main/java/nl/tudelft/submit/dto/id/ScriptWagonIdDTO.java
+++ b/src/main/java/nl/tudelft/submit/dto/id/ScriptWagonIdDTO.java
@@ -17,12 +17,12 @@
  */
 package nl.tudelft.submit.dto.id;
 
+import org.springframework.data.repository.CrudRepository;
+
 import nl.tudelft.librador.dto.id.IdDTO;
 import nl.tudelft.submit.model.script.ScriptWagon;
 import nl.tudelft.submit.repository.script.ScriptWagonRepository;
 
-import org.springframework.data.repository.CrudRepository;
-
 public class ScriptWagonIdDTO extends IdDTO<ScriptWagon, Long> {
 
 	public ScriptWagonIdDTO() {
diff --git a/src/main/java/nl/tudelft/submit/dto/id/SubmissionNoteIdDTO.java b/src/main/java/nl/tudelft/submit/dto/id/SubmissionNoteIdDTO.java
index 42631d65d1e134e497c81d93cbfa2e846b78d1f3..b25237a93b692b9719c2c904a080e35d5d263404 100644
--- a/src/main/java/nl/tudelft/submit/dto/id/SubmissionNoteIdDTO.java
+++ b/src/main/java/nl/tudelft/submit/dto/id/SubmissionNoteIdDTO.java
@@ -17,12 +17,12 @@
  */
 package nl.tudelft.submit.dto.id;
 
+import org.springframework.data.repository.CrudRepository;
+
 import nl.tudelft.librador.dto.id.IdDTO;
 import nl.tudelft.submit.model.note.SubmissionNote;
 import nl.tudelft.submit.repository.note.SubmissionNoteRepository;
 
-import org.springframework.data.repository.CrudRepository;
-
 public class SubmissionNoteIdDTO extends IdDTO<SubmissionNote, Long> {
 
 	public SubmissionNoteIdDTO() {
diff --git a/src/main/java/nl/tudelft/submit/dto/id/SubmitGroupIdDTO.java b/src/main/java/nl/tudelft/submit/dto/id/SubmitGroupIdDTO.java
index 0b84b011a78c62d66d005db8fc2468f4cd44f27d..575256b7130292c5bb8164046803fdab22beee94 100644
--- a/src/main/java/nl/tudelft/submit/dto/id/SubmitGroupIdDTO.java
+++ b/src/main/java/nl/tudelft/submit/dto/id/SubmitGroupIdDTO.java
@@ -17,12 +17,12 @@
  */
 package nl.tudelft.submit.dto.id;
 
+import org.springframework.data.repository.CrudRepository;
+
 import nl.tudelft.librador.dto.id.IdDTO;
 import nl.tudelft.submit.model.SubmitGroup;
 import nl.tudelft.submit.repository.SubmitGroupRepository;
 
-import org.springframework.data.repository.CrudRepository;
-
 public class SubmitGroupIdDTO extends IdDTO<SubmitGroup, Long> {
 
 	public SubmitGroupIdDTO() {
diff --git a/src/main/java/nl/tudelft/submit/dto/id/SwitchEventIdDTO.java b/src/main/java/nl/tudelft/submit/dto/id/SwitchEventIdDTO.java
index 0ed09c969dd9c8b4dbb2c53502fb6c854b57354b..f1289da618c66bb46786feec65a9e5151b7c9e58 100644
--- a/src/main/java/nl/tudelft/submit/dto/id/SwitchEventIdDTO.java
+++ b/src/main/java/nl/tudelft/submit/dto/id/SwitchEventIdDTO.java
@@ -17,12 +17,12 @@
  */
 package nl.tudelft.submit.dto.id;
 
+import org.springframework.data.repository.CrudRepository;
+
 import nl.tudelft.librador.dto.id.IdDTO;
 import nl.tudelft.submit.model.SwitchEvent;
 import nl.tudelft.submit.repository.SwitchEventRepository;
 
-import org.springframework.data.repository.CrudRepository;
-
 public class SwitchEventIdDTO extends IdDTO<SwitchEvent, Long> {
 
 	public SwitchEventIdDTO() {
diff --git a/src/main/java/nl/tudelft/submit/dto/id/VersionIdDTO.java b/src/main/java/nl/tudelft/submit/dto/id/VersionIdDTO.java
index 113c91d54895b9842ccbc755d861894cb36e87f8..9bbaae3ef1552426c216d75592d0cfd436a009d4 100644
--- a/src/main/java/nl/tudelft/submit/dto/id/VersionIdDTO.java
+++ b/src/main/java/nl/tudelft/submit/dto/id/VersionIdDTO.java
@@ -17,12 +17,12 @@
  */
 package nl.tudelft.submit.dto.id;
 
+import org.springframework.data.repository.CrudRepository;
+
 import nl.tudelft.librador.dto.id.IdDTO;
 import nl.tudelft.submit.model.Version;
 import nl.tudelft.submit.repository.VersionRepository;
 
-import org.springframework.data.repository.CrudRepository;
-
 public class VersionIdDTO extends IdDTO<Version, Long> {
 
 	public VersionIdDTO() {
diff --git a/src/main/java/nl/tudelft/submit/dto/patch/SubmitAssignmentPatchDTO.java b/src/main/java/nl/tudelft/submit/dto/patch/SubmitAssignmentPatchDTO.java
index a358f6411d68035588c313c1996dfaa1ade694a3..ad641bfce7b2e7ce3723ec3d40348013cb7ff8fb 100644
--- a/src/main/java/nl/tudelft/submit/dto/patch/SubmitAssignmentPatchDTO.java
+++ b/src/main/java/nl/tudelft/submit/dto/patch/SubmitAssignmentPatchDTO.java
@@ -20,14 +20,14 @@ package nl.tudelft.submit.dto.patch;
 import java.time.LocalDateTime;
 import java.util.List;
 
+import org.springframework.format.annotation.DateTimeFormat;
+
 import lombok.*;
 import nl.tudelft.labracore.api.dto.*;
 import nl.tudelft.labracore.lib.api.GradeScheme;
 import nl.tudelft.librador.dto.patch.Patch;
 import nl.tudelft.submit.model.SubmitAssignment;
 
-import org.springframework.format.annotation.DateTimeFormat;
-
 @Data
 @Builder
 @NoArgsConstructor
diff --git a/src/main/java/nl/tudelft/submit/dto/patch/VersionPatchDTO.java b/src/main/java/nl/tudelft/submit/dto/patch/VersionPatchDTO.java
index f83b30ee3dd0850c009570ea13a21eb3e756f24d..5b2dcbc2876b7d9ff7d0f666ecc21cc929abaadd 100644
--- a/src/main/java/nl/tudelft/submit/dto/patch/VersionPatchDTO.java
+++ b/src/main/java/nl/tudelft/submit/dto/patch/VersionPatchDTO.java
@@ -22,6 +22,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import org.springframework.format.annotation.DateTimeFormat;
+
 import lombok.*;
 import nl.tudelft.librador.SpringContext;
 import nl.tudelft.librador.dto.patch.Patch;
@@ -30,8 +32,6 @@ import nl.tudelft.submit.model.SubmitGroup;
 import nl.tudelft.submit.model.Version;
 import nl.tudelft.submit.service.SubmitGroupService;
 
-import org.springframework.format.annotation.DateTimeFormat;
-
 @Data
 @Builder
 @NoArgsConstructor
diff --git a/src/main/java/nl/tudelft/submit/dto/view/VersionViewDTO.java b/src/main/java/nl/tudelft/submit/dto/view/VersionViewDTO.java
index 851d6a749631f0e02efcdef07c0c7ecabcfc54fb..3c91c80f58fb7fee4990abc7b23b58c1327fc8a0 100644
--- a/src/main/java/nl/tudelft/submit/dto/view/VersionViewDTO.java
+++ b/src/main/java/nl/tudelft/submit/dto/view/VersionViewDTO.java
@@ -20,6 +20,8 @@ package nl.tudelft.submit.dto.view;
 import java.time.LocalDateTime;
 import java.util.List;
 
+import org.springframework.format.annotation.DateTimeFormat;
+
 import lombok.*;
 import nl.tudelft.labracore.api.dto.AssignmentIdDTO;
 import nl.tudelft.librador.dto.view.View;
@@ -28,8 +30,6 @@ import nl.tudelft.submit.dto.id.ScriptTrainIdDTO;
 import nl.tudelft.submit.dto.id.SubmitGroupIdDTO;
 import nl.tudelft.submit.model.Version;
 
-import org.springframework.format.annotation.DateTimeFormat;
-
 @Data
 @Builder
 @NoArgsConstructor
diff --git a/src/main/java/nl/tudelft/submit/repository/EditionApiKeyRepository.java b/src/main/java/nl/tudelft/submit/repository/EditionApiKeyRepository.java
index 9827ea10d29a47d392f95569a5122e879f8841cc..d04808ec4088c45c477318e3ba76d8b3057107a3 100644
--- a/src/main/java/nl/tudelft/submit/repository/EditionApiKeyRepository.java
+++ b/src/main/java/nl/tudelft/submit/repository/EditionApiKeyRepository.java
@@ -17,10 +17,10 @@
  */
 package nl.tudelft.submit.repository;
 
-import nl.tudelft.submit.model.api.EditionApiKey;
-
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import nl.tudelft.submit.model.api.EditionApiKey;
+
 public interface EditionApiKeyRepository extends JpaRepository<EditionApiKey, Long> {
 
 	boolean existsByEditionIdAndKey(Long editionId, String key);
diff --git a/src/main/java/nl/tudelft/submit/repository/FeedbackRepository.java b/src/main/java/nl/tudelft/submit/repository/FeedbackRepository.java
index 1a1556ac8828f382ce3c86d399e1f02e1bc8da93..619230b33f1b671e69fc765a712d6c24894108e8 100644
--- a/src/main/java/nl/tudelft/submit/repository/FeedbackRepository.java
+++ b/src/main/java/nl/tudelft/submit/repository/FeedbackRepository.java
@@ -19,12 +19,12 @@ package nl.tudelft.submit.repository;
 
 import java.util.List;
 
-import nl.tudelft.submit.model.Feedback;
-
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.rest.webmvc.ResourceNotFoundException;
 import org.springframework.stereotype.Repository;
 
+import nl.tudelft.submit.model.Feedback;
+
 @Repository
 public interface FeedbackRepository extends JpaRepository<Feedback, Long> {
 
diff --git a/src/main/java/nl/tudelft/submit/repository/NotificationRepository.java b/src/main/java/nl/tudelft/submit/repository/NotificationRepository.java
index 00c35efeccba421eeb458f1cd227340a470fd47e..0517136c719f2e215a1cbe616a73e56f0bd9c98f 100644
--- a/src/main/java/nl/tudelft/submit/repository/NotificationRepository.java
+++ b/src/main/java/nl/tudelft/submit/repository/NotificationRepository.java
@@ -19,10 +19,10 @@ package nl.tudelft.submit.repository;
 
 import java.util.List;
 
-import nl.tudelft.submit.model.Notification;
-
 import org.springframework.data.repository.CrudRepository;
 
+import nl.tudelft.submit.model.Notification;
+
 public interface NotificationRepository extends CrudRepository<Notification, Long> {
 
 	/**
diff --git a/src/main/java/nl/tudelft/submit/repository/SubmissionKeyRepository.java b/src/main/java/nl/tudelft/submit/repository/SubmissionKeyRepository.java
index 38bb85c895e8590293c21b465d08a7721ae934b9..419fa62b914045b71dfcbb07c999d642f105930c 100644
--- a/src/main/java/nl/tudelft/submit/repository/SubmissionKeyRepository.java
+++ b/src/main/java/nl/tudelft/submit/repository/SubmissionKeyRepository.java
@@ -19,11 +19,11 @@ package nl.tudelft.submit.repository;
 
 import java.util.Optional;
 
-import nl.tudelft.submit.model.script.SubmissionKey;
-
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.rest.webmvc.ResourceNotFoundException;
 
+import nl.tudelft.submit.model.script.SubmissionKey;
+
 public interface SubmissionKeyRepository extends JpaRepository<SubmissionKey, Long> {
 
 	Optional<SubmissionKey> findBySubmissionIdAndScriptId(Long submissionId, Long scriptId);
diff --git a/src/main/java/nl/tudelft/submit/repository/SubmitAssignmentRepository.java b/src/main/java/nl/tudelft/submit/repository/SubmitAssignmentRepository.java
index 4feee4089ede4c8852768cddcea2d02fe96e3f7f..f94e181198e73c0611ee5e8b12369fab582a5512 100644
--- a/src/main/java/nl/tudelft/submit/repository/SubmitAssignmentRepository.java
+++ b/src/main/java/nl/tudelft/submit/repository/SubmitAssignmentRepository.java
@@ -17,11 +17,11 @@
  */
 package nl.tudelft.submit.repository;
 
-import nl.tudelft.submit.model.SubmitAssignment;
-
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.rest.webmvc.ResourceNotFoundException;
 
+import nl.tudelft.submit.model.SubmitAssignment;
+
 public interface SubmitAssignmentRepository extends JpaRepository<SubmitAssignment, Long> {
 
 	/**
diff --git a/src/main/java/nl/tudelft/submit/repository/SubmitEditionRepository.java b/src/main/java/nl/tudelft/submit/repository/SubmitEditionRepository.java
index f85e2704b5521bd466294ebd2166d904bcaa6d26..62978889bda819cd34a3536ff0891cdf018552ae 100644
--- a/src/main/java/nl/tudelft/submit/repository/SubmitEditionRepository.java
+++ b/src/main/java/nl/tudelft/submit/repository/SubmitEditionRepository.java
@@ -19,11 +19,11 @@ package nl.tudelft.submit.repository;
 
 import java.util.List;
 
-import nl.tudelft.submit.model.SubmitEdition;
-
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.rest.webmvc.ResourceNotFoundException;
 
+import nl.tudelft.submit.model.SubmitEdition;
+
 public interface SubmitEditionRepository extends JpaRepository<SubmitEdition, Long> {
 
 	/**
diff --git a/src/main/java/nl/tudelft/submit/repository/SubmitGroupRepository.java b/src/main/java/nl/tudelft/submit/repository/SubmitGroupRepository.java
index a0ac44b15b3ea9ea5a2ab34c60a4bd9cff732777..7b5fc73f6dca70a173c966ff22a0fd8dc351023d 100644
--- a/src/main/java/nl/tudelft/submit/repository/SubmitGroupRepository.java
+++ b/src/main/java/nl/tudelft/submit/repository/SubmitGroupRepository.java
@@ -19,13 +19,13 @@ package nl.tudelft.submit.repository;
 
 import java.util.List;
 
-import nl.tudelft.submit.model.SubmitGroup;
-import nl.tudelft.submit.model.Version;
-
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.rest.webmvc.ResourceNotFoundException;
 import org.springframework.stereotype.Repository;
 
+import nl.tudelft.submit.model.SubmitGroup;
+import nl.tudelft.submit.model.Version;
+
 @Repository
 public interface SubmitGroupRepository extends JpaRepository<SubmitGroup, Long> {
 
diff --git a/src/main/java/nl/tudelft/submit/repository/SubmitSubmissionRepository.java b/src/main/java/nl/tudelft/submit/repository/SubmitSubmissionRepository.java
index 17268e9c0bbb600e752d14abaea781d5734bea1b..cfec29eccdac9913952aa1f75db15c0501fb58f1 100644
--- a/src/main/java/nl/tudelft/submit/repository/SubmitSubmissionRepository.java
+++ b/src/main/java/nl/tudelft/submit/repository/SubmitSubmissionRepository.java
@@ -17,12 +17,12 @@
  */
 package nl.tudelft.submit.repository;
 
-import nl.tudelft.submit.model.SubmitSubmission;
-
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.rest.webmvc.ResourceNotFoundException;
 import org.springframework.stereotype.Repository;
 
+import nl.tudelft.submit.model.SubmitSubmission;
+
 @Repository
 public interface SubmitSubmissionRepository extends JpaRepository<SubmitSubmission, Long> {
 
diff --git a/src/main/java/nl/tudelft/submit/repository/SwitchEventRepository.java b/src/main/java/nl/tudelft/submit/repository/SwitchEventRepository.java
index ea3c3da75514d0310ecb98d951108b61ffdb81d9..b04ccb9ae9be83eed930881e98e58b6523e2c4e4 100644
--- a/src/main/java/nl/tudelft/submit/repository/SwitchEventRepository.java
+++ b/src/main/java/nl/tudelft/submit/repository/SwitchEventRepository.java
@@ -19,11 +19,11 @@ package nl.tudelft.submit.repository;
 
 import java.util.List;
 
-import nl.tudelft.submit.model.SwitchEvent;
-
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.rest.webmvc.ResourceNotFoundException;
 
+import nl.tudelft.submit.model.SwitchEvent;
+
 public interface SwitchEventRepository extends JpaRepository<SwitchEvent, Long> {
 
 	/**
diff --git a/src/main/java/nl/tudelft/submit/repository/UserSettingsRepository.java b/src/main/java/nl/tudelft/submit/repository/UserSettingsRepository.java
index a23326328f3a9f719cdd5a622d9f1be2ec8a7d99..62c4858916ef917f51b3e96f6f1ac231818c665a 100644
--- a/src/main/java/nl/tudelft/submit/repository/UserSettingsRepository.java
+++ b/src/main/java/nl/tudelft/submit/repository/UserSettingsRepository.java
@@ -19,12 +19,12 @@ package nl.tudelft.submit.repository;
 
 import java.util.Optional;
 
-import nl.tudelft.submit.model.UserSettings;
-
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.rest.webmvc.ResourceNotFoundException;
 import org.springframework.stereotype.Repository;
 
+import nl.tudelft.submit.model.UserSettings;
+
 @Repository
 public interface UserSettingsRepository extends JpaRepository<UserSettings, Long> {
 
diff --git a/src/main/java/nl/tudelft/submit/repository/VersionRepository.java b/src/main/java/nl/tudelft/submit/repository/VersionRepository.java
index 0e7eff25420d97fa8ef55c249230fd8d1bdd8a1f..49d1a4ff13196e0ca5978c8fc8d66e27bec23480 100644
--- a/src/main/java/nl/tudelft/submit/repository/VersionRepository.java
+++ b/src/main/java/nl/tudelft/submit/repository/VersionRepository.java
@@ -20,13 +20,13 @@ package nl.tudelft.submit.repository;
 import java.util.List;
 import java.util.Optional;
 
-import nl.tudelft.submit.model.SubmitGroup;
-import nl.tudelft.submit.model.Version;
-
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.rest.webmvc.ResourceNotFoundException;
 import org.springframework.stereotype.Repository;
 
+import nl.tudelft.submit.model.SubmitGroup;
+import nl.tudelft.submit.model.Version;
+
 @Repository
 public interface VersionRepository extends JpaRepository<Version, Long> {
 
diff --git a/src/main/java/nl/tudelft/submit/repository/announcement/AnnouncementRepository.java b/src/main/java/nl/tudelft/submit/repository/announcement/AnnouncementRepository.java
index 025e86883f0a7363c3a4be30ee7583f8ef054f30..930247af604c17988668b164db74527b8a09a6d6 100644
--- a/src/main/java/nl/tudelft/submit/repository/announcement/AnnouncementRepository.java
+++ b/src/main/java/nl/tudelft/submit/repository/announcement/AnnouncementRepository.java
@@ -20,12 +20,12 @@ package nl.tudelft.submit.repository.announcement;
 import java.time.LocalDateTime;
 import java.util.List;
 
-import nl.tudelft.submit.model.announcement.Announcement;
-
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.repository.NoRepositoryBean;
 import org.springframework.data.rest.webmvc.ResourceNotFoundException;
 
+import nl.tudelft.submit.model.announcement.Announcement;
+
 @NoRepositoryBean
 public interface AnnouncementRepository<A extends Announcement> extends JpaRepository<A, Long> {
 
diff --git a/src/main/java/nl/tudelft/submit/repository/grading/CalculatedScoreRepository.java b/src/main/java/nl/tudelft/submit/repository/grading/CalculatedScoreRepository.java
index b687d3cc1a1b1e01180a9b0773c1c5d7ba5819bf..bf28e240a78c7ef3ed13d4d84c977a04a42999ec 100644
--- a/src/main/java/nl/tudelft/submit/repository/grading/CalculatedScoreRepository.java
+++ b/src/main/java/nl/tudelft/submit/repository/grading/CalculatedScoreRepository.java
@@ -20,13 +20,13 @@ package nl.tudelft.submit.repository.grading;
 import java.util.List;
 import java.util.Optional;
 
-import nl.tudelft.labracore.api.dto.PersonIdDTO;
-import nl.tudelft.submit.model.grading.CalculatedScore;
-
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.repository.NoRepositoryBean;
 import org.springframework.data.rest.webmvc.ResourceNotFoundException;
 
+import nl.tudelft.labracore.api.dto.PersonIdDTO;
+import nl.tudelft.submit.model.grading.CalculatedScore;
+
 @NoRepositoryBean
 public interface CalculatedScoreRepository<E_ID, T extends CalculatedScore>
 		extends JpaRepository<T, CalculatedScore.Id> {
diff --git a/src/main/java/nl/tudelft/submit/repository/grading/GradingFormulaRepository.java b/src/main/java/nl/tudelft/submit/repository/grading/GradingFormulaRepository.java
index ed8e30af50975434d829d391abc28767b864d72a..2899d6956b3c595b83263bf020afc2d46d328384 100644
--- a/src/main/java/nl/tudelft/submit/repository/grading/GradingFormulaRepository.java
+++ b/src/main/java/nl/tudelft/submit/repository/grading/GradingFormulaRepository.java
@@ -19,12 +19,12 @@ package nl.tudelft.submit.repository.grading;
 
 import java.io.Serializable;
 
-import nl.tudelft.submit.model.grading.GradingFormula;
-
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.repository.NoRepositoryBean;
 import org.springframework.data.rest.webmvc.ResourceNotFoundException;
 
+import nl.tudelft.submit.model.grading.GradingFormula;
+
 @NoRepositoryBean
 public interface GradingFormulaRepository<E extends Serializable, T extends GradingFormula<E>>
 		extends JpaRepository<T, E> {
diff --git a/src/main/java/nl/tudelft/submit/repository/note/NoteRepository.java b/src/main/java/nl/tudelft/submit/repository/note/NoteRepository.java
index 734b1d22d2a944f2cbd2e50d66a13f70147b1809..124fd91eeb898cea9be9e6a0a61aa589b0f1b708 100644
--- a/src/main/java/nl/tudelft/submit/repository/note/NoteRepository.java
+++ b/src/main/java/nl/tudelft/submit/repository/note/NoteRepository.java
@@ -21,12 +21,12 @@ import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import nl.tudelft.submit.model.note.Note;
-
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.repository.NoRepositoryBean;
 import org.springframework.data.rest.webmvc.ResourceNotFoundException;
 
+import nl.tudelft.submit.model.note.Note;
+
 @NoRepositoryBean
 public interface NoteRepository<ID, T extends Note<ID>> extends JpaRepository<T, Long> {
 
diff --git a/src/main/java/nl/tudelft/submit/repository/script/AbstractScriptResultRepository.java b/src/main/java/nl/tudelft/submit/repository/script/AbstractScriptResultRepository.java
index bd2ec94f0604a46ded6fcfb92333d0d050085dc8..90b499c738c6e2fe8fe907b56cbda7c3f7d53323 100644
--- a/src/main/java/nl/tudelft/submit/repository/script/AbstractScriptResultRepository.java
+++ b/src/main/java/nl/tudelft/submit/repository/script/AbstractScriptResultRepository.java
@@ -17,11 +17,11 @@
  */
 package nl.tudelft.submit.repository.script;
 
-import nl.tudelft.submit.model.script.AbstractScriptResult;
-
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.repository.NoRepositoryBean;
 
+import nl.tudelft.submit.model.script.AbstractScriptResult;
+
 @NoRepositoryBean
 public interface AbstractScriptResultRepository<T extends AbstractScriptResult>
 		extends JpaRepository<T, Long> {
diff --git a/src/main/java/nl/tudelft/submit/repository/script/ScriptFeedbackRepository.java b/src/main/java/nl/tudelft/submit/repository/script/ScriptFeedbackRepository.java
index 53ea9c788417e5a3d693ad1072687e8213480db8..0982b781aaaf50510a86449b0399df339dcc2242 100644
--- a/src/main/java/nl/tudelft/submit/repository/script/ScriptFeedbackRepository.java
+++ b/src/main/java/nl/tudelft/submit/repository/script/ScriptFeedbackRepository.java
@@ -17,9 +17,9 @@
  */
 package nl.tudelft.submit.repository.script;
 
-import nl.tudelft.submit.model.script.ScriptFeedback;
-
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import nl.tudelft.submit.model.script.ScriptFeedback;
+
 public interface ScriptFeedbackRepository extends JpaRepository<ScriptFeedback, Long> {
 }
diff --git a/src/main/java/nl/tudelft/submit/repository/script/ScriptRepository.java b/src/main/java/nl/tudelft/submit/repository/script/ScriptRepository.java
index 5f5fe5764420e186430dae493f4e01e8523586eb..2b2e1a89b5a7bac3b5814ba54b80a33e39be113f 100644
--- a/src/main/java/nl/tudelft/submit/repository/script/ScriptRepository.java
+++ b/src/main/java/nl/tudelft/submit/repository/script/ScriptRepository.java
@@ -19,11 +19,11 @@ package nl.tudelft.submit.repository.script;
 
 import java.util.Optional;
 
-import nl.tudelft.submit.model.script.Script;
-
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.rest.webmvc.ResourceNotFoundException;
 
+import nl.tudelft.submit.model.script.Script;
+
 public interface ScriptRepository extends JpaRepository<Script, Long> {
 
 	/**
diff --git a/src/main/java/nl/tudelft/submit/repository/script/ScriptTrainRepository.java b/src/main/java/nl/tudelft/submit/repository/script/ScriptTrainRepository.java
index 22fccb8d5f1b8980afc303bc16b3b5a97fe41393..ec8203c6c75adafefebc3c611d62b20c686f217a 100644
--- a/src/main/java/nl/tudelft/submit/repository/script/ScriptTrainRepository.java
+++ b/src/main/java/nl/tudelft/submit/repository/script/ScriptTrainRepository.java
@@ -19,11 +19,11 @@ package nl.tudelft.submit.repository.script;
 
 import java.util.Optional;
 
-import nl.tudelft.submit.model.script.ScriptTrain;
-
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.rest.webmvc.ResourceNotFoundException;
 
+import nl.tudelft.submit.model.script.ScriptTrain;
+
 public interface ScriptTrainRepository extends JpaRepository<ScriptTrain, Long> {
 
 	/**
diff --git a/src/main/java/nl/tudelft/submit/repository/script/ScriptWagonRepository.java b/src/main/java/nl/tudelft/submit/repository/script/ScriptWagonRepository.java
index 8a268a4a20bfe951774e59e3e0e66835db9259b0..27a0c0d66e8b133f43039062b8c8df9b78bd5270 100644
--- a/src/main/java/nl/tudelft/submit/repository/script/ScriptWagonRepository.java
+++ b/src/main/java/nl/tudelft/submit/repository/script/ScriptWagonRepository.java
@@ -17,11 +17,11 @@
  */
 package nl.tudelft.submit.repository.script;
 
-import nl.tudelft.submit.model.script.ScriptWagon;
-
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.rest.webmvc.ResourceNotFoundException;
 
+import nl.tudelft.submit.model.script.ScriptWagon;
+
 public interface ScriptWagonRepository extends JpaRepository<ScriptWagon, Long> {
 
 	/**
diff --git a/src/main/java/nl/tudelft/submit/security/AuthorizationService.java b/src/main/java/nl/tudelft/submit/security/AuthorizationService.java
index 96ce3b9d1b7c673017eaca25cd02a7209549c560..647e63e50475c2681026f3b0354fcdee1adb963a 100644
--- a/src/main/java/nl/tudelft/submit/security/AuthorizationService.java
+++ b/src/main/java/nl/tudelft/submit/security/AuthorizationService.java
@@ -21,6 +21,13 @@ import static nl.tudelft.labracore.api.dto.RoleDetailsDTO.TypeEnum.*;
 
 import javax.annotation.Nullable;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.messaging.Message;
+import org.springframework.messaging.simp.stomp.StompHeaderAccessor;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.stereotype.Service;
+
 import nl.tudelft.labracore.api.*;
 import nl.tudelft.labracore.api.dto.*;
 import nl.tudelft.labracore.lib.security.LabradorUserDetails;
@@ -39,13 +46,6 @@ import nl.tudelft.submit.repository.script.ScriptTrainRepository;
 import nl.tudelft.submit.repository.script.ScriptWagonRepository;
 import nl.tudelft.submit.service.VersionService;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.messaging.Message;
-import org.springframework.messaging.simp.stomp.StompHeaderAccessor;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.stereotype.Service;
-
 @Service
 public class AuthorizationService {
 
diff --git a/src/main/java/nl/tudelft/submit/security/LoginSecurityConfigurerAdapter.java b/src/main/java/nl/tudelft/submit/security/LoginSecurityConfigurerAdapter.java
index 191ad6fb30dc5123cb2346823a6a55b16c1f6b90..646ab531d0d8d56f28ab369b3008972a95eb9abe 100644
--- a/src/main/java/nl/tudelft/submit/security/LoginSecurityConfigurerAdapter.java
+++ b/src/main/java/nl/tudelft/submit/security/LoginSecurityConfigurerAdapter.java
@@ -17,14 +17,14 @@
  */
 package nl.tudelft.submit.security;
 
-import nl.tudelft.labracore.lib.security.LabradorSecurityConfigurerAdapter;
-
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.annotation.Order;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 
+import nl.tudelft.labracore.lib.security.LabradorSecurityConfigurerAdapter;
+
 /**
  * Security configuration adapter required to make use of the LabraDoor login.
  *
diff --git a/src/main/java/nl/tudelft/submit/security/LoginUserHandler.java b/src/main/java/nl/tudelft/submit/security/LoginUserHandler.java
index be672dd3c7a1962aee4dd1e43a5e01ed762038c4..6278d6b75fe8ee89913002328235598a1324062b 100644
--- a/src/main/java/nl/tudelft/submit/security/LoginUserHandler.java
+++ b/src/main/java/nl/tudelft/submit/security/LoginUserHandler.java
@@ -17,13 +17,12 @@
  */
 package nl.tudelft.submit.security;
 
-import nl.tudelft.labracore.lib.security.LabradorUserHandler;
-import nl.tudelft.labracore.lib.security.user.Person;
-
 import org.springframework.stereotype.Service;
 
 import io.sentry.Sentry;
 import io.sentry.protocol.User;
+import nl.tudelft.labracore.lib.security.LabradorUserHandler;
+import nl.tudelft.labracore.lib.security.user.Person;
 
 /**
  * Interface for handling user logins on the client implementation.
diff --git a/src/main/java/nl/tudelft/submit/security/LoginUserProvider.java b/src/main/java/nl/tudelft/submit/security/LoginUserProvider.java
index 0d4ab69cb208e38b1f8345b5b4964aa9b7ea278f..9ababe72cc2ad036ebc301839eec848d0fff635a 100644
--- a/src/main/java/nl/tudelft/submit/security/LoginUserProvider.java
+++ b/src/main/java/nl/tudelft/submit/security/LoginUserProvider.java
@@ -19,11 +19,11 @@ package nl.tudelft.submit.security;
 
 import static nl.tudelft.labracore.lib.security.user.DefaultRole.*;
 
-import nl.tudelft.labracore.lib.security.memory.InMemoryUserProvider;
-
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
 
+import nl.tudelft.labracore.lib.security.memory.InMemoryUserProvider;
+
 /**
  * Provider for in-memory user information.
  *
diff --git a/src/main/java/nl/tudelft/submit/service/AnnouncementService.java b/src/main/java/nl/tudelft/submit/service/AnnouncementService.java
index 04b1cb432a7dc647fc8e91497c79688eba42610f..d125ce17ff2f8235a7c727a083850bffffc9b72e 100644
--- a/src/main/java/nl/tudelft/submit/service/AnnouncementService.java
+++ b/src/main/java/nl/tudelft/submit/service/AnnouncementService.java
@@ -22,6 +22,10 @@ import java.util.List;
 
 import javax.transaction.Transactional;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.stereotype.Service;
+
 import nl.tudelft.submit.dto.create.announcement.AnnouncementCreateDTO;
 import nl.tudelft.submit.model.announcement.Announcement;
 import nl.tudelft.submit.model.announcement.EditionAnnouncement;
@@ -30,10 +34,6 @@ import nl.tudelft.submit.repository.announcement.AnnouncementRepository;
 import nl.tudelft.submit.repository.announcement.EditionAnnouncementRepository;
 import nl.tudelft.submit.repository.announcement.GlobalAnnouncementRepository;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
-import org.springframework.stereotype.Service;
-
 @Service
 @Transactional
 public class AnnouncementService {
diff --git a/src/main/java/nl/tudelft/submit/service/ApiKeyService.java b/src/main/java/nl/tudelft/submit/service/ApiKeyService.java
index 1d99ce861a3b6687ec80faca4ad7a77c46344fa6..db0a137266222afbe82b6b412ca1d9baf957e7f2 100644
--- a/src/main/java/nl/tudelft/submit/service/ApiKeyService.java
+++ b/src/main/java/nl/tudelft/submit/service/ApiKeyService.java
@@ -17,12 +17,12 @@
  */
 package nl.tudelft.submit.service;
 
-import nl.tudelft.submit.cache.ModuleCacheManager;
-import nl.tudelft.submit.repository.EditionApiKeyRepository;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import nl.tudelft.submit.cache.ModuleCacheManager;
+import nl.tudelft.submit.repository.EditionApiKeyRepository;
+
 @Service
 public class ApiKeyService {
 
diff --git a/src/main/java/nl/tudelft/submit/service/AssignmentService.java b/src/main/java/nl/tudelft/submit/service/AssignmentService.java
index 081c2c6e70a7ec6abbb006307419d64209e1bbee..835c2b3bb03985887b77dc8fe03228a0085cb7f7 100644
--- a/src/main/java/nl/tudelft/submit/service/AssignmentService.java
+++ b/src/main/java/nl/tudelft/submit/service/AssignmentService.java
@@ -24,6 +24,13 @@ import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import org.modelmapper.ModelMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
+import com.opencsv.exceptions.CsvValidationException;
+
 import nl.tudelft.labracore.api.AssignmentControllerApi;
 import nl.tudelft.labracore.api.GradeControllerApi;
 import nl.tudelft.labracore.api.dto.*;
@@ -45,13 +52,6 @@ import nl.tudelft.submit.model.note.AssignmentNote;
 import nl.tudelft.submit.repository.SubmitAssignmentRepository;
 import nl.tudelft.submit.repository.note.AssignmentNoteRepository;
 
-import org.modelmapper.ModelMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-
-import com.opencsv.exceptions.CsvValidationException;
-
 @Service
 public class AssignmentService {
 
diff --git a/src/main/java/nl/tudelft/submit/service/CohortService.java b/src/main/java/nl/tudelft/submit/service/CohortService.java
index 6b7f41986552fc485585ec0a179c37c43aa83499..8fbd540d1d716160f86916ecdfb0b1c89ba77ac7 100644
--- a/src/main/java/nl/tudelft/submit/service/CohortService.java
+++ b/src/main/java/nl/tudelft/submit/service/CohortService.java
@@ -19,12 +19,12 @@ package nl.tudelft.submit.service;
 
 import java.util.List;
 
-import nl.tudelft.labracore.api.CohortControllerApi;
-import nl.tudelft.labracore.api.dto.CohortSummaryDTO;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import nl.tudelft.labracore.api.CohortControllerApi;
+import nl.tudelft.labracore.api.dto.CohortSummaryDTO;
+
 @Service
 public class CohortService {
 
diff --git a/src/main/java/nl/tudelft/submit/service/CourseService.java b/src/main/java/nl/tudelft/submit/service/CourseService.java
index 1a29387c83488fddf28f9c23de30837a93a4f6be..622c8c9ff62ddfc121766a4cf3f5df064c13b253 100644
--- a/src/main/java/nl/tudelft/submit/service/CourseService.java
+++ b/src/main/java/nl/tudelft/submit/service/CourseService.java
@@ -19,14 +19,14 @@ package nl.tudelft.submit.service;
 
 import java.util.List;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
 import nl.tudelft.labracore.api.CourseControllerApi;
 import nl.tudelft.labracore.api.dto.CourseSummaryDTO;
 import nl.tudelft.labracore.api.dto.PersonIdDTO;
 import nl.tudelft.submit.security.AuthorizationService;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 @Service
 public class CourseService {
 
diff --git a/src/main/java/nl/tudelft/submit/service/EditionService.java b/src/main/java/nl/tudelft/submit/service/EditionService.java
index cb96d6bb78e618cac367c13ce629af85c7259d09..065cdc3451ddd0a2e8b949a9a2211b8950ea85ed 100644
--- a/src/main/java/nl/tudelft/submit/service/EditionService.java
+++ b/src/main/java/nl/tudelft/submit/service/EditionService.java
@@ -23,6 +23,15 @@ import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import org.modelmapper.ModelMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.google.common.collect.Sets;
+import com.opencsv.exceptions.CsvValidationException;
+
 import nl.tudelft.labracore.api.EditionControllerApi;
 import nl.tudelft.labracore.api.dto.*;
 import nl.tudelft.labracore.lib.security.user.Person;
@@ -42,15 +51,6 @@ import nl.tudelft.submit.enums.NotificationPreference;
 import nl.tudelft.submit.model.SubmitEdition;
 import nl.tudelft.submit.repository.SubmitEditionRepository;
 
-import org.modelmapper.ModelMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.google.common.collect.Sets;
-import com.opencsv.exceptions.CsvValidationException;
-
 @Service
 public class EditionService {
 
@@ -124,8 +124,8 @@ public class EditionService {
 
 		Set<Long> hidden = getOrCreateSubmitEditions(
 				editions.stream().map(EditionDetailsDTO::getId).collect(Collectors.toList()))
-						.stream().filter(SubmitEdition::getHidden).map(SubmitEdition::getId)
-						.collect(Collectors.toSet());
+				.stream().filter(SubmitEdition::getHidden).map(SubmitEdition::getId)
+				.collect(Collectors.toSet());
 
 		return editions.stream()
 				.filter(e -> getEditionRoles(e.getId()).stream()
@@ -149,8 +149,8 @@ public class EditionService {
 		List<RoleEditionDetailsDTO> roles = personService.getRolesForPerson(personId.getId());
 		Set<Long> hidden = getOrCreateSubmitEditions(
 				roles.stream().map(r -> r.getEdition().getId()).collect(Collectors.toList()))
-						.stream().filter(SubmitEdition::getHidden).map(SubmitEdition::getId)
-						.collect(Collectors.toSet());
+				.stream().filter(SubmitEdition::getHidden).map(SubmitEdition::getId)
+				.collect(Collectors.toSet());
 		return roles.stream()
 				.filter(r -> !r.getEdition().getIsArchived()
 						|| r.getType() == RoleEditionDetailsDTO.TypeEnum.TEACHER_RO)
diff --git a/src/main/java/nl/tudelft/submit/service/EmailService.java b/src/main/java/nl/tudelft/submit/service/EmailService.java
index 0ba22e2cf3b33b5aa514c607de9e35d5aab74bf2..53697ba7db17c2cf8a73b25d2af0168b23444970 100644
--- a/src/main/java/nl/tudelft/submit/service/EmailService.java
+++ b/src/main/java/nl/tudelft/submit/service/EmailService.java
@@ -25,10 +25,6 @@ import java.util.stream.Collectors;
 import javax.mail.MessagingException;
 import javax.mail.internet.MimeMessage;
 
-import nl.tudelft.labracore.api.dto.PersonSummaryDTO;
-import nl.tudelft.labracore.lib.security.LabradorUserDetails;
-import nl.tudelft.submit.dto.create.MailMessageCreateDTO;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.mail.javamail.MimeMessageHelper;
@@ -38,6 +34,10 @@ import org.springframework.stereotype.Service;
 import org.thymeleaf.TemplateEngine;
 import org.thymeleaf.context.Context;
 
+import nl.tudelft.labracore.api.dto.PersonSummaryDTO;
+import nl.tudelft.labracore.lib.security.LabradorUserDetails;
+import nl.tudelft.submit.dto.create.MailMessageCreateDTO;
+
 @Service
 public class EmailService {
 
diff --git a/src/main/java/nl/tudelft/submit/service/ExportService.java b/src/main/java/nl/tudelft/submit/service/ExportService.java
index 3bdec702c2695b7220ad67415adfb7e10f2ea4a9..feff88eceafba266b77ebdad5814703486033c80 100644
--- a/src/main/java/nl/tudelft/submit/service/ExportService.java
+++ b/src/main/java/nl/tudelft/submit/service/ExportService.java
@@ -23,6 +23,10 @@ import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
 import nl.tudelft.labracore.api.dto.*;
 import nl.tudelft.submit.cache.EditionCacheManager;
 import nl.tudelft.submit.cache.ModuleCacheManager;
@@ -36,10 +40,6 @@ import nl.tudelft.submit.enums.ScriptGradePolicy;
 import nl.tudelft.submit.model.Feedback;
 import nl.tudelft.submit.repository.note.GroupNoteRepository;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-
 @Service
 public class ExportService {
 
diff --git a/src/main/java/nl/tudelft/submit/service/FeedbackService.java b/src/main/java/nl/tudelft/submit/service/FeedbackService.java
index c3fa6d33ac05002377bd84abed8fc26cc0792235..85c2e6f4197d96ba5c4fe02aa9530c674ca71708 100644
--- a/src/main/java/nl/tudelft/submit/service/FeedbackService.java
+++ b/src/main/java/nl/tudelft/submit/service/FeedbackService.java
@@ -21,6 +21,9 @@ import java.util.*;
 
 import javax.transaction.Transactional;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
 import nl.tudelft.labracore.api.dto.SubmissionSummaryDTO;
 import nl.tudelft.librador.dto.view.View;
 import nl.tudelft.submit.dto.create.FeedbackCreateDTO;
@@ -29,9 +32,6 @@ import nl.tudelft.submit.dto.view.FeedbackViewDTO;
 import nl.tudelft.submit.model.Feedback;
 import nl.tudelft.submit.repository.FeedbackRepository;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 @Service
 public class FeedbackService {
 
diff --git a/src/main/java/nl/tudelft/submit/service/FormulaService.java b/src/main/java/nl/tudelft/submit/service/FormulaService.java
index 4b73d82c98982200a7a31c80c80a98d61f2979f3..52fb2708523797b5046dded008f4aaa083fc1524 100644
--- a/src/main/java/nl/tudelft/submit/service/FormulaService.java
+++ b/src/main/java/nl/tudelft/submit/service/FormulaService.java
@@ -32,6 +32,17 @@ import java.util.regex.Matcher;
 
 import javax.transaction.Transactional;
 
+import org.modelmapper.ModelMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.data.util.Pair;
+import org.springframework.stereotype.Service;
+import org.typemeta.funcj.data.IList;
+import org.typemeta.funcj.parser.Parser;
+import org.typemeta.funcj.parser.Ref;
+import org.typemeta.funcj.parser.Result;
+
 import nl.tudelft.submit.dto.create.grading.AbstractGradingFormulaCreateDTO;
 import nl.tudelft.submit.dto.create.grading.GradingFormulaCreateDTO;
 import nl.tudelft.submit.dto.helper.Expression;
@@ -44,17 +55,6 @@ import nl.tudelft.submit.exception.InvalidFormulaException;
 import nl.tudelft.submit.model.grading.GradingFormula;
 import nl.tudelft.submit.repository.grading.GradingFormulaRepository;
 
-import org.modelmapper.ModelMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.data.util.Pair;
-import org.springframework.stereotype.Service;
-import org.typemeta.funcj.data.IList;
-import org.typemeta.funcj.parser.Parser;
-import org.typemeta.funcj.parser.Ref;
-import org.typemeta.funcj.parser.Result;
-
 @Service
 @Transactional
 public class FormulaService {
@@ -110,7 +110,7 @@ public class FormulaService {
 		Parser<Token, Expression> comparison = sum.and(
 				choice(token(EQUALS), token(NOT_EQUALS), token(GREATER_THAN), token(LESS_THAN),
 						token(GREATER_THAN_EQUALS), token(LESS_THAN_EQUALS))
-								.and(sum).map(Pair::of).optional())
+						.and(sum).map(Pair::of).optional())
 				.map(left -> right -> right.map(r -> getBinOp(r.getFirst()).apply(left, r.getSecond()))
 						.orElse(left));
 		Parser<Token, Expression> conjunction = comparison
diff --git a/src/main/java/nl/tudelft/submit/service/GradeService.java b/src/main/java/nl/tudelft/submit/service/GradeService.java
index e2d5b6942fdd3dd9402fae1a09458fa584dcf5fe..f9baf35414b6f2c852aaaae0382c79dc39a4e559 100644
--- a/src/main/java/nl/tudelft/submit/service/GradeService.java
+++ b/src/main/java/nl/tudelft/submit/service/GradeService.java
@@ -30,6 +30,11 @@ import java.util.stream.Collectors;
 
 import javax.transaction.Transactional;
 
+import org.modelmapper.ModelMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
 import nl.tudelft.labracore.api.*;
 import nl.tudelft.labracore.api.dto.*;
 import nl.tudelft.labracore.lib.api.GradeScheme;
@@ -54,11 +59,6 @@ import nl.tudelft.submit.repository.grading.EditionGradingFormulaRepository;
 import nl.tudelft.submit.repository.grading.ModuleCalculatedScoreRepository;
 import nl.tudelft.submit.repository.grading.ModuleGradingFormulaRepository;
 
-import org.modelmapper.ModelMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-
 @Service
 @Transactional
 public class GradeService {
diff --git a/src/main/java/nl/tudelft/submit/service/ModuleDivisionService.java b/src/main/java/nl/tudelft/submit/service/ModuleDivisionService.java
index 3817fcb2b4fc759f759bd0cc51f1dab153aed4d4..85afb859d809af67a02c9e8865a3dbc531d2cb30 100644
--- a/src/main/java/nl/tudelft/submit/service/ModuleDivisionService.java
+++ b/src/main/java/nl/tudelft/submit/service/ModuleDivisionService.java
@@ -20,6 +20,10 @@ package nl.tudelft.submit.service;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
 import nl.tudelft.labracore.api.ModuleDivisionControllerApi;
 import nl.tudelft.labracore.api.dto.*;
 import nl.tudelft.submit.dto.create.DivisionsCreateTypeDTO;
@@ -27,10 +31,6 @@ import nl.tudelft.submit.dto.create.ModuleDivisionImportDTO;
 import nl.tudelft.submit.enums.DivisionsGenerateOrder;
 import nl.tudelft.submit.enums.DivisionsGenerateType;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-
 @Service
 public class ModuleDivisionService {
 
diff --git a/src/main/java/nl/tudelft/submit/service/ModuleService.java b/src/main/java/nl/tudelft/submit/service/ModuleService.java
index 56866a4d93d8b37ad94bc9d97098f01714dd723d..f7b8214338f4769799947370bb070f0b2339cf00 100644
--- a/src/main/java/nl/tudelft/submit/service/ModuleService.java
+++ b/src/main/java/nl/tudelft/submit/service/ModuleService.java
@@ -20,6 +20,11 @@ package nl.tudelft.submit.service;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import org.modelmapper.ModelMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
 import nl.tudelft.labracore.api.ModuleControllerApi;
 import nl.tudelft.labracore.api.dto.*;
 import nl.tudelft.librador.dto.view.View;
@@ -31,11 +36,6 @@ import nl.tudelft.submit.dto.view.GradingFormulaViewDTO;
 import nl.tudelft.submit.dto.view.labracore.SubmitAssignmentSummaryDTO;
 import nl.tudelft.submit.dto.view.labracore.SubmitModuleViewDTO;
 
-import org.modelmapper.ModelMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-
 @Service
 public class ModuleService {
 
diff --git a/src/main/java/nl/tudelft/submit/service/NoteService.java b/src/main/java/nl/tudelft/submit/service/NoteService.java
index 37f5def41ac44770906f12f13d9f689e87181d25..7f0dbbcba7346a7d88de841d830e242918477d1f 100644
--- a/src/main/java/nl/tudelft/submit/service/NoteService.java
+++ b/src/main/java/nl/tudelft/submit/service/NoteService.java
@@ -21,16 +21,16 @@ import java.util.Optional;
 
 import javax.transaction.Transactional;
 
-import nl.tudelft.submit.dto.create.note.NoteCreateDTO;
-import nl.tudelft.submit.dto.patch.note.NotePatchDTO;
-import nl.tudelft.submit.model.note.Note;
-import nl.tudelft.submit.repository.note.NoteRepository;
-
 import org.modelmapper.ModelMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;
 
+import nl.tudelft.submit.dto.create.note.NoteCreateDTO;
+import nl.tudelft.submit.dto.patch.note.NotePatchDTO;
+import nl.tudelft.submit.model.note.Note;
+import nl.tudelft.submit.repository.note.NoteRepository;
+
 @Service
 @Transactional
 public class NoteService {
diff --git a/src/main/java/nl/tudelft/submit/service/NotificationService.java b/src/main/java/nl/tudelft/submit/service/NotificationService.java
index 658842836e0037959068f46e588ee6a228a19003..36949c3ad2606a8dcdea2bf1eb9630e6f61cde6c 100644
--- a/src/main/java/nl/tudelft/submit/service/NotificationService.java
+++ b/src/main/java/nl/tudelft/submit/service/NotificationService.java
@@ -21,6 +21,11 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.messaging.simp.SimpMessageSendingOperations;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 import nl.tudelft.labracore.api.dto.*;
 import nl.tudelft.librador.dto.view.View;
 import nl.tudelft.submit.dto.create.NotificationCreateDTO;
@@ -28,11 +33,6 @@ import nl.tudelft.submit.dto.view.NotificationViewDTO;
 import nl.tudelft.submit.model.Notification;
 import nl.tudelft.submit.repository.NotificationRepository;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.messaging.simp.SimpMessageSendingOperations;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 @Service
 public class NotificationService {
 
diff --git a/src/main/java/nl/tudelft/submit/service/PersonService.java b/src/main/java/nl/tudelft/submit/service/PersonService.java
index 7189e03782536d6ea5b75967946511aa6caf4dc8..ddfa0e884c0dee3710e3f105dfeef4a365e3fcbd 100644
--- a/src/main/java/nl/tudelft/submit/service/PersonService.java
+++ b/src/main/java/nl/tudelft/submit/service/PersonService.java
@@ -20,13 +20,13 @@ package nl.tudelft.submit.service;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import nl.tudelft.labracore.api.PersonControllerApi;
-import nl.tudelft.labracore.api.dto.*;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
+import nl.tudelft.labracore.api.PersonControllerApi;
+import nl.tudelft.labracore.api.dto.*;
+
 @Service
 public class PersonService {
 
diff --git a/src/main/java/nl/tudelft/submit/service/RoleService.java b/src/main/java/nl/tudelft/submit/service/RoleService.java
index 939a8c1a54b9f4fc26d68c5eae6eb079358c605f..9aa4552cc49fa9580ef59462823960cf554c029e 100644
--- a/src/main/java/nl/tudelft/submit/service/RoleService.java
+++ b/src/main/java/nl/tudelft/submit/service/RoleService.java
@@ -24,6 +24,10 @@ import java.util.stream.Collectors;
 
 import javax.transaction.Transactional;
 
+import org.modelmapper.ModelMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
 import nl.tudelft.labracore.api.EditionControllerApi;
 import nl.tudelft.labracore.api.RoleControllerApi;
 import nl.tudelft.labracore.api.dto.*;
@@ -32,10 +36,6 @@ import nl.tudelft.submit.dto.id.RoleId;
 import nl.tudelft.submit.dto.view.labracore.MemberViewDTO;
 import nl.tudelft.submit.repository.note.RoleNoteRepository;
 
-import org.modelmapper.ModelMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 @Service
 public class RoleService {
 
@@ -76,9 +76,10 @@ public class RoleService {
 	public List<MemberViewDTO> getStaffRolesOfEdition(Long editionId, Boolean isStaff) {
 		return getMembersOfEdition(editionId, isStaff,
 				role -> role.getType() != RolePersonDetailsDTO.TypeEnum.STUDENT
-						&& role.getType() != RolePersonDetailsDTO.TypeEnum.BLOCKED).stream()
-								.sorted(Comparator.comparing(MemberViewDTO::getType).reversed())
-								.collect(Collectors.toList());
+						&& role.getType() != RolePersonDetailsDTO.TypeEnum.BLOCKED)
+				.stream()
+				.sorted(Comparator.comparing(MemberViewDTO::getType).reversed())
+				.collect(Collectors.toList());
 	}
 
 	/**
diff --git a/src/main/java/nl/tudelft/submit/service/ScriptService.java b/src/main/java/nl/tudelft/submit/service/ScriptService.java
index 62c00d1277792ef02efcc47984a31bfdddef5a53..f326e5477ab0c3c96419071f1ab613c709867be9 100644
--- a/src/main/java/nl/tudelft/submit/service/ScriptService.java
+++ b/src/main/java/nl/tudelft/submit/service/ScriptService.java
@@ -25,6 +25,25 @@ import java.util.stream.Collectors;
 
 import javax.transaction.Transactional;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.core.io.FileSystemResource;
+import org.springframework.core.io.Resource;
+import org.springframework.http.*;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.HttpClientErrorException;
+import org.springframework.web.client.RestTemplate;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.base.Charsets;
+import com.google.common.hash.Hashing;
+
 import nl.tudelft.labracore.api.AssignmentControllerApi;
 import nl.tudelft.labracore.api.StudentGroupControllerApi;
 import nl.tudelft.labracore.api.SubmissionControllerApi;
@@ -49,25 +68,6 @@ import nl.tudelft.submit.model.script.*;
 import nl.tudelft.submit.repository.SubmissionKeyRepository;
 import nl.tudelft.submit.repository.script.*;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.core.io.FileSystemResource;
-import org.springframework.core.io.Resource;
-import org.springframework.http.*;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.stereotype.Service;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
-import org.springframework.web.client.HttpClientErrorException;
-import org.springframework.web.client.RestTemplate;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Charsets;
-import com.google.common.hash.Hashing;
-
 @Service
 public class ScriptService {
 
diff --git a/src/main/java/nl/tudelft/submit/service/StatisticsService.java b/src/main/java/nl/tudelft/submit/service/StatisticsService.java
index 7c24e36afa95551160550dfd55e9a2a7276572fa..388f5b933c6f325aaa332a512aa0638836358bf7 100644
--- a/src/main/java/nl/tudelft/submit/service/StatisticsService.java
+++ b/src/main/java/nl/tudelft/submit/service/StatisticsService.java
@@ -25,6 +25,11 @@ import java.util.stream.Collectors;
 
 import javax.transaction.Transactional;
 
+import org.modelmapper.ModelMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
 import nl.tudelft.labracore.api.dto.*;
 import nl.tudelft.labracore.lib.api.GradeScheme;
 import nl.tudelft.submit.dto.view.VersionViewDTO;
@@ -34,11 +39,6 @@ import nl.tudelft.submit.enums.GradeStatistics;
 import nl.tudelft.submit.model.SubmitEdition;
 import nl.tudelft.submit.model.grading.*;
 
-import org.modelmapper.ModelMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-
 @Service
 @Transactional
 public class StatisticsService {
diff --git a/src/main/java/nl/tudelft/submit/service/StudentGroupService.java b/src/main/java/nl/tudelft/submit/service/StudentGroupService.java
index 22ce9407afd66ed790ceb7aa5b1627971f56e67c..789a65b6ab0ee134814398ca87d0c08f420ab1fc 100644
--- a/src/main/java/nl/tudelft/submit/service/StudentGroupService.java
+++ b/src/main/java/nl/tudelft/submit/service/StudentGroupService.java
@@ -27,6 +27,11 @@ import java.util.stream.Collectors;
 
 import javax.transaction.Transactional;
 
+import org.modelmapper.ModelMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.reactive.function.client.WebClientResponseException;
+
 import nl.tudelft.labracore.api.StudentGroupControllerApi;
 import nl.tudelft.labracore.api.dto.*;
 import nl.tudelft.librador.dto.view.View;
@@ -43,12 +48,6 @@ import nl.tudelft.submit.repository.SubmitGroupRepository;
 import nl.tudelft.submit.repository.SwitchEventRepository;
 import nl.tudelft.submit.repository.note.GroupNoteRepository;
 import nl.tudelft.submit.repository.note.SubmissionNoteRepository;
-
-import org.modelmapper.ModelMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.web.reactive.function.client.WebClientResponseException;
-
 import reactor.core.publisher.Mono;
 
 @Service
diff --git a/src/main/java/nl/tudelft/submit/service/SubmissionService.java b/src/main/java/nl/tudelft/submit/service/SubmissionService.java
index 8520d881b606d3d0ef189a1ffaf20f538a504fe7..0905dd75aac90fb6f8f9b337148eeff7425bb6ea 100644
--- a/src/main/java/nl/tudelft/submit/service/SubmissionService.java
+++ b/src/main/java/nl/tudelft/submit/service/SubmissionService.java
@@ -26,6 +26,17 @@ import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import org.modelmapper.ModelMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.core.io.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.reactive.function.client.WebClientResponseException;
+
 import nl.tudelft.labracore.api.SubmissionControllerApi;
 import nl.tudelft.labracore.api.dto.*;
 import nl.tudelft.librador.dto.view.View;
@@ -43,17 +54,6 @@ import nl.tudelft.submit.model.SubmitSubmission;
 import nl.tudelft.submit.repository.SubmitSubmissionRepository;
 import nl.tudelft.submit.repository.note.SubmissionNoteRepository;
 
-import org.modelmapper.ModelMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.core.io.Resource;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.StringUtils;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.reactive.function.client.WebClientResponseException;
-
 @Service
 public class SubmissionService {
 
diff --git a/src/main/java/nl/tudelft/submit/service/SubmitGroupService.java b/src/main/java/nl/tudelft/submit/service/SubmitGroupService.java
index cc464dd0b370aac4bae42c49c4bee78d98c3695b..bafbff084b31bfd63e0d3fd5e7231c941f049be3 100644
--- a/src/main/java/nl/tudelft/submit/service/SubmitGroupService.java
+++ b/src/main/java/nl/tudelft/submit/service/SubmitGroupService.java
@@ -17,13 +17,13 @@
  */
 package nl.tudelft.submit.service;
 
-import nl.tudelft.submit.model.SubmitGroup;
-import nl.tudelft.submit.repository.SubmitGroupRepository;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import nl.tudelft.submit.model.SubmitGroup;
+import nl.tudelft.submit.repository.SubmitGroupRepository;
+
 @Service
 public class SubmitGroupService {
 
diff --git a/src/main/java/nl/tudelft/submit/service/TemplateService.java b/src/main/java/nl/tudelft/submit/service/TemplateService.java
index cbb6c70d27abbff282bd6f9d5dd0a6f7e367488d..a5479d106b791eda85a9cb127cea1f33284f935b 100644
--- a/src/main/java/nl/tudelft/submit/service/TemplateService.java
+++ b/src/main/java/nl/tudelft/submit/service/TemplateService.java
@@ -20,11 +20,11 @@ package nl.tudelft.submit.service;
 import java.lang.reflect.Method;
 import java.util.Comparator;
 
+import org.springframework.stereotype.Service;
+
 import lombok.Getter;
 import lombok.SneakyThrows;
 
-import org.springframework.stereotype.Service;
-
 @Service
 public class TemplateService {
 
diff --git a/src/main/java/nl/tudelft/submit/service/UserSettingsService.java b/src/main/java/nl/tudelft/submit/service/UserSettingsService.java
index 3b7bd1f645af5eec97d58718c7529581691d2922..62edb5116eb14abea8235cefe867aaa984276b64 100644
--- a/src/main/java/nl/tudelft/submit/service/UserSettingsService.java
+++ b/src/main/java/nl/tudelft/submit/service/UserSettingsService.java
@@ -21,6 +21,11 @@ import java.util.List;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 import nl.tudelft.labracore.api.dto.PersonIdDTO;
 import nl.tudelft.labracore.api.dto.PersonSummaryDTO;
 import nl.tudelft.labracore.lib.security.LabradorUserDetails;
@@ -28,11 +33,6 @@ import nl.tudelft.submit.dto.patch.UserSettingsPatchDTO;
 import nl.tudelft.submit.model.UserSettings;
 import nl.tudelft.submit.repository.UserSettingsRepository;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 @Service
 @Transactional
 public class UserSettingsService {
diff --git a/src/main/java/nl/tudelft/submit/service/VersionService.java b/src/main/java/nl/tudelft/submit/service/VersionService.java
index 33b7a4999d0532370dcc80ffe77de894a952ee6f..4240def90c95d734852761cff59f6b47ad92dc19 100644
--- a/src/main/java/nl/tudelft/submit/service/VersionService.java
+++ b/src/main/java/nl/tudelft/submit/service/VersionService.java
@@ -26,6 +26,14 @@ import java.util.stream.Collectors;
 
 import javax.transaction.Transactional;
 
+import org.assertj.core.util.Lists;
+import org.modelmapper.ModelMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
+import com.google.common.collect.Sets;
+
 import nl.tudelft.labracore.api.dto.*;
 import nl.tudelft.librador.dto.view.View;
 import nl.tudelft.submit.dto.create.VersionCreateDTO;
@@ -40,14 +48,6 @@ import nl.tudelft.submit.model.script.ScriptTrain;
 import nl.tudelft.submit.repository.VersionRepository;
 import nl.tudelft.submit.repository.script.ScriptTrainRepository;
 
-import org.assertj.core.util.Lists;
-import org.modelmapper.ModelMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-
-import com.google.common.collect.Sets;
-
 @Service
 public class VersionService {
 
diff --git a/src/test/java/application/dev/DevSubmitApplication.java b/src/test/java/application/dev/DevSubmitApplication.java
index 9c952c4bfb8678e57f3a65fd8af30d5d7fccfbfe..940aa7be9b8c7c56c289103933ae79cc4d8a801f 100644
--- a/src/test/java/application/dev/DevSubmitApplication.java
+++ b/src/test/java/application/dev/DevSubmitApplication.java
@@ -17,10 +17,6 @@
  */
 package application.dev;
 
-import nl.tudelft.labracore.lib.LabracoreApiConfig;
-import nl.tudelft.submit.SubmitApplication;
-import nl.tudelft.submit.test.TestUserDetailsService;
-
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
@@ -28,6 +24,10 @@ import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.data.jpa.convert.threeten.Jsr310JpaConverters;
 
+import nl.tudelft.labracore.lib.LabracoreApiConfig;
+import nl.tudelft.submit.SubmitApplication;
+import nl.tudelft.submit.test.TestUserDetailsService;
+
 @SpringBootApplication
 @PropertySource("classpath:application-dev.properties")
 @EntityScan(basePackageClasses = { SubmitApplication.class, Jsr310JpaConverters.class })
diff --git a/src/test/java/application/migration/db/MigrationSubmitApplication.java b/src/test/java/application/migration/db/MigrationSubmitApplication.java
index e933eb55843e1676f163affaa737f443996b17ff..ef95fbd65353964ece661a5930a661a9af179f74 100644
--- a/src/test/java/application/migration/db/MigrationSubmitApplication.java
+++ b/src/test/java/application/migration/db/MigrationSubmitApplication.java
@@ -17,10 +17,6 @@
  */
 package application.migration.db;
 
-import nl.tudelft.labracore.lib.LabracoreApiConfig;
-import nl.tudelft.submit.SubmitApplication;
-import nl.tudelft.submit.test.TestUserDetailsService;
-
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.context.annotation.Import;
@@ -28,6 +24,10 @@ import org.springframework.context.annotation.PropertySource;
 import org.springframework.context.annotation.PropertySources;
 import org.springframework.data.jpa.convert.threeten.Jsr310JpaConverters;
 
+import nl.tudelft.labracore.lib.LabracoreApiConfig;
+import nl.tudelft.submit.SubmitApplication;
+import nl.tudelft.submit.test.TestUserDetailsService;
+
 @SpringBootApplication
 @PropertySources({
 		@PropertySource("classpath:application-test.properties"),
diff --git a/src/test/java/application/migration/nodb/NoDbMigrationSubmitApplication.java b/src/test/java/application/migration/nodb/NoDbMigrationSubmitApplication.java
index 9fe45b179b741ab3bd09c2b30885fac65a4a5ce3..e84d36ca5c8bd6bccaedb7a7a310e99f6483b2ba 100644
--- a/src/test/java/application/migration/nodb/NoDbMigrationSubmitApplication.java
+++ b/src/test/java/application/migration/nodb/NoDbMigrationSubmitApplication.java
@@ -17,10 +17,6 @@
  */
 package application.migration.nodb;
 
-import nl.tudelft.labracore.lib.LabracoreApiConfig;
-import nl.tudelft.submit.SubmitApplication;
-import nl.tudelft.submit.test.TestUserDetailsService;
-
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.context.annotation.Import;
@@ -28,6 +24,10 @@ import org.springframework.context.annotation.PropertySource;
 import org.springframework.context.annotation.PropertySources;
 import org.springframework.data.jpa.convert.threeten.Jsr310JpaConverters;
 
+import nl.tudelft.labracore.lib.LabracoreApiConfig;
+import nl.tudelft.submit.SubmitApplication;
+import nl.tudelft.submit.test.TestUserDetailsService;
+
 @SpringBootApplication
 @PropertySources({
 		@PropertySource("classpath:application-test.properties"),
diff --git a/src/test/java/application/nodb/NoDbTestSubmitApplication.java b/src/test/java/application/nodb/NoDbTestSubmitApplication.java
index 4e67159efe3adb63f0f7fd5b1c2da8313403ecc1..2fad53b552bcbef96e3838de3d53ac03706add05 100644
--- a/src/test/java/application/nodb/NoDbTestSubmitApplication.java
+++ b/src/test/java/application/nodb/NoDbTestSubmitApplication.java
@@ -17,16 +17,16 @@
  */
 package application.nodb;
 
-import nl.tudelft.labracore.lib.LabracoreApiConfig;
-import nl.tudelft.submit.SubmitApplication;
-import nl.tudelft.submit.test.TestUserDetailsService;
-
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.data.jpa.convert.threeten.Jsr310JpaConverters;
 
+import nl.tudelft.labracore.lib.LabracoreApiConfig;
+import nl.tudelft.submit.SubmitApplication;
+import nl.tudelft.submit.test.TestUserDetailsService;
+
 @SpringBootApplication
 @PropertySource("classpath:application-test.properties")
 @EntityScan(basePackageClasses = { SubmitApplication.class, Jsr310JpaConverters.class })
diff --git a/src/test/java/application/test/TestSubmitApplication.java b/src/test/java/application/test/TestSubmitApplication.java
index 6ae4c22ba747ab07582b55a9ab77c5615b74f056..f922da315c2fad46f7feb468d0933e2f187a87c7 100644
--- a/src/test/java/application/test/TestSubmitApplication.java
+++ b/src/test/java/application/test/TestSubmitApplication.java
@@ -17,16 +17,16 @@
  */
 package application.test;
 
-import nl.tudelft.labracore.lib.LabracoreApiConfig;
-import nl.tudelft.submit.SubmitApplication;
-import nl.tudelft.submit.test.TestUserDetailsService;
-
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.data.jpa.convert.threeten.Jsr310JpaConverters;
 
+import nl.tudelft.labracore.lib.LabracoreApiConfig;
+import nl.tudelft.submit.SubmitApplication;
+import nl.tudelft.submit.test.TestUserDetailsService;
+
 @SpringBootApplication
 @PropertySource("classpath:application-test.properties")
 @EntityScan(basePackageClasses = { SubmitApplication.class, Jsr310JpaConverters.class })
diff --git a/src/test/java/nl/tudelft/submit/controller/AnnouncementControllerTest.java b/src/test/java/nl/tudelft/submit/controller/AnnouncementControllerTest.java
index f54c9ea66cfd1198a47a517924026670dd7df160..1c0a822052e82684e5a7a05a32dc338c98f365d5 100644
--- a/src/test/java/nl/tudelft/submit/controller/AnnouncementControllerTest.java
+++ b/src/test/java/nl/tudelft/submit/controller/AnnouncementControllerTest.java
@@ -27,12 +27,6 @@ import java.time.LocalDate;
 import java.time.LocalTime;
 import java.util.List;
 
-import nl.tudelft.submit.dto.create.announcement.EditionAnnouncementCreateDTO;
-import nl.tudelft.submit.dto.create.announcement.GlobalAnnouncementCreateDTO;
-import nl.tudelft.submit.model.announcement.EditionAnnouncement;
-import nl.tudelft.submit.security.AuthorizationService;
-import nl.tudelft.submit.service.AnnouncementService;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -46,6 +40,11 @@ import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilde
 import org.springframework.transaction.annotation.Transactional;
 
 import application.test.TestSubmitApplication;
+import nl.tudelft.submit.dto.create.announcement.EditionAnnouncementCreateDTO;
+import nl.tudelft.submit.dto.create.announcement.GlobalAnnouncementCreateDTO;
+import nl.tudelft.submit.model.announcement.EditionAnnouncement;
+import nl.tudelft.submit.security.AuthorizationService;
+import nl.tudelft.submit.service.AnnouncementService;
 
 @Transactional
 @AutoConfigureMockMvc
diff --git a/src/test/java/nl/tudelft/submit/controller/AssignmentControllerTest.java b/src/test/java/nl/tudelft/submit/controller/AssignmentControllerTest.java
index af3fef49bc7d37f4033045597a3b879ef113b4f7..842396833e39b2a40cbed19603ad9dfea3220a6b 100644
--- a/src/test/java/nl/tudelft/submit/controller/AssignmentControllerTest.java
+++ b/src/test/java/nl/tudelft/submit/controller/AssignmentControllerTest.java
@@ -25,6 +25,22 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 
 import java.util.*;
 
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.http.MediaType;
+import org.springframework.mock.web.MockMultipartFile;
+import org.springframework.security.test.context.support.WithUserDetails;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import application.test.TestSubmitApplication;
 import nl.tudelft.labracore.api.dto.*;
 import nl.tudelft.labracore.lib.api.GradeScheme;
 import nl.tudelft.submit.cache.PersonCacheManager;
@@ -46,23 +62,6 @@ import nl.tudelft.submit.security.AuthorizationService;
 import nl.tudelft.submit.service.*;
 import nl.tudelft.submit.test.TestUserDetailsService;
 
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.http.MediaType;
-import org.springframework.mock.web.MockMultipartFile;
-import org.springframework.security.test.context.support.WithUserDetails;
-import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
-
-import application.test.TestSubmitApplication;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 @AutoConfigureMockMvc
 @SpringBootTest(classes = TestSubmitApplication.class)
 class AssignmentControllerTest {
diff --git a/src/test/java/nl/tudelft/submit/controller/EditionControllerTest.java b/src/test/java/nl/tudelft/submit/controller/EditionControllerTest.java
index 804cda52ba33efe92b3b2583f59cc5d06f28d62a..c01f94689034b5425fc533e950a8f1071d661f5c 100644
--- a/src/test/java/nl/tudelft/submit/controller/EditionControllerTest.java
+++ b/src/test/java/nl/tudelft/submit/controller/EditionControllerTest.java
@@ -26,23 +26,6 @@ import java.time.LocalDateTime;
 import java.util.Collections;
 import java.util.List;
 
-import nl.tudelft.labracore.api.dto.*;
-import nl.tudelft.labracore.lib.api.GradeScheme;
-import nl.tudelft.submit.csv.CSVService;
-import nl.tudelft.submit.dto.create.SubmitEditionCreateDTO;
-import nl.tudelft.submit.dto.create.grading.GradingFormulaCreateDTO;
-import nl.tudelft.submit.dto.helper.GradeExportOptions;
-import nl.tudelft.submit.dto.patch.AddMemberDTO;
-import nl.tudelft.submit.dto.patch.EditionGradingPatchDTO;
-import nl.tudelft.submit.dto.patch.EditionParticipantImportDTO;
-import nl.tudelft.submit.dto.patch.SubmitEditionPatchDTO;
-import nl.tudelft.submit.dto.view.labracore.SubmitEditionViewDTO;
-import nl.tudelft.submit.dto.view.statistics.EditionStatisticsDTO;
-import nl.tudelft.submit.enums.ScriptGradePolicy;
-import nl.tudelft.submit.security.AuthorizationService;
-import nl.tudelft.submit.service.*;
-import nl.tudelft.submit.test.TestUserDetailsService;
-
 import org.apache.http.client.entity.UrlEncodedFormEntity;
 import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.util.EntityUtils;
@@ -60,11 +43,27 @@ import org.springframework.security.test.context.support.WithUserDetails;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
 
-import application.test.TestSubmitApplication;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 
+import application.test.TestSubmitApplication;
+import nl.tudelft.labracore.api.dto.*;
+import nl.tudelft.labracore.lib.api.GradeScheme;
+import nl.tudelft.submit.csv.CSVService;
+import nl.tudelft.submit.dto.create.SubmitEditionCreateDTO;
+import nl.tudelft.submit.dto.create.grading.GradingFormulaCreateDTO;
+import nl.tudelft.submit.dto.helper.GradeExportOptions;
+import nl.tudelft.submit.dto.patch.AddMemberDTO;
+import nl.tudelft.submit.dto.patch.EditionGradingPatchDTO;
+import nl.tudelft.submit.dto.patch.EditionParticipantImportDTO;
+import nl.tudelft.submit.dto.patch.SubmitEditionPatchDTO;
+import nl.tudelft.submit.dto.view.labracore.SubmitEditionViewDTO;
+import nl.tudelft.submit.dto.view.statistics.EditionStatisticsDTO;
+import nl.tudelft.submit.enums.ScriptGradePolicy;
+import nl.tudelft.submit.security.AuthorizationService;
+import nl.tudelft.submit.service.*;
+import nl.tudelft.submit.test.TestUserDetailsService;
+
 @AutoConfigureMockMvc
 @SpringBootTest(classes = TestSubmitApplication.class)
 public class EditionControllerTest {
diff --git a/src/test/java/nl/tudelft/submit/controller/GradeControllerTest.java b/src/test/java/nl/tudelft/submit/controller/GradeControllerTest.java
index 0a3028a250276f1645e484d79f1541d67323067b..57a5c068eb3d3b642c25b12e0abc9551d0ae7836 100644
--- a/src/test/java/nl/tudelft/submit/controller/GradeControllerTest.java
+++ b/src/test/java/nl/tudelft/submit/controller/GradeControllerTest.java
@@ -26,16 +26,6 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 import java.time.LocalDateTime;
 import java.util.*;
 
-import nl.tudelft.labracore.lib.api.GradeScheme;
-import nl.tudelft.submit.dto.create.grading.GradedFeedbackCreateDTO;
-import nl.tudelft.submit.dto.view.FormulaTestDTO;
-import nl.tudelft.submit.model.SubmitAssignment;
-import nl.tudelft.submit.model.grading.CalculatedScore;
-import nl.tudelft.submit.security.AuthorizationService;
-import nl.tudelft.submit.service.AssignmentService;
-import nl.tudelft.submit.service.FeedbackService;
-import nl.tudelft.submit.service.GradeService;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -49,10 +39,19 @@ import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
 
-import application.test.TestSubmitApplication;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import application.test.TestSubmitApplication;
+import nl.tudelft.labracore.lib.api.GradeScheme;
+import nl.tudelft.submit.dto.create.grading.GradedFeedbackCreateDTO;
+import nl.tudelft.submit.dto.view.FormulaTestDTO;
+import nl.tudelft.submit.model.SubmitAssignment;
+import nl.tudelft.submit.model.grading.CalculatedScore;
+import nl.tudelft.submit.security.AuthorizationService;
+import nl.tudelft.submit.service.AssignmentService;
+import nl.tudelft.submit.service.FeedbackService;
+import nl.tudelft.submit.service.GradeService;
+
 @AutoConfigureMockMvc
 @SpringBootTest(classes = TestSubmitApplication.class)
 public class GradeControllerTest {
diff --git a/src/test/java/nl/tudelft/submit/controller/ModuleControllerTest.java b/src/test/java/nl/tudelft/submit/controller/ModuleControllerTest.java
index 97c9f02dbcf676df74d303c87aab163a015dc07c..650be2365e32519a82308e0dfeef1269692626ac 100644
--- a/src/test/java/nl/tudelft/submit/controller/ModuleControllerTest.java
+++ b/src/test/java/nl/tudelft/submit/controller/ModuleControllerTest.java
@@ -26,19 +26,6 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
-import nl.tudelft.labracore.api.dto.*;
-import nl.tudelft.labracore.lib.api.GradeScheme;
-import nl.tudelft.submit.dto.create.DivisionsCreateTypeDTO;
-import nl.tudelft.submit.dto.create.ModuleCreateWithDivisionsDTO;
-import nl.tudelft.submit.dto.create.grading.GradingFormulaCreateDTO;
-import nl.tudelft.submit.dto.patch.ModulePatchWithDivisionsDTO;
-import nl.tudelft.submit.dto.view.labracore.SubmitModuleViewDTO;
-import nl.tudelft.submit.dto.view.statistics.ModuleStatisticsDTO;
-import nl.tudelft.submit.enums.DivisionsCreateType;
-import nl.tudelft.submit.enums.GradableType;
-import nl.tudelft.submit.security.AuthorizationService;
-import nl.tudelft.submit.service.*;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -51,10 +38,22 @@ import org.springframework.security.test.context.support.WithUserDetails;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
 
-import application.test.TestSubmitApplication;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import application.test.TestSubmitApplication;
+import nl.tudelft.labracore.api.dto.*;
+import nl.tudelft.labracore.lib.api.GradeScheme;
+import nl.tudelft.submit.dto.create.DivisionsCreateTypeDTO;
+import nl.tudelft.submit.dto.create.ModuleCreateWithDivisionsDTO;
+import nl.tudelft.submit.dto.create.grading.GradingFormulaCreateDTO;
+import nl.tudelft.submit.dto.patch.ModulePatchWithDivisionsDTO;
+import nl.tudelft.submit.dto.view.labracore.SubmitModuleViewDTO;
+import nl.tudelft.submit.dto.view.statistics.ModuleStatisticsDTO;
+import nl.tudelft.submit.enums.DivisionsCreateType;
+import nl.tudelft.submit.enums.GradableType;
+import nl.tudelft.submit.security.AuthorizationService;
+import nl.tudelft.submit.service.*;
+
 @AutoConfigureMockMvc
 @SpringBootTest(classes = TestSubmitApplication.class)
 class ModuleControllerTest {
diff --git a/src/test/java/nl/tudelft/submit/controller/NotificationControllerTest.java b/src/test/java/nl/tudelft/submit/controller/NotificationControllerTest.java
index c20deeb98b8f1a90e257860b3b43f607d3a26891..a37347cbc3c66cfde8fd711e34ebf6c0b98b9c71 100644
--- a/src/test/java/nl/tudelft/submit/controller/NotificationControllerTest.java
+++ b/src/test/java/nl/tudelft/submit/controller/NotificationControllerTest.java
@@ -25,10 +25,6 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 
 import java.util.List;
 
-import nl.tudelft.submit.dto.view.NotificationViewDTO;
-import nl.tudelft.submit.security.AuthorizationService;
-import nl.tudelft.submit.service.NotificationService;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -41,10 +37,13 @@ import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
 
-import application.test.TestSubmitApplication;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import application.test.TestSubmitApplication;
+import nl.tudelft.submit.dto.view.NotificationViewDTO;
+import nl.tudelft.submit.security.AuthorizationService;
+import nl.tudelft.submit.service.NotificationService;
+
 @AutoConfigureMockMvc
 @SpringBootTest(classes = TestSubmitApplication.class)
 public class NotificationControllerTest {
diff --git a/src/test/java/nl/tudelft/submit/controller/PersonControllerTest.java b/src/test/java/nl/tudelft/submit/controller/PersonControllerTest.java
index 433042dab37e6cf185a073f10777bdac459f16ed..d8af788b832800b0a772cc5f472221a97710d8ba 100644
--- a/src/test/java/nl/tudelft/submit/controller/PersonControllerTest.java
+++ b/src/test/java/nl/tudelft/submit/controller/PersonControllerTest.java
@@ -24,13 +24,6 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 
 import java.util.List;
 
-import nl.tudelft.labracore.api.dto.PersonDetailsDTO;
-import nl.tudelft.labracore.api.dto.PersonSummaryDTO;
-import nl.tudelft.submit.security.AuthorizationService;
-import nl.tudelft.submit.service.ModuleService;
-import nl.tudelft.submit.service.PersonService;
-import nl.tudelft.submit.service.StudentGroupService;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -42,10 +35,16 @@ import org.springframework.security.test.context.support.WithUserDetails;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
 
-import application.test.TestSubmitApplication;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import application.test.TestSubmitApplication;
+import nl.tudelft.labracore.api.dto.PersonDetailsDTO;
+import nl.tudelft.labracore.api.dto.PersonSummaryDTO;
+import nl.tudelft.submit.security.AuthorizationService;
+import nl.tudelft.submit.service.ModuleService;
+import nl.tudelft.submit.service.PersonService;
+import nl.tudelft.submit.service.StudentGroupService;
+
 @AutoConfigureMockMvc
 @SpringBootTest(classes = TestSubmitApplication.class)
 class PersonControllerTest {
diff --git a/src/test/java/nl/tudelft/submit/controller/RoleControllerTest.java b/src/test/java/nl/tudelft/submit/controller/RoleControllerTest.java
index 213ccd02395af77ed0db8f8bd8c2be5d0217ca9d..dbf3eb46142dd232e2dd9f273d8203dab660340e 100644
--- a/src/test/java/nl/tudelft/submit/controller/RoleControllerTest.java
+++ b/src/test/java/nl/tudelft/submit/controller/RoleControllerTest.java
@@ -26,14 +26,6 @@ import java.util.List;
 
 import javax.transaction.Transactional;
 
-import nl.tudelft.labracore.api.dto.Id;
-import nl.tudelft.labracore.api.dto.RolePatchDTO;
-import nl.tudelft.submit.dto.create.note.RoleNoteCreateDTO;
-import nl.tudelft.submit.dto.id.RoleId;
-import nl.tudelft.submit.security.AuthorizationService;
-import nl.tudelft.submit.service.NoteService;
-import nl.tudelft.submit.service.RoleService;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -46,10 +38,17 @@ import org.springframework.security.test.context.support.WithUserDetails;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
 
-import application.test.TestSubmitApplication;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import application.test.TestSubmitApplication;
+import nl.tudelft.labracore.api.dto.Id;
+import nl.tudelft.labracore.api.dto.RolePatchDTO;
+import nl.tudelft.submit.dto.create.note.RoleNoteCreateDTO;
+import nl.tudelft.submit.dto.id.RoleId;
+import nl.tudelft.submit.security.AuthorizationService;
+import nl.tudelft.submit.service.NoteService;
+import nl.tudelft.submit.service.RoleService;
+
 @Transactional
 @AutoConfigureMockMvc
 @SpringBootTest(classes = TestSubmitApplication.class)
diff --git a/src/test/java/nl/tudelft/submit/controller/ScriptControllerTest.java b/src/test/java/nl/tudelft/submit/controller/ScriptControllerTest.java
index 6e62760032cae04a3736feb74a957043abdd16c6..579f28143506e5384cf8e26321381777e4c9bd10 100644
--- a/src/test/java/nl/tudelft/submit/controller/ScriptControllerTest.java
+++ b/src/test/java/nl/tudelft/submit/controller/ScriptControllerTest.java
@@ -27,6 +27,22 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 import java.util.ArrayList;
 import java.util.List;
 
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.http.MediaType;
+import org.springframework.security.test.context.support.WithUserDetails;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import application.test.TestSubmitApplication;
 import nl.tudelft.labracore.api.dto.*;
 import nl.tudelft.librador.dto.view.View;
 import nl.tudelft.submit.dto.create.script.ScriptCreateDTO;
@@ -47,23 +63,6 @@ import nl.tudelft.submit.service.EditionService;
 import nl.tudelft.submit.service.ScriptService;
 import nl.tudelft.submit.service.VersionService;
 
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.http.MediaType;
-import org.springframework.security.test.context.support.WithUserDetails;
-import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
-
-import application.test.TestSubmitApplication;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 @AutoConfigureMockMvc
 @SpringBootTest(classes = TestSubmitApplication.class)
 public class ScriptControllerTest {
diff --git a/src/test/java/nl/tudelft/submit/controller/StudentGroupControllerTest.java b/src/test/java/nl/tudelft/submit/controller/StudentGroupControllerTest.java
index 943b98a439b5ce354c055ad7d7b629aac9d9f94b..616df89f5677288d0bf3f88cf6d9a7b874442ce5 100644
--- a/src/test/java/nl/tudelft/submit/controller/StudentGroupControllerTest.java
+++ b/src/test/java/nl/tudelft/submit/controller/StudentGroupControllerTest.java
@@ -27,14 +27,6 @@ import java.util.*;
 
 import javax.transaction.Transactional;
 
-import nl.tudelft.labracore.api.dto.*;
-import nl.tudelft.submit.dto.create.note.GroupNoteCreateDTO;
-import nl.tudelft.submit.dto.id.GroupId;
-import nl.tudelft.submit.dto.view.labracore.SubmitGroupDetailsDTO;
-import nl.tudelft.submit.security.AuthorizationService;
-import nl.tudelft.submit.service.*;
-import nl.tudelft.submit.test.TestUserDetailsService;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -48,10 +40,17 @@ import org.springframework.security.test.context.support.WithUserDetails;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
 
-import application.test.TestSubmitApplication;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import application.test.TestSubmitApplication;
+import nl.tudelft.labracore.api.dto.*;
+import nl.tudelft.submit.dto.create.note.GroupNoteCreateDTO;
+import nl.tudelft.submit.dto.id.GroupId;
+import nl.tudelft.submit.dto.view.labracore.SubmitGroupDetailsDTO;
+import nl.tudelft.submit.security.AuthorizationService;
+import nl.tudelft.submit.service.*;
+import nl.tudelft.submit.test.TestUserDetailsService;
+
 @Transactional
 @AutoConfigureMockMvc
 @SpringBootTest(classes = TestSubmitApplication.class)
diff --git a/src/test/java/nl/tudelft/submit/controller/SubmissionControllerTest.java b/src/test/java/nl/tudelft/submit/controller/SubmissionControllerTest.java
index 665f6ebf646681902055d11d347fab6ed9bcc04a..b04e9d882a705992903dd1a04e0b9f1d8816fb5e 100644
--- a/src/test/java/nl/tudelft/submit/controller/SubmissionControllerTest.java
+++ b/src/test/java/nl/tudelft/submit/controller/SubmissionControllerTest.java
@@ -30,17 +30,6 @@ import java.nio.file.Paths;
 import java.time.LocalDateTime;
 import java.util.*;
 
-import nl.tudelft.labracore.api.dto.*;
-import nl.tudelft.submit.dto.create.MailMessageCreateDTO;
-import nl.tudelft.submit.dto.create.SubmissionDownloadConfigCreateDTO;
-import nl.tudelft.submit.dto.create.note.SubmissionNoteCreateDTO;
-import nl.tudelft.submit.dto.id.ScriptTrainIdDTO;
-import nl.tudelft.submit.dto.id.SubmissionId;
-import nl.tudelft.submit.dto.view.VersionViewDTO;
-import nl.tudelft.submit.model.UserSettings;
-import nl.tudelft.submit.security.AuthorizationService;
-import nl.tudelft.submit.service.*;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -59,10 +48,20 @@ import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 
-import application.test.TestSubmitApplication;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import application.test.TestSubmitApplication;
+import nl.tudelft.labracore.api.dto.*;
+import nl.tudelft.submit.dto.create.MailMessageCreateDTO;
+import nl.tudelft.submit.dto.create.SubmissionDownloadConfigCreateDTO;
+import nl.tudelft.submit.dto.create.note.SubmissionNoteCreateDTO;
+import nl.tudelft.submit.dto.id.ScriptTrainIdDTO;
+import nl.tudelft.submit.dto.id.SubmissionId;
+import nl.tudelft.submit.dto.view.VersionViewDTO;
+import nl.tudelft.submit.model.UserSettings;
+import nl.tudelft.submit.security.AuthorizationService;
+import nl.tudelft.submit.service.*;
+
 @WebAppConfiguration
 @AutoConfigureMockMvc
 @SpringBootTest(classes = TestSubmitApplication.class)
diff --git a/src/test/java/nl/tudelft/submit/controller/UserSettingsControllerTest.java b/src/test/java/nl/tudelft/submit/controller/UserSettingsControllerTest.java
index 14f7443017f27335f157a5d6c80a31121138d5b8..83c4f9e9a8278e0273ecedd7beca9dd99261c20e 100644
--- a/src/test/java/nl/tudelft/submit/controller/UserSettingsControllerTest.java
+++ b/src/test/java/nl/tudelft/submit/controller/UserSettingsControllerTest.java
@@ -24,12 +24,6 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 
 import java.util.List;
 
-import nl.tudelft.labracore.api.dto.*;
-import nl.tudelft.submit.dto.patch.UserSettingsPatchDTO;
-import nl.tudelft.submit.model.UserSettings;
-import nl.tudelft.submit.service.UserSettingsService;
-import nl.tudelft.submit.test.TestUserDetailsService;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -42,10 +36,15 @@ import org.springframework.security.test.context.support.WithUserDetails;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
 
-import application.test.TestSubmitApplication;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import application.test.TestSubmitApplication;
+import nl.tudelft.labracore.api.dto.*;
+import nl.tudelft.submit.dto.patch.UserSettingsPatchDTO;
+import nl.tudelft.submit.model.UserSettings;
+import nl.tudelft.submit.service.UserSettingsService;
+import nl.tudelft.submit.test.TestUserDetailsService;
+
 @AutoConfigureMockMvc
 @SpringBootTest(classes = TestSubmitApplication.class)
 public class UserSettingsControllerTest {
diff --git a/src/test/java/nl/tudelft/submit/controller/VersionControllerTest.java b/src/test/java/nl/tudelft/submit/controller/VersionControllerTest.java
index a314ee98bc6826f6921278d3297db35d26344a65..f43d2c2c666b54183f39bfc4f98dc2627ff82e08 100644
--- a/src/test/java/nl/tudelft/submit/controller/VersionControllerTest.java
+++ b/src/test/java/nl/tudelft/submit/controller/VersionControllerTest.java
@@ -26,17 +26,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import nl.tudelft.labracore.api.dto.*;
-import nl.tudelft.submit.dto.create.VersionCreateDTO;
-import nl.tudelft.submit.dto.id.SubmitGroupIdDTO;
-import nl.tudelft.submit.dto.patch.VersionPatchDTO;
-import nl.tudelft.submit.dto.view.VersionViewDTO;
-import nl.tudelft.submit.model.Version;
-import nl.tudelft.submit.security.AuthorizationService;
-import nl.tudelft.submit.service.AssignmentService;
-import nl.tudelft.submit.service.StudentGroupService;
-import nl.tudelft.submit.service.VersionService;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -49,10 +38,20 @@ import org.springframework.security.test.context.support.WithUserDetails;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
 
-import application.test.TestSubmitApplication;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import application.test.TestSubmitApplication;
+import nl.tudelft.labracore.api.dto.*;
+import nl.tudelft.submit.dto.create.VersionCreateDTO;
+import nl.tudelft.submit.dto.id.SubmitGroupIdDTO;
+import nl.tudelft.submit.dto.patch.VersionPatchDTO;
+import nl.tudelft.submit.dto.view.VersionViewDTO;
+import nl.tudelft.submit.model.Version;
+import nl.tudelft.submit.security.AuthorizationService;
+import nl.tudelft.submit.service.AssignmentService;
+import nl.tudelft.submit.service.StudentGroupService;
+import nl.tudelft.submit.service.VersionService;
+
 @AutoConfigureMockMvc
 @SpringBootTest(classes = TestSubmitApplication.class)
 class VersionControllerTest {
diff --git a/src/test/java/nl/tudelft/submit/dto/AssignmentNoteDTOTest.java b/src/test/java/nl/tudelft/submit/dto/AssignmentNoteDTOTest.java
index 2516af8fca0b31cfc4add3653f334b907b97b50c..a52456688d9a3ca66cf9b8388d582702fa8ae54a 100644
--- a/src/test/java/nl/tudelft/submit/dto/AssignmentNoteDTOTest.java
+++ b/src/test/java/nl/tudelft/submit/dto/AssignmentNoteDTOTest.java
@@ -21,6 +21,10 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 import java.time.LocalDateTime;
 
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import application.test.TestSubmitApplication;
 import nl.tudelft.labracore.api.dto.AssignmentIdDTO;
 import nl.tudelft.submit.dto.create.note.AssignmentNoteCreateDTO;
 import nl.tudelft.submit.dto.id.AssignmentId;
@@ -28,11 +32,6 @@ import nl.tudelft.submit.dto.patch.note.AssignmentNotePatchDTO;
 import nl.tudelft.submit.model.Signature;
 import nl.tudelft.submit.model.note.AssignmentNote;
 
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-import application.test.TestSubmitApplication;
-
 @SpringBootTest(classes = TestSubmitApplication.class)
 class AssignmentNoteDTOTest {
 
diff --git a/src/test/java/nl/tudelft/submit/dto/GroupNoteDTOTest.java b/src/test/java/nl/tudelft/submit/dto/GroupNoteDTOTest.java
index 85ee367b7e4100617f0afb06b8a435b1e12c0fba..cc5eaaab0beb02ebd692b0080b15c6020b53bdf8 100644
--- a/src/test/java/nl/tudelft/submit/dto/GroupNoteDTOTest.java
+++ b/src/test/java/nl/tudelft/submit/dto/GroupNoteDTOTest.java
@@ -21,6 +21,10 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 import java.time.LocalDateTime;
 
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import application.test.TestSubmitApplication;
 import nl.tudelft.labracore.api.dto.StudentGroupIdDTO;
 import nl.tudelft.submit.dto.create.note.GroupNoteCreateDTO;
 import nl.tudelft.submit.dto.id.GroupId;
@@ -28,11 +32,6 @@ import nl.tudelft.submit.dto.patch.note.GroupNotePatchDTO;
 import nl.tudelft.submit.model.Signature;
 import nl.tudelft.submit.model.note.GroupNote;
 
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-import application.test.TestSubmitApplication;
-
 @SpringBootTest(classes = TestSubmitApplication.class)
 class GroupNoteDTOTest {
 
diff --git a/src/test/java/nl/tudelft/submit/dto/RoleNoteDTOTest.java b/src/test/java/nl/tudelft/submit/dto/RoleNoteDTOTest.java
index eb7c300d24ed8da846445f100b84a8cd6ea33926..1a75bce757a8c7c370281793f6d5e0a14697bf4c 100644
--- a/src/test/java/nl/tudelft/submit/dto/RoleNoteDTOTest.java
+++ b/src/test/java/nl/tudelft/submit/dto/RoleNoteDTOTest.java
@@ -21,6 +21,10 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 import java.time.LocalDateTime;
 
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import application.test.TestSubmitApplication;
 import nl.tudelft.labracore.api.dto.Id;
 import nl.tudelft.labracore.api.dto.RoleIdDTO;
 import nl.tudelft.submit.dto.create.note.RoleNoteCreateDTO;
@@ -29,11 +33,6 @@ import nl.tudelft.submit.dto.patch.note.RoleNotePatchDTO;
 import nl.tudelft.submit.model.Signature;
 import nl.tudelft.submit.model.note.RoleNote;
 
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-import application.test.TestSubmitApplication;
-
 @SpringBootTest(classes = TestSubmitApplication.class)
 class RoleNoteDTOTest {
 
diff --git a/src/test/java/nl/tudelft/submit/dto/ScriptFeedbackDTOTest.java b/src/test/java/nl/tudelft/submit/dto/ScriptFeedbackDTOTest.java
index 9e1b4f58411c77584a08c1a881befab7f3dda040..f6685a365446bd12423ea2af260024201cc24808 100644
--- a/src/test/java/nl/tudelft/submit/dto/ScriptFeedbackDTOTest.java
+++ b/src/test/java/nl/tudelft/submit/dto/ScriptFeedbackDTOTest.java
@@ -25,19 +25,18 @@ import java.util.Optional;
 
 import javax.transaction.Transactional;
 
-import nl.tudelft.labracore.api.dto.RoleSummaryDTO;
-import nl.tudelft.labracore.lib.api.GradeScheme;
-import nl.tudelft.submit.dto.create.FeedbackCreateDTO;
-import nl.tudelft.submit.model.Feedback;
-import nl.tudelft.submit.model.script.Script;
-import nl.tudelft.submit.repository.script.ScriptRepository;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 
 import application.test.TestSubmitApplication;
+import nl.tudelft.labracore.api.dto.RoleSummaryDTO;
+import nl.tudelft.labracore.lib.api.GradeScheme;
+import nl.tudelft.submit.dto.create.FeedbackCreateDTO;
+import nl.tudelft.submit.model.Feedback;
+import nl.tudelft.submit.model.script.Script;
+import nl.tudelft.submit.repository.script.ScriptRepository;
 
 @Transactional
 @SpringBootTest(classes = TestSubmitApplication.class)
diff --git a/src/test/java/nl/tudelft/submit/dto/ScriptIdDTOTest.java b/src/test/java/nl/tudelft/submit/dto/ScriptIdDTOTest.java
index 15a211a46298a3c32359557dceb98f32d8ce2f89..14dae5a77a73153ac4cbc50e1e010ac161b91738 100644
--- a/src/test/java/nl/tudelft/submit/dto/ScriptIdDTOTest.java
+++ b/src/test/java/nl/tudelft/submit/dto/ScriptIdDTOTest.java
@@ -19,6 +19,9 @@ package nl.tudelft.submit.dto;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
 import nl.tudelft.submit.dto.id.ScriptIdDTO;
 import nl.tudelft.submit.dto.id.ScriptTrainIdDTO;
 import nl.tudelft.submit.dto.id.ScriptWagonIdDTO;
@@ -29,9 +32,6 @@ import nl.tudelft.submit.repository.script.ScriptRepository;
 import nl.tudelft.submit.repository.script.ScriptTrainRepository;
 import nl.tudelft.submit.repository.script.ScriptWagonRepository;
 
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
 class ScriptIdDTOTest {
 
 	private ScriptIdDTO script;
diff --git a/src/test/java/nl/tudelft/submit/dto/SubmissionNoteDTOTest.java b/src/test/java/nl/tudelft/submit/dto/SubmissionNoteDTOTest.java
index 32caf43947d01710922e6de60cc32e43f5547052..3133a1f7d6517e81ea93677b76e5f7f77424bf78 100644
--- a/src/test/java/nl/tudelft/submit/dto/SubmissionNoteDTOTest.java
+++ b/src/test/java/nl/tudelft/submit/dto/SubmissionNoteDTOTest.java
@@ -21,6 +21,10 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 import java.time.LocalDateTime;
 
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import application.test.TestSubmitApplication;
 import nl.tudelft.labracore.api.dto.SubmissionIdDTO;
 import nl.tudelft.submit.dto.create.note.SubmissionNoteCreateDTO;
 import nl.tudelft.submit.dto.id.SubmissionId;
@@ -28,11 +32,6 @@ import nl.tudelft.submit.dto.patch.note.SubmissionNotePatchDTO;
 import nl.tudelft.submit.model.Signature;
 import nl.tudelft.submit.model.note.SubmissionNote;
 
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-import application.test.TestSubmitApplication;
-
 @SpringBootTest(classes = TestSubmitApplication.class)
 class SubmissionNoteDTOTest {
 
diff --git a/src/test/java/nl/tudelft/submit/dto/VersionDTOTest.java b/src/test/java/nl/tudelft/submit/dto/VersionDTOTest.java
index 3ae8c2f1b4b56c1b2326e303d05ee94c4294b72e..c22049b7871db178cbbf955e9fe8e88e3d583db5 100644
--- a/src/test/java/nl/tudelft/submit/dto/VersionDTOTest.java
+++ b/src/test/java/nl/tudelft/submit/dto/VersionDTOTest.java
@@ -23,17 +23,16 @@ import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import application.test.TestSubmitApplication;
 import nl.tudelft.labracore.api.dto.AssignmentIdDTO;
 import nl.tudelft.submit.dto.create.VersionCreateDTO;
 import nl.tudelft.submit.dto.patch.VersionPatchDTO;
 import nl.tudelft.submit.model.SubmitGroup;
 import nl.tudelft.submit.model.Version;
 
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-import application.test.TestSubmitApplication;
-
 @SpringBootTest(classes = TestSubmitApplication.class)
 public class VersionDTOTest {
 
diff --git a/src/test/java/nl/tudelft/submit/enums/DivisionsGenerateOrderTest.java b/src/test/java/nl/tudelft/submit/enums/DivisionsGenerateOrderTest.java
index f93d896a3f5c7f025f475ae7ed8273c4e8e8ec8c..00303cc5f57bd6101b9226361ffc28c71cd12825 100644
--- a/src/test/java/nl/tudelft/submit/enums/DivisionsGenerateOrderTest.java
+++ b/src/test/java/nl/tudelft/submit/enums/DivisionsGenerateOrderTest.java
@@ -22,10 +22,10 @@ import static org.assertj.core.api.Assertions.assertThat;
 import java.util.ArrayList;
 import java.util.List;
 
-import nl.tudelft.labracore.api.dto.*;
-
 import org.junit.jupiter.api.Test;
 
+import nl.tudelft.labracore.api.dto.*;
+
 class DivisionsGenerateOrderTest {
 
 	@Test
diff --git a/src/test/java/nl/tudelft/submit/model/NoteTest.java b/src/test/java/nl/tudelft/submit/model/NoteTest.java
index b57478fc7196538af56c2fea4cc64d954f0c3d38..1a4cf43edcb3382de01531dcea230813109089b9 100644
--- a/src/test/java/nl/tudelft/submit/model/NoteTest.java
+++ b/src/test/java/nl/tudelft/submit/model/NoteTest.java
@@ -23,12 +23,12 @@ import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.format.FormatStyle;
 
+import org.junit.jupiter.api.Test;
+
 import lombok.experimental.SuperBuilder;
 import nl.tudelft.submit.dto.patch.note.NotePatchDTO;
 import nl.tudelft.submit.model.note.Note;
 
-import org.junit.jupiter.api.Test;
-
 class NoteTest {
 
 	@SuperBuilder
diff --git a/src/test/java/nl/tudelft/submit/repository/FeedbackRepositoryTest.java b/src/test/java/nl/tudelft/submit/repository/FeedbackRepositoryTest.java
index 56ebf3774f7130efff2f59c71de2f43dea039a28..33880a868a29de67d7d265552d124108a4e6d5c6 100644
--- a/src/test/java/nl/tudelft/submit/repository/FeedbackRepositoryTest.java
+++ b/src/test/java/nl/tudelft/submit/repository/FeedbackRepositoryTest.java
@@ -26,10 +26,6 @@ import java.util.Random;
 
 import javax.transaction.Transactional;
 
-import nl.tudelft.labracore.api.dto.RoleSummaryDTO;
-import nl.tudelft.submit.dto.create.FeedbackCreateDTO;
-import nl.tudelft.submit.model.Feedback;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,6 +33,9 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.data.rest.webmvc.ResourceNotFoundException;
 
 import application.test.TestSubmitApplication;
+import nl.tudelft.labracore.api.dto.RoleSummaryDTO;
+import nl.tudelft.submit.dto.create.FeedbackCreateDTO;
+import nl.tudelft.submit.model.Feedback;
 
 @Transactional
 @SpringBootTest(classes = TestSubmitApplication.class)
diff --git a/src/test/java/nl/tudelft/submit/repository/NotificationRepositoryTest.java b/src/test/java/nl/tudelft/submit/repository/NotificationRepositoryTest.java
index bec787ddab3e323017f672ddc95f818075bf2bd1..62a469d21c6f063e853c3cb510ec7c2917a7fccd 100644
--- a/src/test/java/nl/tudelft/submit/repository/NotificationRepositoryTest.java
+++ b/src/test/java/nl/tudelft/submit/repository/NotificationRepositoryTest.java
@@ -24,14 +24,13 @@ import java.util.List;
 
 import javax.transaction.Transactional;
 
-import nl.tudelft.submit.model.Notification;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
 import application.test.TestSubmitApplication;
+import nl.tudelft.submit.model.Notification;
 
 @Transactional
 @SpringBootTest(classes = TestSubmitApplication.class)
diff --git a/src/test/java/nl/tudelft/submit/repository/SubmissionKeyRepositoryTest.java b/src/test/java/nl/tudelft/submit/repository/SubmissionKeyRepositoryTest.java
index f0982595bf7b10ceadb1465b91fee93ef5ba2d63..76ac301991578e7fb75a1d3ff4456a351a48630a 100644
--- a/src/test/java/nl/tudelft/submit/repository/SubmissionKeyRepositoryTest.java
+++ b/src/test/java/nl/tudelft/submit/repository/SubmissionKeyRepositoryTest.java
@@ -24,8 +24,6 @@ import java.time.LocalDateTime;
 
 import javax.transaction.Transactional;
 
-import nl.tudelft.submit.model.script.SubmissionKey;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,6 +31,7 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.data.rest.webmvc.ResourceNotFoundException;
 
 import application.test.TestSubmitApplication;
+import nl.tudelft.submit.model.script.SubmissionKey;
 
 @Transactional
 @SpringBootTest(classes = TestSubmitApplication.class)
diff --git a/src/test/java/nl/tudelft/submit/repository/SubmitGroupRepositoryTest.java b/src/test/java/nl/tudelft/submit/repository/SubmitGroupRepositoryTest.java
index 3596669c5969fff255270609673e1586db932d35..240f3687dc679fd95b3ebce22935b69fedfed2c2 100644
--- a/src/test/java/nl/tudelft/submit/repository/SubmitGroupRepositoryTest.java
+++ b/src/test/java/nl/tudelft/submit/repository/SubmitGroupRepositoryTest.java
@@ -25,9 +25,6 @@ import java.util.List;
 
 import javax.transaction.Transactional;
 
-import nl.tudelft.submit.model.SubmitGroup;
-import nl.tudelft.submit.model.Version;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,6 +32,8 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.data.rest.webmvc.ResourceNotFoundException;
 
 import application.test.TestSubmitApplication;
+import nl.tudelft.submit.model.SubmitGroup;
+import nl.tudelft.submit.model.Version;
 
 @Transactional
 @SpringBootTest(classes = TestSubmitApplication.class)
diff --git a/src/test/java/nl/tudelft/submit/repository/SwitchEventRepositoryTest.java b/src/test/java/nl/tudelft/submit/repository/SwitchEventRepositoryTest.java
index 4557a87b3eb4c77acf25203aa11cda1b6a47fbe2..b6004db7ab22ba04d58dea443bae9a16e3db95ba 100644
--- a/src/test/java/nl/tudelft/submit/repository/SwitchEventRepositoryTest.java
+++ b/src/test/java/nl/tudelft/submit/repository/SwitchEventRepositoryTest.java
@@ -27,8 +27,6 @@ import java.util.List;
 
 import javax.transaction.Transactional;
 
-import nl.tudelft.submit.model.SwitchEvent;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +34,7 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.data.rest.webmvc.ResourceNotFoundException;
 
 import application.test.TestSubmitApplication;
+import nl.tudelft.submit.model.SwitchEvent;
 
 @Transactional
 @SpringBootTest(classes = TestSubmitApplication.class)
diff --git a/src/test/java/nl/tudelft/submit/repository/UserSettingsRepositoryTest.java b/src/test/java/nl/tudelft/submit/repository/UserSettingsRepositoryTest.java
index b03dd974b6d3d29670bda8e3d09987556844e242..720d88f01b6fdafe727bbe4ad65e5f9ab4b00ee4 100644
--- a/src/test/java/nl/tudelft/submit/repository/UserSettingsRepositoryTest.java
+++ b/src/test/java/nl/tudelft/submit/repository/UserSettingsRepositoryTest.java
@@ -22,9 +22,6 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import javax.transaction.Transactional;
 
-import nl.tudelft.labracore.api.dto.PersonIdDTO;
-import nl.tudelft.submit.model.UserSettings;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,6 +29,8 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.data.rest.webmvc.ResourceNotFoundException;
 
 import application.test.TestSubmitApplication;
+import nl.tudelft.labracore.api.dto.PersonIdDTO;
+import nl.tudelft.submit.model.UserSettings;
 
 @Transactional
 @SpringBootTest(classes = TestSubmitApplication.class)
diff --git a/src/test/java/nl/tudelft/submit/repository/VersionRepositoryTest.java b/src/test/java/nl/tudelft/submit/repository/VersionRepositoryTest.java
index 80f7665191677a1c634616e35a8eb903f94b7c7f..0cc48da16ba3b311d6c6685c88dc84bb240df9d8 100644
--- a/src/test/java/nl/tudelft/submit/repository/VersionRepositoryTest.java
+++ b/src/test/java/nl/tudelft/submit/repository/VersionRepositoryTest.java
@@ -26,9 +26,6 @@ import java.util.Optional;
 
 import javax.transaction.Transactional;
 
-import nl.tudelft.submit.model.SubmitGroup;
-import nl.tudelft.submit.model.Version;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +33,8 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.data.rest.webmvc.ResourceNotFoundException;
 
 import application.test.TestSubmitApplication;
+import nl.tudelft.submit.model.SubmitGroup;
+import nl.tudelft.submit.model.Version;
 
 @Transactional
 @SpringBootTest(classes = TestSubmitApplication.class)
diff --git a/src/test/java/nl/tudelft/submit/repository/grading/EditionCalculatedScoreRepositoryTest.java b/src/test/java/nl/tudelft/submit/repository/grading/EditionCalculatedScoreRepositoryTest.java
index d70f80ebfbd0ec04854d1d89974257d36257779c..c16584c937e78524476de605a192e611199509b5 100644
--- a/src/test/java/nl/tudelft/submit/repository/grading/EditionCalculatedScoreRepositoryTest.java
+++ b/src/test/java/nl/tudelft/submit/repository/grading/EditionCalculatedScoreRepositoryTest.java
@@ -22,10 +22,6 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import javax.transaction.Transactional;
 
-import nl.tudelft.labracore.lib.api.GradeScheme;
-import nl.tudelft.submit.model.grading.CalculatedScore;
-import nl.tudelft.submit.model.grading.EditionCalculatedScore;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,6 +29,9 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.data.rest.webmvc.ResourceNotFoundException;
 
 import application.test.TestSubmitApplication;
+import nl.tudelft.labracore.lib.api.GradeScheme;
+import nl.tudelft.submit.model.grading.CalculatedScore;
+import nl.tudelft.submit.model.grading.EditionCalculatedScore;
 
 @Transactional
 @SpringBootTest(classes = TestSubmitApplication.class)
diff --git a/src/test/java/nl/tudelft/submit/repository/grading/ModuleCalculatedScoreRepositoryTest.java b/src/test/java/nl/tudelft/submit/repository/grading/ModuleCalculatedScoreRepositoryTest.java
index 1f1182d94adc5fe04f505a916ef4f66f86cbc9d5..8474ecc871918ebad41a4fa191a4fd25615312b3 100644
--- a/src/test/java/nl/tudelft/submit/repository/grading/ModuleCalculatedScoreRepositoryTest.java
+++ b/src/test/java/nl/tudelft/submit/repository/grading/ModuleCalculatedScoreRepositoryTest.java
@@ -22,10 +22,6 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import javax.transaction.Transactional;
 
-import nl.tudelft.labracore.lib.api.GradeScheme;
-import nl.tudelft.submit.model.grading.CalculatedScore;
-import nl.tudelft.submit.model.grading.ModuleCalculatedScore;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,6 +29,9 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.data.rest.webmvc.ResourceNotFoundException;
 
 import application.test.TestSubmitApplication;
+import nl.tudelft.labracore.lib.api.GradeScheme;
+import nl.tudelft.submit.model.grading.CalculatedScore;
+import nl.tudelft.submit.model.grading.ModuleCalculatedScore;
 
 @Transactional
 @SpringBootTest(classes = TestSubmitApplication.class)
diff --git a/src/test/java/nl/tudelft/submit/repository/note/AssignmentNoteRepositoryTest.java b/src/test/java/nl/tudelft/submit/repository/note/AssignmentNoteRepositoryTest.java
index 8902cb53d4b081e8c14eb93004b0c7452bd6d72a..b3481aa69912a5baeb8f53cc526e092eaf3f0c4a 100644
--- a/src/test/java/nl/tudelft/submit/repository/note/AssignmentNoteRepositoryTest.java
+++ b/src/test/java/nl/tudelft/submit/repository/note/AssignmentNoteRepositoryTest.java
@@ -25,10 +25,6 @@ import java.util.List;
 
 import javax.transaction.Transactional;
 
-import nl.tudelft.submit.dto.id.AssignmentId;
-import nl.tudelft.submit.model.Signature;
-import nl.tudelft.submit.model.note.AssignmentNote;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +32,9 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.data.rest.webmvc.ResourceNotFoundException;
 
 import application.test.TestSubmitApplication;
+import nl.tudelft.submit.dto.id.AssignmentId;
+import nl.tudelft.submit.model.Signature;
+import nl.tudelft.submit.model.note.AssignmentNote;
 
 @Transactional
 @SpringBootTest(classes = TestSubmitApplication.class)
diff --git a/src/test/java/nl/tudelft/submit/repository/note/GroupNoteRepositoryTest.java b/src/test/java/nl/tudelft/submit/repository/note/GroupNoteRepositoryTest.java
index 7882cf1809fa208b07d7afd971d8a91cdea0a627..1f097fa1c40efd61cf5c4b0770e0f8cc18a30ac0 100644
--- a/src/test/java/nl/tudelft/submit/repository/note/GroupNoteRepositoryTest.java
+++ b/src/test/java/nl/tudelft/submit/repository/note/GroupNoteRepositoryTest.java
@@ -25,10 +25,6 @@ import java.util.List;
 
 import javax.transaction.Transactional;
 
-import nl.tudelft.submit.dto.id.GroupId;
-import nl.tudelft.submit.model.Signature;
-import nl.tudelft.submit.model.note.GroupNote;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +32,9 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.data.rest.webmvc.ResourceNotFoundException;
 
 import application.test.TestSubmitApplication;
+import nl.tudelft.submit.dto.id.GroupId;
+import nl.tudelft.submit.model.Signature;
+import nl.tudelft.submit.model.note.GroupNote;
 
 @Transactional
 @SpringBootTest(classes = TestSubmitApplication.class)
diff --git a/src/test/java/nl/tudelft/submit/repository/note/RoleNoteRepositoryTest.java b/src/test/java/nl/tudelft/submit/repository/note/RoleNoteRepositoryTest.java
index 8f620f698cb739ed67f5e47d6ff40acaf4a39f61..db37368ca1c48e1605eb8ee967fb6ea5bad35b1b 100644
--- a/src/test/java/nl/tudelft/submit/repository/note/RoleNoteRepositoryTest.java
+++ b/src/test/java/nl/tudelft/submit/repository/note/RoleNoteRepositoryTest.java
@@ -25,11 +25,6 @@ import java.util.List;
 
 import javax.transaction.Transactional;
 
-import nl.tudelft.labracore.api.dto.Id;
-import nl.tudelft.submit.dto.id.RoleId;
-import nl.tudelft.submit.model.Signature;
-import nl.tudelft.submit.model.note.RoleNote;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,6 +32,10 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.data.rest.webmvc.ResourceNotFoundException;
 
 import application.test.TestSubmitApplication;
+import nl.tudelft.labracore.api.dto.Id;
+import nl.tudelft.submit.dto.id.RoleId;
+import nl.tudelft.submit.model.Signature;
+import nl.tudelft.submit.model.note.RoleNote;
 
 @Transactional
 @SpringBootTest(classes = TestSubmitApplication.class)
diff --git a/src/test/java/nl/tudelft/submit/repository/note/SubmissionNoteRepositoryTest.java b/src/test/java/nl/tudelft/submit/repository/note/SubmissionNoteRepositoryTest.java
index 6aec162f609a93613ed7030fca00301252717ece..64e758b18a49a4a64f5ab678edf6e6b218ca81cc 100644
--- a/src/test/java/nl/tudelft/submit/repository/note/SubmissionNoteRepositoryTest.java
+++ b/src/test/java/nl/tudelft/submit/repository/note/SubmissionNoteRepositoryTest.java
@@ -25,10 +25,6 @@ import java.util.List;
 
 import javax.transaction.Transactional;
 
-import nl.tudelft.submit.dto.id.SubmissionId;
-import nl.tudelft.submit.model.Signature;
-import nl.tudelft.submit.model.note.SubmissionNote;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +32,9 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.data.rest.webmvc.ResourceNotFoundException;
 
 import application.test.TestSubmitApplication;
+import nl.tudelft.submit.dto.id.SubmissionId;
+import nl.tudelft.submit.model.Signature;
+import nl.tudelft.submit.model.note.SubmissionNote;
 
 @Transactional
 @SpringBootTest(classes = TestSubmitApplication.class)
diff --git a/src/test/java/nl/tudelft/submit/repository/script/ScriptRepositoryTest.java b/src/test/java/nl/tudelft/submit/repository/script/ScriptRepositoryTest.java
index 619cc37ce947bfe5538f41026b6d4c92aa457e71..d881378d4043da74c8a899ba9c27ef46a1c33285 100644
--- a/src/test/java/nl/tudelft/submit/repository/script/ScriptRepositoryTest.java
+++ b/src/test/java/nl/tudelft/submit/repository/script/ScriptRepositoryTest.java
@@ -21,12 +21,6 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 import javax.transaction.Transactional;
 
-import nl.tudelft.submit.dto.create.script.ScriptCreateDTO;
-import nl.tudelft.submit.dto.id.ScriptWagonIdDTO;
-import nl.tudelft.submit.dto.patch.script.ScriptPatchDTO;
-import nl.tudelft.submit.model.script.Script;
-import nl.tudelft.submit.model.script.ScriptWagon;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.modelmapper.ModelMapper;
@@ -35,6 +29,11 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.data.rest.webmvc.ResourceNotFoundException;
 
 import application.test.TestSubmitApplication;
+import nl.tudelft.submit.dto.create.script.ScriptCreateDTO;
+import nl.tudelft.submit.dto.id.ScriptWagonIdDTO;
+import nl.tudelft.submit.dto.patch.script.ScriptPatchDTO;
+import nl.tudelft.submit.model.script.Script;
+import nl.tudelft.submit.model.script.ScriptWagon;
 
 @Transactional
 @SpringBootTest(classes = TestSubmitApplication.class)
diff --git a/src/test/java/nl/tudelft/submit/repository/script/ScriptTrainRepositoryTest.java b/src/test/java/nl/tudelft/submit/repository/script/ScriptTrainRepositoryTest.java
index 2c0563ba50f1d143894fe475cd4ba34ca701340b..4f263457cea52df2b341850befdf4a1be6883bd0 100644
--- a/src/test/java/nl/tudelft/submit/repository/script/ScriptTrainRepositoryTest.java
+++ b/src/test/java/nl/tudelft/submit/repository/script/ScriptTrainRepositoryTest.java
@@ -21,12 +21,6 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 import javax.transaction.Transactional;
 
-import nl.tudelft.submit.dto.create.script.ScriptTrainCreateDTO;
-import nl.tudelft.submit.dto.id.VersionIdDTO;
-import nl.tudelft.submit.model.Version;
-import nl.tudelft.submit.model.script.ScriptTrain;
-import nl.tudelft.submit.repository.VersionRepository;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,6 +28,11 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.data.rest.webmvc.ResourceNotFoundException;
 
 import application.test.TestSubmitApplication;
+import nl.tudelft.submit.dto.create.script.ScriptTrainCreateDTO;
+import nl.tudelft.submit.dto.id.VersionIdDTO;
+import nl.tudelft.submit.model.Version;
+import nl.tudelft.submit.model.script.ScriptTrain;
+import nl.tudelft.submit.repository.VersionRepository;
 
 @Transactional
 @SpringBootTest(classes = TestSubmitApplication.class)
diff --git a/src/test/java/nl/tudelft/submit/repository/script/ScriptWagonRepositoryTest.java b/src/test/java/nl/tudelft/submit/repository/script/ScriptWagonRepositoryTest.java
index d13296eef57bcabf8169383f23595de6ff4979dc..3f80999810e12c1892e95211e03eb31550af2ea3 100644
--- a/src/test/java/nl/tudelft/submit/repository/script/ScriptWagonRepositoryTest.java
+++ b/src/test/java/nl/tudelft/submit/repository/script/ScriptWagonRepositoryTest.java
@@ -21,11 +21,6 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 import javax.transaction.Transactional;
 
-import nl.tudelft.submit.dto.create.script.ScriptWagonCreateDTO;
-import nl.tudelft.submit.dto.id.ScriptTrainIdDTO;
-import nl.tudelft.submit.model.script.ScriptTrain;
-import nl.tudelft.submit.model.script.ScriptWagon;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,6 +28,10 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.data.rest.webmvc.ResourceNotFoundException;
 
 import application.test.TestSubmitApplication;
+import nl.tudelft.submit.dto.create.script.ScriptWagonCreateDTO;
+import nl.tudelft.submit.dto.id.ScriptTrainIdDTO;
+import nl.tudelft.submit.model.script.ScriptTrain;
+import nl.tudelft.submit.model.script.ScriptWagon;
 
 @Transactional
 @SpringBootTest(classes = TestSubmitApplication.class)
diff --git a/src/test/java/nl/tudelft/submit/security/AuthorizationServiceTest.java b/src/test/java/nl/tudelft/submit/security/AuthorizationServiceTest.java
index 1d2f6ae82c600cdc23acc0500170889163eab821..323373ca3b0f036ed05a0cdf2537310cc5dccdba 100644
--- a/src/test/java/nl/tudelft/submit/security/AuthorizationServiceTest.java
+++ b/src/test/java/nl/tudelft/submit/security/AuthorizationServiceTest.java
@@ -27,6 +27,17 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.security.test.context.support.WithUserDetails;
+
+import application.test.TestSubmitApplication;
 import nl.tudelft.labracore.api.AuthorizationControllerApi;
 import nl.tudelft.labracore.api.CourseControllerApi;
 import nl.tudelft.labracore.api.dto.*;
@@ -40,19 +51,7 @@ import nl.tudelft.submit.repository.SubmissionKeyRepository;
 import nl.tudelft.submit.repository.VersionRepository;
 import nl.tudelft.submit.service.VersionService;
 import nl.tudelft.submit.test.TestUserDetailsService;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.CsvSource;
-import org.junit.jupiter.params.provider.MethodSource;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.security.test.context.support.WithUserDetails;
-
 import reactor.core.publisher.Mono;
-import application.test.TestSubmitApplication;
 
 @SpringBootTest(classes = TestSubmitApplication.class)
 class AuthorizationServiceTest {
diff --git a/src/test/java/nl/tudelft/submit/service/AnnouncementServiceTest.java b/src/test/java/nl/tudelft/submit/service/AnnouncementServiceTest.java
index fb67323b08d9fa5383af832da761ff83cd91b020..240c0b566dcbfc0a8e6454253601384ea6010ba0 100644
--- a/src/test/java/nl/tudelft/submit/service/AnnouncementServiceTest.java
+++ b/src/test/java/nl/tudelft/submit/service/AnnouncementServiceTest.java
@@ -25,18 +25,17 @@ import java.time.LocalTime;
 
 import javax.transaction.Transactional;
 
-import nl.tudelft.submit.dto.create.announcement.GlobalAnnouncementCreateDTO;
-import nl.tudelft.submit.model.announcement.EditionAnnouncement;
-import nl.tudelft.submit.model.announcement.GlobalAnnouncement;
-import nl.tudelft.submit.repository.announcement.EditionAnnouncementRepository;
-import nl.tudelft.submit.repository.announcement.GlobalAnnouncementRepository;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
 import application.test.TestSubmitApplication;
+import nl.tudelft.submit.dto.create.announcement.GlobalAnnouncementCreateDTO;
+import nl.tudelft.submit.model.announcement.EditionAnnouncement;
+import nl.tudelft.submit.model.announcement.GlobalAnnouncement;
+import nl.tudelft.submit.repository.announcement.EditionAnnouncementRepository;
+import nl.tudelft.submit.repository.announcement.GlobalAnnouncementRepository;
 
 @Transactional
 @SpringBootTest(classes = TestSubmitApplication.class)
diff --git a/src/test/java/nl/tudelft/submit/service/ApiKeyServiceTest.java b/src/test/java/nl/tudelft/submit/service/ApiKeyServiceTest.java
index 9d726a03515ca607d02a23fb82ce56d962ec8845..890f551665abaeb4c609c3fa37010380a194b25b 100644
--- a/src/test/java/nl/tudelft/submit/service/ApiKeyServiceTest.java
+++ b/src/test/java/nl/tudelft/submit/service/ApiKeyServiceTest.java
@@ -19,15 +19,14 @@ package nl.tudelft.submit.service;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import nl.tudelft.submit.model.api.EditionApiKey;
-import nl.tudelft.submit.repository.EditionApiKeyRepository;
-
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.transaction.annotation.Transactional;
 
 import application.test.TestSubmitApplication;
+import nl.tudelft.submit.model.api.EditionApiKey;
+import nl.tudelft.submit.repository.EditionApiKeyRepository;
 
 @Transactional
 @SpringBootTest(classes = TestSubmitApplication.class)
diff --git a/src/test/java/nl/tudelft/submit/service/AssignmentServiceTest.java b/src/test/java/nl/tudelft/submit/service/AssignmentServiceTest.java
index af84af4fbd850799fb04c6075d6b6a2ddff27727..a4f282cfd80112fb95e8707860134230c2796460 100644
--- a/src/test/java/nl/tudelft/submit/service/AssignmentServiceTest.java
+++ b/src/test/java/nl/tudelft/submit/service/AssignmentServiceTest.java
@@ -30,6 +30,17 @@ import java.util.Optional;
 
 import javax.transaction.Transactional;
 
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+import org.mockito.MockitoAnnotations;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+
+import com.opencsv.exceptions.CsvValidationException;
+
+import application.test.TestSubmitApplication;
 import nl.tudelft.labracore.api.AssignmentControllerApi;
 import nl.tudelft.labracore.api.GradeControllerApi;
 import nl.tudelft.labracore.api.dto.*;
@@ -47,20 +58,8 @@ import nl.tudelft.submit.enums.GradeImportIdType;
 import nl.tudelft.submit.model.SubmitAssignment;
 import nl.tudelft.submit.model.SubmitSubmission;
 import nl.tudelft.submit.repository.SubmitAssignmentRepository;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.mockito.ArgumentCaptor;
-import org.mockito.MockitoAnnotations;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
-import application.test.TestSubmitApplication;
-
-import com.opencsv.exceptions.CsvValidationException;
 
 @Transactional
 @SpringBootTest(classes = TestSubmitApplication.class)
diff --git a/src/test/java/nl/tudelft/submit/service/CohortServiceTest.java b/src/test/java/nl/tudelft/submit/service/CohortServiceTest.java
index 199ab8f368fe0722d59c838aef2760bf2a8ace4f..76cba425e276082d4b4f69acc8b3521560761caf 100644
--- a/src/test/java/nl/tudelft/submit/service/CohortServiceTest.java
+++ b/src/test/java/nl/tudelft/submit/service/CohortServiceTest.java
@@ -22,17 +22,16 @@ import static org.mockito.Mockito.*;
 
 import java.util.List;
 
-import nl.tudelft.labracore.api.CohortControllerApi;
-import nl.tudelft.labracore.api.dto.*;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.MockitoAnnotations;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
-import reactor.core.publisher.Flux;
 import application.test.TestSubmitApplication;
+import nl.tudelft.labracore.api.CohortControllerApi;
+import nl.tudelft.labracore.api.dto.*;
+import reactor.core.publisher.Flux;
 
 @SpringBootTest(classes = TestSubmitApplication.class)
 public class CohortServiceTest {
diff --git a/src/test/java/nl/tudelft/submit/service/CourseServiceTest.java b/src/test/java/nl/tudelft/submit/service/CourseServiceTest.java
index 47b2c845a02685bf9d02bbb798f5c2f4c206c49f..414eea8b6f88f78b54fa163747d33b0634340e40 100644
--- a/src/test/java/nl/tudelft/submit/service/CourseServiceTest.java
+++ b/src/test/java/nl/tudelft/submit/service/CourseServiceTest.java
@@ -24,18 +24,17 @@ import static org.mockito.Mockito.when;
 
 import java.util.List;
 
-import nl.tudelft.labracore.api.CourseControllerApi;
-import nl.tudelft.labracore.api.dto.CourseSummaryDTO;
-import nl.tudelft.labracore.api.dto.PersonIdDTO;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.MockitoAnnotations;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
-import reactor.core.publisher.Flux;
 import application.test.TestSubmitApplication;
+import nl.tudelft.labracore.api.CourseControllerApi;
+import nl.tudelft.labracore.api.dto.CourseSummaryDTO;
+import nl.tudelft.labracore.api.dto.PersonIdDTO;
+import reactor.core.publisher.Flux;
 
 @SpringBootTest(classes = TestSubmitApplication.class)
 public class CourseServiceTest {
diff --git a/src/test/java/nl/tudelft/submit/service/EditionServiceTest.java b/src/test/java/nl/tudelft/submit/service/EditionServiceTest.java
index 100b95dcc9c26475fe487b3acdd9f5559b4dbcf5..4c72aec8455bf738b46a5e0b27f04c7c18696eb5 100644
--- a/src/test/java/nl/tudelft/submit/service/EditionServiceTest.java
+++ b/src/test/java/nl/tudelft/submit/service/EditionServiceTest.java
@@ -29,6 +29,20 @@ import java.util.Optional;
 
 import javax.transaction.Transactional;
 
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+
+import com.opencsv.exceptions.CsvValidationException;
+
+import application.test.TestSubmitApplication;
 import lombok.AllArgsConstructor;
 import nl.tudelft.labracore.api.EditionControllerApi;
 import nl.tudelft.labracore.api.dto.*;
@@ -46,23 +60,8 @@ import nl.tudelft.submit.model.SubmitEdition;
 import nl.tudelft.submit.model.UserSettings;
 import nl.tudelft.submit.model.grading.EditionGradingFormula;
 import nl.tudelft.submit.repository.SubmitEditionRepository;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
-import application.test.TestSubmitApplication;
-
-import com.opencsv.exceptions.CsvValidationException;
 
 @SpringBootTest(classes = TestSubmitApplication.class)
 public class EditionServiceTest {
diff --git a/src/test/java/nl/tudelft/submit/service/EmailServiceTest.java b/src/test/java/nl/tudelft/submit/service/EmailServiceTest.java
index 3d88488594cd46bb198693e71729375c9216a7ba..a8ec29b195d24cebade1efaede049ce7bbb7c9db 100644
--- a/src/test/java/nl/tudelft/submit/service/EmailServiceTest.java
+++ b/src/test/java/nl/tudelft/submit/service/EmailServiceTest.java
@@ -21,9 +21,6 @@ import static org.mockito.Mockito.*;
 
 import java.util.List;
 
-import nl.tudelft.labracore.api.dto.PersonSummaryDTO;
-import nl.tudelft.submit.dto.create.MailMessageCreateDTO;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.MockitoAnnotations;
@@ -31,6 +28,8 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 
 import application.test.TestSubmitApplication;
+import nl.tudelft.labracore.api.dto.PersonSummaryDTO;
+import nl.tudelft.submit.dto.create.MailMessageCreateDTO;
 
 @SpringBootTest(classes = TestSubmitApplication.class)
 public class EmailServiceTest {
diff --git a/src/test/java/nl/tudelft/submit/service/ExportServiceTest.java b/src/test/java/nl/tudelft/submit/service/ExportServiceTest.java
index 780d465c842f4bf6f67863918fbfb5ec4e4a2fb3..7c4d979ebcc1e1aead66fc9036bec9d17a7c673f 100644
--- a/src/test/java/nl/tudelft/submit/service/ExportServiceTest.java
+++ b/src/test/java/nl/tudelft/submit/service/ExportServiceTest.java
@@ -26,6 +26,15 @@ import java.util.stream.Stream;
 
 import javax.transaction.Transactional;
 
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+
+import application.test.TestSubmitApplication;
 import nl.tudelft.labracore.api.dto.*;
 import nl.tudelft.labracore.lib.api.GradeScheme;
 import nl.tudelft.submit.cache.EditionCacheManager;
@@ -40,16 +49,6 @@ import nl.tudelft.submit.model.grading.CalculatedScore;
 import nl.tudelft.submit.model.grading.EditionCalculatedScore;
 import nl.tudelft.submit.model.grading.ModuleCalculatedScore;
 
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.mockito.ArgumentCaptor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-
-import application.test.TestSubmitApplication;
-
 @Transactional
 @SpringBootTest(classes = TestSubmitApplication.class)
 class ExportServiceTest {
diff --git a/src/test/java/nl/tudelft/submit/service/FeedbackServiceMockRepoTest.java b/src/test/java/nl/tudelft/submit/service/FeedbackServiceMockRepoTest.java
index 299e440701fae97383c943017db18f09f438c501..5d80ffdc75449ac9dcd8442de4b9e934f9baf906 100644
--- a/src/test/java/nl/tudelft/submit/service/FeedbackServiceMockRepoTest.java
+++ b/src/test/java/nl/tudelft/submit/service/FeedbackServiceMockRepoTest.java
@@ -24,14 +24,6 @@ import java.time.LocalDateTime;
 
 import javax.transaction.Transactional;
 
-import nl.tudelft.librador.dto.view.View;
-import nl.tudelft.submit.dto.patch.FeedbackPatchDTO;
-import nl.tudelft.submit.dto.view.FeedbackViewDTO;
-import nl.tudelft.submit.model.Feedback;
-import nl.tudelft.submit.model.script.Script;
-import nl.tudelft.submit.repository.FeedbackRepository;
-import nl.tudelft.submit.repository.script.ScriptRepository;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,6 +31,13 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 
 import application.test.TestSubmitApplication;
+import nl.tudelft.librador.dto.view.View;
+import nl.tudelft.submit.dto.patch.FeedbackPatchDTO;
+import nl.tudelft.submit.dto.view.FeedbackViewDTO;
+import nl.tudelft.submit.model.Feedback;
+import nl.tudelft.submit.model.script.Script;
+import nl.tudelft.submit.repository.FeedbackRepository;
+import nl.tudelft.submit.repository.script.ScriptRepository;
 
 @Transactional
 @SpringBootTest(classes = TestSubmitApplication.class)
diff --git a/src/test/java/nl/tudelft/submit/service/FeedbackServiceSelfTest.java b/src/test/java/nl/tudelft/submit/service/FeedbackServiceSelfTest.java
index 756094e816396324ae32a56b1390b7ac49566ded..4c7f9a9e800a32b7706dab2171051d5e89da26be 100644
--- a/src/test/java/nl/tudelft/submit/service/FeedbackServiceSelfTest.java
+++ b/src/test/java/nl/tudelft/submit/service/FeedbackServiceSelfTest.java
@@ -25,14 +25,13 @@ import static org.mockito.Mockito.when;
 import java.util.List;
 import java.util.Map;
 
-import nl.tudelft.labracore.api.dto.SubmissionSummaryDTO;
-import nl.tudelft.submit.dto.view.FeedbackViewDTO;
-
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 
 import application.test.TestSubmitApplication;
+import nl.tudelft.labracore.api.dto.SubmissionSummaryDTO;
+import nl.tudelft.submit.dto.view.FeedbackViewDTO;
 
 @SpringBootTest(classes = TestSubmitApplication.class)
 class FeedbackServiceSelfTest {
diff --git a/src/test/java/nl/tudelft/submit/service/FeedbackServiceTest.java b/src/test/java/nl/tudelft/submit/service/FeedbackServiceTest.java
index aed0a7da91af8dc5c0fb88ef2637600bf33bdc1f..8c3575e86338961b5dd1a2dd74ac4fbff9612a88 100644
--- a/src/test/java/nl/tudelft/submit/service/FeedbackServiceTest.java
+++ b/src/test/java/nl/tudelft/submit/service/FeedbackServiceTest.java
@@ -21,22 +21,21 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 import java.time.LocalDateTime;
 
-import nl.tudelft.labracore.api.dto.*;
-import nl.tudelft.submit.dto.create.FeedbackCreateDTO;
-import nl.tudelft.submit.model.Feedback;
-import nl.tudelft.submit.repository.FeedbackRepository;
-import nl.tudelft.submit.repository.script.ScriptRepository;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 
-import application.test.TestSubmitApplication;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import application.test.TestSubmitApplication;
+import nl.tudelft.labracore.api.dto.*;
+import nl.tudelft.submit.dto.create.FeedbackCreateDTO;
+import nl.tudelft.submit.model.Feedback;
+import nl.tudelft.submit.repository.FeedbackRepository;
+import nl.tudelft.submit.repository.script.ScriptRepository;
+
 @SpringBootTest(classes = TestSubmitApplication.class)
 class FeedbackServiceTest {
 
diff --git a/src/test/java/nl/tudelft/submit/service/FileServiceTest.java b/src/test/java/nl/tudelft/submit/service/FileServiceTest.java
index 60783b254b7d2455ef4fe336f01ed64bed0c17ba..3e602b60ea1c62fd96886307128c07e2ee8cb3eb 100644
--- a/src/test/java/nl/tudelft/submit/service/FileServiceTest.java
+++ b/src/test/java/nl/tudelft/submit/service/FileServiceTest.java
@@ -158,7 +158,7 @@ class FileServiceTest {
 	void toFileName() {
 		assertThat(fileService.toFileName(
 				"As̸̴̨̧̼̝̠̹̮̜̝͕͚̰̫̺̣̹͉̣̜̫̤̗̜̝̣̬̤͎͈̮̮̥͍͋̍͆̇͊̾͑̕͠͠͠ͅsignm̸̧̡͓̰̮̮̯͔̿eǹ̨̢̛̙̺̭͇̠̣͓͖͉͖̣̯̥̘͇͕̣́̍͝͝t 1: A̡̧̱͙͚͓̭̮̫͉͇͎͉̯̖͈̣̙̝̳͉̾̐̓̃͌̍͆̂̂͊̄̓͛͐̒͜͝ͅͅss̀̒̋̇̾̈́̅̕̚e̢̡͇̺̼͊͌͋̋̍̀̒̈́͋̕͝mblÿ̴̛́̄̚͝/̷̼̼̲̹̞͙͎̬͓͓̻͓̱̝̤̎̾"))
-						.isEqualTo("assignment_1_assembly");
+				.isEqualTo("assignment_1_assembly");
 	}
 
 }
diff --git a/src/test/java/nl/tudelft/submit/service/ModuleDivisionServiceSelfMockTest.java b/src/test/java/nl/tudelft/submit/service/ModuleDivisionServiceSelfMockTest.java
index 4a7fd4ea617cd082e284a3e0c637dcc4ceb66e00..b84541a909eae3d7f7af592d3d473acf830a91cb 100644
--- a/src/test/java/nl/tudelft/submit/service/ModuleDivisionServiceSelfMockTest.java
+++ b/src/test/java/nl/tudelft/submit/service/ModuleDivisionServiceSelfMockTest.java
@@ -21,14 +21,6 @@ import static org.mockito.Mockito.*;
 
 import java.util.List;
 
-import nl.tudelft.labracore.api.ModuleDivisionControllerApi;
-import nl.tudelft.labracore.api.dto.*;
-import nl.tudelft.submit.dto.create.DivisionsCreateTypeDTO;
-import nl.tudelft.submit.dto.create.ModuleDivisionImportDTO;
-import nl.tudelft.submit.enums.DivisionsCreateType;
-import nl.tudelft.submit.enums.DivisionsGenerateOrder;
-import nl.tudelft.submit.enums.DivisionsGenerateType;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.MockitoAnnotations;
@@ -37,6 +29,13 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 
 import application.test.TestSubmitApplication;
+import nl.tudelft.labracore.api.ModuleDivisionControllerApi;
+import nl.tudelft.labracore.api.dto.*;
+import nl.tudelft.submit.dto.create.DivisionsCreateTypeDTO;
+import nl.tudelft.submit.dto.create.ModuleDivisionImportDTO;
+import nl.tudelft.submit.enums.DivisionsCreateType;
+import nl.tudelft.submit.enums.DivisionsGenerateOrder;
+import nl.tudelft.submit.enums.DivisionsGenerateType;
 
 @SpringBootTest(classes = TestSubmitApplication.class)
 class ModuleDivisionServiceSelfMockTest {
diff --git a/src/test/java/nl/tudelft/submit/service/ModuleDivisionServiceTest.java b/src/test/java/nl/tudelft/submit/service/ModuleDivisionServiceTest.java
index deaba78f41246d719ce32958dd96cd25b767550b..74fd3927219ce868a77bdcb1e86773dc1334b1d4 100644
--- a/src/test/java/nl/tudelft/submit/service/ModuleDivisionServiceTest.java
+++ b/src/test/java/nl/tudelft/submit/service/ModuleDivisionServiceTest.java
@@ -23,12 +23,6 @@ import static org.mockito.Mockito.*;
 import java.util.ArrayList;
 import java.util.List;
 
-import nl.tudelft.labracore.api.ModuleDivisionControllerApi;
-import nl.tudelft.labracore.api.dto.*;
-import nl.tudelft.submit.dto.create.ModuleDivisionImportDTO;
-import nl.tudelft.submit.enums.DivisionsGenerateOrder;
-import nl.tudelft.submit.enums.DivisionsGenerateType;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -38,9 +32,14 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 
+import application.test.TestSubmitApplication;
+import nl.tudelft.labracore.api.ModuleDivisionControllerApi;
+import nl.tudelft.labracore.api.dto.*;
+import nl.tudelft.submit.dto.create.ModuleDivisionImportDTO;
+import nl.tudelft.submit.enums.DivisionsGenerateOrder;
+import nl.tudelft.submit.enums.DivisionsGenerateType;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
-import application.test.TestSubmitApplication;
 
 @SpringBootTest(classes = TestSubmitApplication.class)
 class ModuleDivisionServiceTest {
diff --git a/src/test/java/nl/tudelft/submit/service/ModuleServiceTest.java b/src/test/java/nl/tudelft/submit/service/ModuleServiceTest.java
index 19209a19de3e282ac1ca65beaeb4d07534aa4b3d..bd488342163c22b7e85474a9aadde8b4d527712e 100644
--- a/src/test/java/nl/tudelft/submit/service/ModuleServiceTest.java
+++ b/src/test/java/nl/tudelft/submit/service/ModuleServiceTest.java
@@ -24,6 +24,15 @@ import java.util.*;
 
 import javax.transaction.Transactional;
 
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+
+import application.test.TestSubmitApplication;
 import nl.tudelft.labracore.api.ModuleControllerApi;
 import nl.tudelft.labracore.api.dto.*;
 import nl.tudelft.labracore.lib.api.GradeScheme;
@@ -35,17 +44,7 @@ import nl.tudelft.submit.dto.view.GradingFormulaViewDTO;
 import nl.tudelft.submit.dto.view.labracore.SubmitModuleViewDTO;
 import nl.tudelft.submit.enums.DivisionsCreateType;
 import nl.tudelft.submit.model.grading.ModuleGradingFormula;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-
 import reactor.core.publisher.Mono;
-import application.test.TestSubmitApplication;
 
 @Transactional
 @SpringBootTest(classes = TestSubmitApplication.class)
diff --git a/src/test/java/nl/tudelft/submit/service/NoteServiceTest.java b/src/test/java/nl/tudelft/submit/service/NoteServiceTest.java
index 990f84b141a9953767d929ac304ccd80e9bc9559..075833d4978f5a03e76484c7881b12037c9d3d2a 100644
--- a/src/test/java/nl/tudelft/submit/service/NoteServiceTest.java
+++ b/src/test/java/nl/tudelft/submit/service/NoteServiceTest.java
@@ -21,6 +21,11 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 import javax.transaction.Transactional;
 
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import application.test.TestSubmitApplication;
 import nl.tudelft.labracore.api.dto.*;
 import nl.tudelft.submit.dto.create.note.AssignmentNoteCreateDTO;
 import nl.tudelft.submit.dto.create.note.GroupNoteCreateDTO;
@@ -39,12 +44,6 @@ import nl.tudelft.submit.repository.note.GroupNoteRepository;
 import nl.tudelft.submit.repository.note.RoleNoteRepository;
 import nl.tudelft.submit.repository.note.SubmissionNoteRepository;
 
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-
-import application.test.TestSubmitApplication;
-
 @Transactional
 @SpringBootTest(classes = TestSubmitApplication.class)
 class NoteServiceTest {
diff --git a/src/test/java/nl/tudelft/submit/service/NotificationServiceTest.java b/src/test/java/nl/tudelft/submit/service/NotificationServiceTest.java
index a0a79839266d5ec8b07cfe5145969f60b1c9c2a1..e0eae0a784070bef7d17ae779efbce9970f77df6 100644
--- a/src/test/java/nl/tudelft/submit/service/NotificationServiceTest.java
+++ b/src/test/java/nl/tudelft/submit/service/NotificationServiceTest.java
@@ -24,11 +24,6 @@ import static org.mockito.Mockito.when;
 
 import java.util.List;
 
-import nl.tudelft.submit.dto.create.NotificationCreateDTO;
-import nl.tudelft.submit.dto.view.NotificationViewDTO;
-import nl.tudelft.submit.model.Notification;
-import nl.tudelft.submit.repository.NotificationRepository;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.MockitoAnnotations;
@@ -37,6 +32,10 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 
 import application.test.TestSubmitApplication;
+import nl.tudelft.submit.dto.create.NotificationCreateDTO;
+import nl.tudelft.submit.dto.view.NotificationViewDTO;
+import nl.tudelft.submit.model.Notification;
+import nl.tudelft.submit.repository.NotificationRepository;
 
 @SpringBootTest(classes = TestSubmitApplication.class)
 public class NotificationServiceTest {
diff --git a/src/test/java/nl/tudelft/submit/service/PersonServiceTest.java b/src/test/java/nl/tudelft/submit/service/PersonServiceTest.java
index a3c2ee6e53f3c1b716ae7e9caff6dd53f7cf2ae9..d4f6afecfbf00c584e78846b17a5db9af1e8bada 100644
--- a/src/test/java/nl/tudelft/submit/service/PersonServiceTest.java
+++ b/src/test/java/nl/tudelft/submit/service/PersonServiceTest.java
@@ -24,18 +24,17 @@ import static org.mockito.MockitoAnnotations.initMocks;
 
 import java.util.List;
 
-import nl.tudelft.labracore.api.PersonControllerApi;
-import nl.tudelft.labracore.api.dto.*;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 
+import application.test.TestSubmitApplication;
+import nl.tudelft.labracore.api.PersonControllerApi;
+import nl.tudelft.labracore.api.dto.*;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
-import application.test.TestSubmitApplication;
 
 @SpringBootTest(classes = TestSubmitApplication.class)
 class PersonServiceTest {
diff --git a/src/test/java/nl/tudelft/submit/service/RoleServiceTest.java b/src/test/java/nl/tudelft/submit/service/RoleServiceTest.java
index a1ac2a8c070c0d57392753379b33c7cf954274fc..64539c73d350ba4cd3a5c51cad69c4f387a4edd0 100644
--- a/src/test/java/nl/tudelft/submit/service/RoleServiceTest.java
+++ b/src/test/java/nl/tudelft/submit/service/RoleServiceTest.java
@@ -28,6 +28,12 @@ import java.util.List;
 
 import javax.transaction.Transactional;
 
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+
+import application.test.TestSubmitApplication;
 import nl.tudelft.labracore.api.EditionControllerApi;
 import nl.tudelft.labracore.api.RoleControllerApi;
 import nl.tudelft.labracore.api.dto.*;
@@ -38,15 +44,8 @@ import nl.tudelft.submit.dto.view.labracore.MemberViewDTO;
 import nl.tudelft.submit.model.Signature;
 import nl.tudelft.submit.model.note.RoleNote;
 import nl.tudelft.submit.repository.note.RoleNoteRepository;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
-import application.test.TestSubmitApplication;
 
 @Transactional
 @SpringBootTest(classes = TestSubmitApplication.class)
diff --git a/src/test/java/nl/tudelft/submit/service/ScriptServiceTest.java b/src/test/java/nl/tudelft/submit/service/ScriptServiceTest.java
index 31d12b1d0143339d175ba0e52b0b8087a2a9a0fd..44b2874db3ca9a82ee5fc05afbdcd307a80c26cf 100644
--- a/src/test/java/nl/tudelft/submit/service/ScriptServiceTest.java
+++ b/src/test/java/nl/tudelft/submit/service/ScriptServiceTest.java
@@ -26,6 +26,14 @@ import java.util.Optional;
 
 import javax.transaction.Transactional;
 
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.modelmapper.ModelMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+
+import application.test.TestSubmitApplication;
 import nl.tudelft.labracore.lib.api.GradeScheme;
 import nl.tudelft.submit.dto.create.script.ScriptCreateDTO;
 import nl.tudelft.submit.dto.create.script.ScriptTrainCreateDTO;
@@ -50,15 +58,6 @@ import nl.tudelft.submit.repository.script.ScriptRepository;
 import nl.tudelft.submit.repository.script.ScriptTrainRepository;
 import nl.tudelft.submit.repository.script.ScriptWagonRepository;
 
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.modelmapper.ModelMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-
-import application.test.TestSubmitApplication;
-
 @Transactional
 @SpringBootTest(classes = TestSubmitApplication.class)
 class ScriptServiceTest {
diff --git a/src/test/java/nl/tudelft/submit/service/StatisticsServiceTest.java b/src/test/java/nl/tudelft/submit/service/StatisticsServiceTest.java
index 9d8662bff8582601d43b1b74395883f00dfa2134..f5210add2266ca9b5c80fa66f134419cfa3a4d3a 100644
--- a/src/test/java/nl/tudelft/submit/service/StatisticsServiceTest.java
+++ b/src/test/java/nl/tudelft/submit/service/StatisticsServiceTest.java
@@ -28,13 +28,6 @@ import java.util.stream.Stream;
 
 import javax.transaction.Transactional;
 
-import nl.tudelft.labracore.api.dto.*;
-import nl.tudelft.labracore.lib.api.GradeScheme;
-import nl.tudelft.submit.dto.view.labracore.SubmitSubmissionViewDTO;
-import nl.tudelft.submit.dto.view.statistics.*;
-import nl.tudelft.submit.model.SubmitEdition;
-import nl.tudelft.submit.model.grading.*;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.modelmapper.ModelMapper;
@@ -43,6 +36,12 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 
 import application.test.TestSubmitApplication;
+import nl.tudelft.labracore.api.dto.*;
+import nl.tudelft.labracore.lib.api.GradeScheme;
+import nl.tudelft.submit.dto.view.labracore.SubmitSubmissionViewDTO;
+import nl.tudelft.submit.dto.view.statistics.*;
+import nl.tudelft.submit.model.SubmitEdition;
+import nl.tudelft.submit.model.grading.*;
 
 @Transactional
 @SpringBootTest(classes = TestSubmitApplication.class)
diff --git a/src/test/java/nl/tudelft/submit/service/StudentGroupServiceTest.java b/src/test/java/nl/tudelft/submit/service/StudentGroupServiceTest.java
index 32786a31c061f9bb153d27c6a8ad32ebb7f38aa1..16c8ffbece9cf15d15ce1dd12951bd4cf1648382 100644
--- a/src/test/java/nl/tudelft/submit/service/StudentGroupServiceTest.java
+++ b/src/test/java/nl/tudelft/submit/service/StudentGroupServiceTest.java
@@ -28,6 +28,13 @@ import java.util.*;
 
 import javax.transaction.Transactional;
 
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+
+import application.test.TestSubmitApplication;
 import nl.tudelft.labracore.api.StudentGroupControllerApi;
 import nl.tudelft.labracore.api.dto.*;
 import nl.tudelft.librador.dto.view.View;
@@ -41,16 +48,8 @@ import nl.tudelft.submit.model.*;
 import nl.tudelft.submit.model.note.GroupNote;
 import nl.tudelft.submit.repository.SwitchEventRepository;
 import nl.tudelft.submit.repository.note.GroupNoteRepository;
-
-import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
-import application.test.TestSubmitApplication;
 
 @Transactional
 @SpringBootTest(classes = TestSubmitApplication.class)
diff --git a/src/test/java/nl/tudelft/submit/service/SubmissionServiceTest.java b/src/test/java/nl/tudelft/submit/service/SubmissionServiceTest.java
index 0fd529bd968245f430e3b13948f7f4c962a06efe..c8bffb215c4d56f872f94c45d3d04f2355e29341 100644
--- a/src/test/java/nl/tudelft/submit/service/SubmissionServiceTest.java
+++ b/src/test/java/nl/tudelft/submit/service/SubmissionServiceTest.java
@@ -30,13 +30,6 @@ import java.util.Optional;
 
 import javax.transaction.Transactional;
 
-import nl.tudelft.labracore.api.SubmissionControllerApi;
-import nl.tudelft.labracore.api.dto.*;
-import nl.tudelft.submit.cache.SubmissionCacheManager;
-import nl.tudelft.submit.dto.create.SubmissionDownloadConfigCreateDTO;
-import nl.tudelft.submit.enums.SubmissionDownloadPreference;
-import nl.tudelft.submit.repository.SubmitSubmissionRepository;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,9 +37,15 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 
+import application.test.TestSubmitApplication;
+import nl.tudelft.labracore.api.SubmissionControllerApi;
+import nl.tudelft.labracore.api.dto.*;
+import nl.tudelft.submit.cache.SubmissionCacheManager;
+import nl.tudelft.submit.dto.create.SubmissionDownloadConfigCreateDTO;
+import nl.tudelft.submit.enums.SubmissionDownloadPreference;
+import nl.tudelft.submit.repository.SubmitSubmissionRepository;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
-import application.test.TestSubmitApplication;
 
 @Transactional
 @SpringBootTest(classes = TestSubmitApplication.class)
diff --git a/src/test/java/nl/tudelft/submit/service/SubmitGroupServiceTest.java b/src/test/java/nl/tudelft/submit/service/SubmitGroupServiceTest.java
index 849976244a13b256d57e3213c30638a5f56241f7..6532aa48d65ebebff7800741657f6785bb378c40 100644
--- a/src/test/java/nl/tudelft/submit/service/SubmitGroupServiceTest.java
+++ b/src/test/java/nl/tudelft/submit/service/SubmitGroupServiceTest.java
@@ -24,15 +24,14 @@ import java.util.Optional;
 
 import javax.transaction.Transactional;
 
-import nl.tudelft.submit.model.SubmitGroup;
-import nl.tudelft.submit.repository.SubmitGroupRepository;
-
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 
 import application.test.TestSubmitApplication;
+import nl.tudelft.submit.model.SubmitGroup;
+import nl.tudelft.submit.repository.SubmitGroupRepository;
 
 @Transactional
 @SpringBootTest(classes = TestSubmitApplication.class)
diff --git a/src/test/java/nl/tudelft/submit/service/TemplateServiceTest.java b/src/test/java/nl/tudelft/submit/service/TemplateServiceTest.java
index a9aa570f55e33350ff657b89a234f23285309dbc..8ecd4751f0bf8f68724a6bde8185410edf752161 100644
--- a/src/test/java/nl/tudelft/submit/service/TemplateServiceTest.java
+++ b/src/test/java/nl/tudelft/submit/service/TemplateServiceTest.java
@@ -23,13 +23,12 @@ import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import lombok.Data;
-
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
 import application.test.TestSubmitApplication;
+import lombok.Data;
 
 @SpringBootTest(classes = TestSubmitApplication.class)
 public class TemplateServiceTest {
diff --git a/src/test/java/nl/tudelft/submit/service/UserSettingsServiceTest.java b/src/test/java/nl/tudelft/submit/service/UserSettingsServiceTest.java
index 106d4bdbc4ca2ac8fc220bbbf82ca2f8f71f1ea3..0ae4dba9fbd7f514c43ae90ca629a6aa8d91d595 100644
--- a/src/test/java/nl/tudelft/submit/service/UserSettingsServiceTest.java
+++ b/src/test/java/nl/tudelft/submit/service/UserSettingsServiceTest.java
@@ -23,17 +23,16 @@ import java.util.List;
 
 import javax.transaction.Transactional;
 
-import nl.tudelft.labracore.api.dto.*;
-import nl.tudelft.submit.dto.patch.UserSettingsPatchDTO;
-import nl.tudelft.submit.enums.NotificationPreference;
-import nl.tudelft.submit.model.UserSettings;
-import nl.tudelft.submit.repository.UserSettingsRepository;
-
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
 import application.test.TestSubmitApplication;
+import nl.tudelft.labracore.api.dto.*;
+import nl.tudelft.submit.dto.patch.UserSettingsPatchDTO;
+import nl.tudelft.submit.enums.NotificationPreference;
+import nl.tudelft.submit.model.UserSettings;
+import nl.tudelft.submit.repository.UserSettingsRepository;
 
 @Transactional
 @SpringBootTest(classes = TestSubmitApplication.class)
diff --git a/src/test/java/nl/tudelft/submit/service/VersionServiceTest.java b/src/test/java/nl/tudelft/submit/service/VersionServiceTest.java
index 46c7887571e87805d5868e59af77ff4262ecb568..70dccb9b5908eec7c880b9f3225ffc1e18264cab 100644
--- a/src/test/java/nl/tudelft/submit/service/VersionServiceTest.java
+++ b/src/test/java/nl/tudelft/submit/service/VersionServiceTest.java
@@ -28,6 +28,12 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Optional;
 
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+
+import application.test.TestSubmitApplication;
 import nl.tudelft.labracore.api.dto.*;
 import nl.tudelft.submit.dto.create.VersionCreateDTO;
 import nl.tudelft.submit.dto.id.SubmitGroupIdDTO;
@@ -41,13 +47,6 @@ import nl.tudelft.submit.repository.SubmitGroupRepository;
 import nl.tudelft.submit.repository.VersionRepository;
 import nl.tudelft.submit.repository.script.ScriptTrainRepository;
 
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-
-import application.test.TestSubmitApplication;
-
 @SpringBootTest(classes = TestSubmitApplication.class)
 class VersionServiceTest {
 
@@ -158,7 +157,7 @@ class VersionServiceTest {
 
 		when(versionRepository.findByAssignmentIdAndGroupsContains(ASSIGNMENT_ID,
 				group))
-						.thenReturn(Optional.of(VERSION));
+				.thenReturn(Optional.of(VERSION));
 
 		assertThat(versionService.getVersionOfAssignmentForGroup(ASSIGNMENT_ID, GROUP_ID))
 				.isEqualTo(VERSION_VIEW);
diff --git a/src/test/java/nl/tudelft/submit/service/grading/EditionFormulaServiceTest.java b/src/test/java/nl/tudelft/submit/service/grading/EditionFormulaServiceTest.java
index a638ab0690d2ff554b1323bd751da08f1db54e18..d156a21c75b6f6ce381c5fc7d7b91c6e4c8a9212 100644
--- a/src/test/java/nl/tudelft/submit/service/grading/EditionFormulaServiceTest.java
+++ b/src/test/java/nl/tudelft/submit/service/grading/EditionFormulaServiceTest.java
@@ -23,6 +23,13 @@ import java.util.Optional;
 
 import javax.transaction.Transactional;
 
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+
+import application.test.TestSubmitApplication;
 import nl.tudelft.labracore.api.dto.EditionIdDTO;
 import nl.tudelft.labracore.lib.api.GradeScheme;
 import nl.tudelft.submit.dto.create.grading.GradingFormulaCreateDTO;
@@ -32,14 +39,6 @@ import nl.tudelft.submit.repository.grading.EditionGradingFormulaRepository;
 import nl.tudelft.submit.service.FormulaService;
 import nl.tudelft.submit.service.GradeService;
 
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-
-import application.test.TestSubmitApplication;
-
 @Transactional
 @SpringBootTest(classes = TestSubmitApplication.class)
 public class EditionFormulaServiceTest {
diff --git a/src/test/java/nl/tudelft/submit/service/grading/FormulaServiceTest.java b/src/test/java/nl/tudelft/submit/service/grading/FormulaServiceTest.java
index 515b6719ed94ad93202afca2e54ec45928a0b42d..b20f77423d3aba40ce0bdda1ee0713e5a816355a 100644
--- a/src/test/java/nl/tudelft/submit/service/grading/FormulaServiceTest.java
+++ b/src/test/java/nl/tudelft/submit/service/grading/FormulaServiceTest.java
@@ -24,14 +24,6 @@ import java.util.List;
 
 import javax.transaction.Transactional;
 
-import nl.tudelft.labracore.lib.api.GradeScheme;
-import nl.tudelft.submit.dto.helper.Expression;
-import nl.tudelft.submit.dto.patch.grading.GradingFormulaPatchDTO;
-import nl.tudelft.submit.exception.InvalidFormulaException;
-import nl.tudelft.submit.model.grading.CalculatedScore;
-import nl.tudelft.submit.model.grading.GradingFormula;
-import nl.tudelft.submit.service.FormulaService;
-
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -39,6 +31,13 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
 import application.test.TestSubmitApplication;
+import nl.tudelft.labracore.lib.api.GradeScheme;
+import nl.tudelft.submit.dto.helper.Expression;
+import nl.tudelft.submit.dto.patch.grading.GradingFormulaPatchDTO;
+import nl.tudelft.submit.exception.InvalidFormulaException;
+import nl.tudelft.submit.model.grading.CalculatedScore;
+import nl.tudelft.submit.model.grading.GradingFormula;
+import nl.tudelft.submit.service.FormulaService;
 
 @Transactional
 @SpringBootTest(classes = TestSubmitApplication.class)
diff --git a/src/test/java/nl/tudelft/submit/service/grading/GradeServiceTest.java b/src/test/java/nl/tudelft/submit/service/grading/GradeServiceTest.java
index ff9e7033c801bd130fbd101dfeba5fcb64b8f26d..cf77edca53a8ddfaefc678798073f83c1f4a8030 100644
--- a/src/test/java/nl/tudelft/submit/service/grading/GradeServiceTest.java
+++ b/src/test/java/nl/tudelft/submit/service/grading/GradeServiceTest.java
@@ -34,6 +34,15 @@ import java.util.Optional;
 
 import javax.transaction.Transactional;
 
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
+import org.modelmapper.ModelMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+
+import application.test.TestSubmitApplication;
 import nl.tudelft.labracore.api.EditionControllerApi;
 import nl.tudelft.labracore.api.GradeControllerApi;
 import nl.tudelft.labracore.api.PersonControllerApi;
@@ -52,18 +61,8 @@ import nl.tudelft.submit.repository.grading.EditionCalculatedScoreRepository;
 import nl.tudelft.submit.repository.grading.ModuleGradingFormulaRepository;
 import nl.tudelft.submit.service.FormulaService;
 import nl.tudelft.submit.service.GradeService;
-
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.CsvSource;
-import org.modelmapper.ModelMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
-import application.test.TestSubmitApplication;
 
 @Transactional
 @SpringBootTest(classes = TestSubmitApplication.class)
@@ -125,8 +124,8 @@ public class GradeServiceTest {
 		assertThat(
 				gradeService.executeFormula(createModuleFormula("1.0 + 2.0", GradeScheme.DUTCH_GRADE),
 						emptyMap()))
-								.isPresent()
-								.contains(expected);
+				.isPresent()
+				.contains(expected);
 	}
 
 	@Test
@@ -135,14 +134,14 @@ public class GradeServiceTest {
 				gradeService.executeFormula(
 						createModuleFormula("sum([i for i in range(0, 10)])", GradeScheme.DUTCH_GRADE),
 						emptyMap()))
-								.isNotPresent();
+				.isNotPresent();
 	}
 
 	@Test
 	public void executeFormulaNoValueOnFail() {
 		assertThat(gradeService.executeFormula(createModuleFormula("x", GradeScheme.DUTCH_GRADE),
 				emptyMap()))
-						.isNotPresent();
+				.isNotPresent();
 	}
 
 	@Test
@@ -197,14 +196,14 @@ public class GradeServiceTest {
 	public void convertToScoreInvalidPass() {
 		assertThat(
 				gradeService.convertToScore(createModuleFormula("", GradeScheme.DUTCH_GRADE), "PASSED"))
-						.isNull();
+				.isNull();
 	}
 
 	@Test
 	public void convertToScoreInvalidFail() {
 		assertThat(
 				gradeService.convertToScore(createModuleFormula("", GradeScheme.DUTCH_GRADE), "FAILED"))
-						.isNull();
+				.isNull();
 	}
 
 	@Test
@@ -258,7 +257,8 @@ public class GradeServiceTest {
 		assertThat(
 				gradeService.getScoreDisplayString(
 						ModuleCalculatedScore.builder().type(GradeScheme.DUTCH_GRADE).score(5.75)
-								.build())).isEqualTo("5.8");
+								.build()))
+				.isEqualTo("5.8");
 	}
 
 	@Test
@@ -266,7 +266,8 @@ public class GradeServiceTest {
 		assertThat(gradeService
 				.getScoreDisplayString(
 						ModuleCalculatedScore.builder().type(GradeScheme.UNLIMITED).score(1012.0)
-								.build())).isEqualTo("1012");
+								.build()))
+				.isEqualTo("1012");
 	}
 
 	@Test
@@ -274,7 +275,8 @@ public class GradeServiceTest {
 		assertThat(gradeService
 				.getScoreDisplayString(
 						ModuleCalculatedScore.builder().type(GradeScheme.PASS_FAIL).score(1.0)
-								.build())).isEqualTo("Passed");
+								.build()))
+				.isEqualTo("Passed");
 	}
 
 	@Test
@@ -282,7 +284,8 @@ public class GradeServiceTest {
 		assertThat(gradeService
 				.getScoreDisplayString(
 						ModuleCalculatedScore.builder().type(GradeScheme.PASS_FAIL).score(0.0)
-								.build())).isEqualTo("Failed");
+								.build()))
+				.isEqualTo("Failed");
 	}
 
 	@Test
@@ -291,7 +294,7 @@ public class GradeServiceTest {
 				gradeService.getScoreDisplayString(
 						new GradeSummaryDTO().isScriptGraded(false)
 								.scheme(GradeSummaryDTO.SchemeEnum.DUTCH_GRADE).score(58)))
-										.isEqualTo("5.8");
+				.isEqualTo("5.8");
 	}
 
 	@Test
@@ -300,7 +303,7 @@ public class GradeServiceTest {
 				.getScoreDisplayString(
 						new GradeSummaryDTO().isScriptGraded(false)
 								.scheme(GradeSummaryDTO.SchemeEnum.UNLIMITED).score(1012)))
-										.isEqualTo("1012");
+				.isEqualTo("1012");
 	}
 
 	@Test
@@ -309,7 +312,7 @@ public class GradeServiceTest {
 				.getScoreDisplayString(
 						new GradeSummaryDTO().isScriptGraded(false)
 								.scheme(GradeSummaryDTO.SchemeEnum.PASS_FAIL).score(1)))
-										.isEqualTo("Passed");
+				.isEqualTo("Passed");
 	}
 
 	@Test
@@ -318,7 +321,7 @@ public class GradeServiceTest {
 				.getScoreDisplayString(
 						new GradeSummaryDTO().isScriptGraded(false)
 								.scheme(GradeSummaryDTO.SchemeEnum.PASS_FAIL).score(0)))
-										.isEqualTo("Failed");
+				.isEqualTo("Failed");
 	}
 
 	@Test
@@ -327,7 +330,7 @@ public class GradeServiceTest {
 				.getScoreDisplayString(
 						new GradeSummaryDTO().isScriptGraded(true)
 								.scheme(GradeSummaryDTO.SchemeEnum.PASS_FAIL).score(0)))
-										.isEqualTo("Failed (Script)");
+				.isEqualTo("Failed (Script)");
 	}
 
 	@Test
@@ -418,8 +421,8 @@ public class GradeServiceTest {
 				new SubmissionDetailsDTO().submissionTime(LocalDateTime.of(2020, 1, 2, 0, 0))
 						.grades(List.of(new GradeSummaryDTO().score(2).isScriptGraded(false),
 								new GradeSummaryDTO().score(5).isScriptGraded(false))))))
-										.isPresent()
-										.contains(new GradeSummaryDTO().isScriptGraded(false).score(5));
+				.isPresent()
+				.contains(new GradeSummaryDTO().isScriptGraded(false).score(5));
 	}
 
 	@Test
@@ -430,8 +433,8 @@ public class GradeServiceTest {
 				new SubmissionDetailsDTO().submissionTime(LocalDateTime.of(2020, 1, 2, 0, 0))
 						.grades(List.of(new GradeSummaryDTO().score(2).isScriptGraded(false),
 								new GradeSummaryDTO().score(5).isScriptGraded(true))))))
-										.isPresent()
-										.contains(new GradeSummaryDTO().isScriptGraded(false).score(2));
+				.isPresent()
+				.contains(new GradeSummaryDTO().isScriptGraded(false).score(2));
 	}
 
 	@ParameterizedTest
diff --git a/src/test/java/nl/tudelft/submit/service/grading/ModuleFormulaServiceTest.java b/src/test/java/nl/tudelft/submit/service/grading/ModuleFormulaServiceTest.java
index 5c58ef2b395aabd6a6e68e6cdb5adf5368119962..8b137f8f29ae7f0100c63f80760fc95eaa277fab 100644
--- a/src/test/java/nl/tudelft/submit/service/grading/ModuleFormulaServiceTest.java
+++ b/src/test/java/nl/tudelft/submit/service/grading/ModuleFormulaServiceTest.java
@@ -23,6 +23,13 @@ import java.util.Optional;
 
 import javax.transaction.Transactional;
 
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+
+import application.test.TestSubmitApplication;
 import nl.tudelft.labracore.api.dto.ModuleIdDTO;
 import nl.tudelft.labracore.lib.api.GradeScheme;
 import nl.tudelft.submit.dto.create.grading.GradingFormulaCreateDTO;
@@ -32,14 +39,6 @@ import nl.tudelft.submit.repository.grading.ModuleGradingFormulaRepository;
 import nl.tudelft.submit.service.FormulaService;
 import nl.tudelft.submit.service.GradeService;
 
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-
-import application.test.TestSubmitApplication;
-
 @Transactional
 @SpringBootTest(classes = TestSubmitApplication.class)
 public class ModuleFormulaServiceTest {
diff --git a/src/test/java/nl/tudelft/submit/service/grading/ModuleGradingTest.java b/src/test/java/nl/tudelft/submit/service/grading/ModuleGradingTest.java
index b06207bf299cd2ed8372deee1c5a6bdc147c3c49..0789f9ed5c74128c79124e74ab3f684fb46f5fca 100644
--- a/src/test/java/nl/tudelft/submit/service/grading/ModuleGradingTest.java
+++ b/src/test/java/nl/tudelft/submit/service/grading/ModuleGradingTest.java
@@ -28,6 +28,14 @@ import java.util.Optional;
 
 import javax.transaction.Transactional;
 
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+
+import application.test.TestSubmitApplication;
 import nl.tudelft.labracore.api.*;
 import nl.tudelft.labracore.api.dto.*;
 import nl.tudelft.labracore.lib.api.GradeScheme;
@@ -46,17 +54,8 @@ import nl.tudelft.submit.repository.SwitchEventRepository;
 import nl.tudelft.submit.repository.grading.ModuleCalculatedScoreRepository;
 import nl.tudelft.submit.repository.grading.ModuleGradingFormulaRepository;
 import nl.tudelft.submit.service.*;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.mockito.ArgumentCaptor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
-import application.test.TestSubmitApplication;
 
 @Transactional
 @SpringBootTest(classes = TestSubmitApplication.class)
diff --git a/src/test/java/nl/tudelft/submit/test/TestConfig.java b/src/test/java/nl/tudelft/submit/test/TestConfig.java
index 655606f5c9059b27d4751bf5fbfb1d66cbb5fcc5..9777561d78d8f99859560a64a48babab94eb7d54 100644
--- a/src/test/java/nl/tudelft/submit/test/TestConfig.java
+++ b/src/test/java/nl/tudelft/submit/test/TestConfig.java
@@ -17,12 +17,12 @@
  */
 package nl.tudelft.submit.test;
 
-import nl.tudelft.labracore.api.*;
-
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.mail.javamail.JavaMailSender;
 
+import nl.tudelft.labracore.api.*;
+
 @Configuration
 public class TestConfig {
 
diff --git a/src/test/java/nl/tudelft/submit/test/TestUserDetailsService.java b/src/test/java/nl/tudelft/submit/test/TestUserDetailsService.java
index 86c672c97bedd0f99d1dc1ea381d9dc3d5665a44..75e48157623186b2d99ff128c913b9d3d34cb708 100644
--- a/src/test/java/nl/tudelft/submit/test/TestUserDetailsService.java
+++ b/src/test/java/nl/tudelft/submit/test/TestUserDetailsService.java
@@ -17,17 +17,17 @@
  */
 package nl.tudelft.submit.test;
 
-import nl.tudelft.labracore.api.dto.Id;
-import nl.tudelft.labracore.lib.security.LabradorUserDetails;
-import nl.tudelft.labracore.lib.security.user.DefaultRole;
-import nl.tudelft.labracore.lib.security.user.Person;
-
 import org.springframework.context.annotation.Primary;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
 
+import nl.tudelft.labracore.api.dto.Id;
+import nl.tudelft.labracore.lib.security.LabradorUserDetails;
+import nl.tudelft.labracore.lib.security.user.DefaultRole;
+import nl.tudelft.labracore.lib.security.user.Person;
+
 @Primary
 @Service
 public class TestUserDetailsService implements UserDetailsService {