diff --git a/data/datacreator.ts b/data/datacreator.ts
index a6aa8de1c1..1b09ad0c6c 100644
--- a/data/datacreator.ts
+++ b/data/datacreator.ts
@@ -202,7 +202,7 @@ async function createRandomFakeUsers () {
     return text
   }
 
-  return Promise.all(new Array(config.get('application.numberOfRandomFakeUsers')).fill(0).map(
+  return await Promise.all(new Array(config.get('application.numberOfRandomFakeUsers')).fill(0).map(
     () => models.User.create({
       email: getGeneratedRandomFakeUserEmail(),
       password: makeRandomString(5)
@@ -258,7 +258,7 @@ async function createMemories () {
     })
   ]
 
-  return Promise.all(memories)
+  return await Promise.all(memories)
 }
 
 async function createProducts () {
@@ -305,7 +305,7 @@ async function createProducts () {
   }
   datacache.retrieveBlueprintChallengeFile = blueprint
 
-  return Promise.all(
+  return await Promise.all(
     products.map(
       ({ reviews = [], useForChristmasSpecialChallenge = false, urlForProductTamperingChallenge = false, fileForRetrieveBlueprintChallenge = false, ...product }) =>
         models.Product.create(product).catch(
diff --git a/lib/antiCheat.ts b/lib/antiCheat.ts
index 46829fea55..c99bf08fca 100644
--- a/lib/antiCheat.ts
+++ b/lib/antiCheat.ts
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: MIT
  */
 
+import config = require('config')
 const colors = require('colors/safe')
 const logger = require('./logger')
-import config = require('config')
 
 const coupledChallenges = { // TODO prevent also near-identical challenges (e.g. all null byte file access or dom xss + bonus payload etc.) from counting as cheating
   loginAdminChallenge: ['weakPasswordChallenge'],
diff --git a/lib/startup/registerWebsocketEvents.ts b/lib/startup/registerWebsocketEvents.ts
index a9ea7bef76..df50919f40 100644
--- a/lib/startup/registerWebsocketEvents.ts
+++ b/lib/startup/registerWebsocketEvents.ts
@@ -3,11 +3,11 @@
  * SPDX-License-Identifier: MIT
  */
 
+import config = require('config')
 const notifications = require('../../data/datacache').notifications
 const utils = require('../utils')
 const security = require('../insecurity')
 const challenges = require('../../data/datacache').challenges
-import config = require('config')
 let firstConnectedSocket = null
 
 const registerWebsocketEvents = (server) => {
diff --git a/lib/startup/validateDependencies.ts b/lib/startup/validateDependencies.ts
index e3a3764227..1936f22249 100644
--- a/lib/startup/validateDependencies.ts
+++ b/lib/startup/validateDependencies.ts
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: MIT
  */
 
+import colors = require('colors/safe')
 try {
   require('check-dependencies')
 } catch (err) {
@@ -10,7 +11,6 @@ try {
   process.exit(1)
 }
 const logger = require('../logger')
-import colors = require('colors/safe')
 const dependencyChecker = require('check-dependencies')
 
 const validateDependencies = async ({ packageDir = '.', exitOnFailure = true } = {}) => {
diff --git a/models/feedback.ts b/models/feedback.ts
index 4e36912067..ba03081ed9 100644
--- a/models/feedback.ts
+++ b/models/feedback.ts
@@ -4,8 +4,8 @@
  */
 
 /* jslint node: true */
-const security = require('../lib/insecurity')
 import utils = require('../lib/utils')
+const security = require('../lib/insecurity')
 const challenges = require('../data/datacache').challenges
 
 module.exports = (sequelize, { STRING, INTEGER }) => {
diff --git a/models/user.ts b/models/user.ts
index 10399e33a2..10084628dd 100644
--- a/models/user.ts
+++ b/models/user.ts
@@ -4,10 +4,10 @@
  */
 
 /* jslint node: true */
+import config = require('config')
 const security = require('../lib/insecurity')
 const utils = require('../lib/utils')
 const challenges = require('../data/datacache').challenges
-import config = require('config')
 
 module.exports = (sequelize, { STRING, BOOLEAN }) => {
   const User = sequelize.define('User', {
diff --git a/package.json b/package.json
index 03680ed9d1..68bb0d3a71 100644
--- a/package.json
+++ b/package.json
@@ -159,7 +159,7 @@
     "notevil": "^1.3.3",
     "on-finished": "^2.3.0",
     "otplib": "^12.0.1",
-    "pdfkit": "^0.11.0",
+    "pdfkit": "^0.12.3",
     "portscanner": "^2.2.0",
     "prom-client": "^12.0.0",
     "pug": "^3.0.0",
diff --git a/routes/2fa.ts b/routes/2fa.ts
index b6bd66a14d..df0a43ff4a 100644
--- a/routes/2fa.ts
+++ b/routes/2fa.ts
@@ -3,12 +3,12 @@
  * SPDX-License-Identifier: MIT
  */
 
+import config = require('config')
 const security = require('../lib/insecurity')
 const models = require('../models/index')
 const otplib = require('otplib')
 const utils = require('../lib/utils')
 const challenges = require('../data/datacache').challenges
-import config = require('config')
 
 otplib.authenticator.options = {
   // Accepts tokens as valid even when they are 30sec to old or to new
diff --git a/routes/appVersion.ts b/routes/appVersion.ts
index 28f318c609..5fb850d618 100644
--- a/routes/appVersion.ts
+++ b/routes/appVersion.ts
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: MIT
  */
 
-const utils = require('../lib/utils')
 import config = require('config')
+const utils = require('../lib/utils')
 
 module.exports = function retrieveAppVersion () {
   return (req, res) => {
diff --git a/routes/authenticatedUsers.ts b/routes/authenticatedUsers.ts
index 4cfec09e7b..a1ec00f54b 100644
--- a/routes/authenticatedUsers.ts
+++ b/routes/authenticatedUsers.ts
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: MIT
  */
 
+import models = require('../models/index')
 const utils = require('../lib/utils')
 const security = require('../lib/insecurity')
-import models = require('../models/index')
 
 module.exports = function retrieveUserList () {
   return (req, res, next) => {
diff --git a/routes/b2bOrder.ts b/routes/b2bOrder.ts
index fd4eb0f32c..ac353a6b32 100644
--- a/routes/b2bOrder.ts
+++ b/routes/b2bOrder.ts
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: MIT
  */
 
+import vm = require('vm')
 const utils = require('../lib/utils')
 const security = require('../lib/insecurity')
 const safeEval = require('notevil')
-import vm = require('vm')
 const challenges = require('../data/datacache').challenges
 
 module.exports = function b2bOrder () {
diff --git a/routes/basket.ts b/routes/basket.ts
index 6b40bcbd8e..4e1faa1da3 100644
--- a/routes/basket.ts
+++ b/routes/basket.ts
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: MIT
  */
 
+import models = require('../models/index')
 const utils = require('../lib/utils')
 const security = require('../lib/insecurity')
-import models = require('../models/index')
 const challenges = require('../data/datacache').challenges
 
 module.exports = function retrieveBasket () {
diff --git a/routes/basketItems.ts b/routes/basketItems.ts
index b319552ece..56733f4de7 100644
--- a/routes/basketItems.ts
+++ b/routes/basketItems.ts
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: MIT
  */
 
+import models = require('../models/index')
 const utils = require('../lib/utils')
 const challenges = require('../data/datacache').challenges
 const security = require('../lib/insecurity')
-import models = require('../models/index')
 
 module.exports.addBasketItem = function addBasketItem () {
   return (req, res, next) => {
diff --git a/routes/changePassword.ts b/routes/changePassword.ts
index 8b6dd783c7..080d837389 100644
--- a/routes/changePassword.ts
+++ b/routes/changePassword.ts
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: MIT
  */
 
+import models = require('../models/index')
 const utils = require('../lib/utils')
 const security = require('../lib/insecurity')
-import models = require('../models/index')
 const cache = require('../data/datacache')
 const challenges = cache.challenges
 
diff --git a/routes/chatbot.ts b/routes/chatbot.ts
index cbef724786..d19053a3da 100644
--- a/routes/chatbot.ts
+++ b/routes/chatbot.ts
@@ -3,13 +3,13 @@
  * SPDX-License-Identifier: MIT
  */
 
+import fs = require('fs')
 const { Bot } = require('juicy-chat-bot')
 const security = require('../lib/insecurity')
 const jwt = require('jsonwebtoken')
 const utils = require('../lib/utils')
 const botUtils = require('../lib/botUtils')
 const config = require('config')
-import fs = require('fs')
 const download = require('download')
 const models = require('../models/index')
 const challenges = require('../data/datacache').challenges
diff --git a/routes/coupon.ts b/routes/coupon.ts
index 6a638ec558..f5c6474aac 100644
--- a/routes/coupon.ts
+++ b/routes/coupon.ts
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: MIT
  */
 
-const security = require('../lib/insecurity')
 import models = require('../models/index')
+const security = require('../lib/insecurity')
 
 module.exports = function applyCoupon () {
   return ({ params }, res, next) => {
diff --git a/routes/currentUser.ts b/routes/currentUser.ts
index 4acf847464..16906e7f39 100644
--- a/routes/currentUser.ts
+++ b/routes/currentUser.ts
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: MIT
  */
 
-const security = require('../lib/insecurity')
 import utils = require('../lib/utils')
+const security = require('../lib/insecurity')
 const cache = require('../data/datacache')
 const challenges = cache.challenges
 
diff --git a/routes/dataExport.ts b/routes/dataExport.ts
index 82c5d76b4a..3316a4754e 100644
--- a/routes/dataExport.ts
+++ b/routes/dataExport.ts
@@ -3,11 +3,11 @@
  * SPDX-License-Identifier: MIT
  */
 
+import models = require('../models/index')
 const utils = require('../lib/utils')
 const security = require('../lib/insecurity')
 const db = require('../data/mongodb')
 const challenges = require('../data/datacache').challenges
-import models = require('../models/index')
 
 module.exports = function dataExport () {
   return async (req, res, next) => {
diff --git a/routes/fileUpload.ts b/routes/fileUpload.ts
index 51ee563ce5..acbd94f61d 100644
--- a/routes/fileUpload.ts
+++ b/routes/fileUpload.ts
@@ -3,12 +3,12 @@
  * SPDX-License-Identifier: MIT
  */
 
+import fs = require('fs')
 const utils = require('../lib/utils')
 const challenges = require('../data/datacache').challenges
 const libxml = require('libxmljs2')
 const os = require('os')
 const vm = require('vm')
-import fs = require('fs')
 const unzipper = require('unzipper')
 const path = require('path')
 
diff --git a/routes/imageCaptcha.ts b/routes/imageCaptcha.ts
index 5e852ea722..fc40013d32 100644
--- a/routes/imageCaptcha.ts
+++ b/routes/imageCaptcha.ts
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: MIT
  */
 
-const svgCaptcha = require('svg-captcha')
 import models = require('../models/index')
+const svgCaptcha = require('svg-captcha')
 const Op = models.Sequelize.Op
 const security = require('../lib/insecurity')
 
diff --git a/routes/login.ts b/routes/login.ts
index 2801350481..7df1990bd1 100644
--- a/routes/login.ts
+++ b/routes/login.ts
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: MIT
  */
 
+import models = require('../models/index')
 const utils = require('../lib/utils')
 const security = require('../lib/insecurity')
-import models = require('../models/index')
 const challenges = require('../data/datacache').challenges
 const users = require('../data/datacache').users
 const config = require('config')
diff --git a/routes/metrics.ts b/routes/metrics.ts
index 07de001a97..ff55fcb119 100644
--- a/routes/metrics.ts
+++ b/routes/metrics.ts
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: MIT
  */
 
+import models = require('../models/index')
 const Prometheus = require('prom-client')
 const onFinished = require('on-finished')
 const orders = require('../data/mongodb').orders
@@ -11,7 +12,6 @@ const challenges = require('../data/datacache').challenges
 const utils = require('../lib/utils')
 const antiCheat = require('../lib/antiCheat')
 const config = require('config')
-import models = require('../models/index')
 const Op = models.Sequelize.Op
 
 const register = Prometheus.register
diff --git a/routes/orderHistory.ts b/routes/orderHistory.ts
index f8838467dc..852516fef6 100644
--- a/routes/orderHistory.ts
+++ b/routes/orderHistory.ts
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: MIT
  */
 
-const security = require('../lib/insecurity')
 import db = require('../data/mongodb')
+const security = require('../lib/insecurity')
 
 module.exports.orderHistory = function orderHistory () {
   return async (req, res, next) => {
diff --git a/routes/profileImageFileUpload.ts b/routes/profileImageFileUpload.ts
index 13bc3a145d..2ff9e8bc19 100644
--- a/routes/profileImageFileUpload.ts
+++ b/routes/profileImageFileUpload.ts
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: MIT
  */
 
-const utils = require('../lib/utils')
 import fs = require('fs')
+const utils = require('../lib/utils')
 const models = require('../models/index')
 const security = require('../lib/insecurity')
 const logger = require('../lib/logger')
diff --git a/routes/resetPassword.ts b/routes/resetPassword.ts
index 43e81677a7..fd2750055c 100644
--- a/routes/resetPassword.ts
+++ b/routes/resetPassword.ts
@@ -3,12 +3,12 @@
  * SPDX-License-Identifier: MIT
  */
 
+import config = require('config')
 const utils = require('../lib/utils')
 const challenges = require('../data/datacache').challenges
 const users = require('../data/datacache').users
 const security = require('../lib/insecurity')
 const models = require('../models/index')
-import config = require('config')
 
 module.exports = function resetPassword () {
   return ({ body, connection }, res, next) => {
diff --git a/routes/saveLoginIp.ts b/routes/saveLoginIp.ts
index ca6e02b23c..d50951991b 100644
--- a/routes/saveLoginIp.ts
+++ b/routes/saveLoginIp.ts
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: MIT
  */
 
+import models = require('../models/index')
 const utils = require('../lib/utils')
 const security = require('../lib/insecurity')
-import models = require('../models/index')
 const cache = require('../data/datacache')
 const challenges = cache.challenges
 
diff --git a/routes/search.ts b/routes/search.ts
index 06194e2529..808c22e8cb 100644
--- a/routes/search.ts
+++ b/routes/search.ts
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: MIT
  */
 
-const utils = require('../lib/utils')
 import models = require('../models/index')
+const utils = require('../lib/utils')
 const challenges = require('../data/datacache').challenges
 
 // vuln-code-snippet start unionSqlInjectionChallenge dbSchemaChallenge
diff --git a/routes/verify.ts b/routes/verify.ts
index 0f8054c476..e4bfb08168 100644
--- a/routes/verify.ts
+++ b/routes/verify.ts
@@ -3,11 +3,11 @@
  * SPDX-License-Identifier: MIT
  */
 
+import models = require('../models/index')
 const utils = require('../lib/utils')
 const security = require('../lib/insecurity')
 const jwt = require('jsonwebtoken')
 const jws = require('jws')
-import models = require('../models/index')
 const cache = require('../data/datacache')
 const Op = models.Sequelize.Op
 const challenges = cache.challenges
diff --git a/server.ts b/server.ts
index aadcf56d72..9a117337bf 100644
--- a/server.ts
+++ b/server.ts
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: MIT
  */
 import dataErasure from './routes/dataErasure'
+import fs = require('fs')
 const startTime = Date.now()
 const path = require('path')
-import fs = require('fs')
 const morgan = require('morgan')
 const colors = require('colors/safe')
 const finale = require('finale-rest')
diff --git a/test/api/chatBotSpec.ts b/test/api/chatBotSpec.ts
index efa129ad07..e06d939bdc 100644
--- a/test/api/chatBotSpec.ts
+++ b/test/api/chatBotSpec.ts
@@ -236,7 +236,7 @@ describe('/chatbot', () => {
       })
       const testCommand = functionTest[0].utterances[0]
       const testResponse = '3be2e438b7f3d04c89d7749f727bb3bd'
-      return frisby.setup({
+      return await frisby.setup({
         request: {
           headers: {
             Authorization: `Bearer ${token}`,
diff --git a/test/e2e/basketSpec.ts b/test/e2e/basketSpec.ts
index 8413a209fd..9138ae5a1e 100644
--- a/test/e2e/basketSpec.ts
+++ b/test/e2e/basketSpec.ts
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: MIT
  */
 
-const security = require('../../lib/insecurity')
 import config = require('config')
+const security = require('../../lib/insecurity')
 const models = require('../../models/index')
 
 describe('/#/basket', () => {
diff --git a/test/e2e/complainSpec.ts b/test/e2e/complainSpec.ts
index 6dd7acef2a..0ee1188eae 100644
--- a/test/e2e/complainSpec.ts
+++ b/test/e2e/complainSpec.ts
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: MIT
  */
 
-const config = require('config')
 import path = require('path')
+const config = require('config')
 const utils = require('../../lib/utils')
 
 describe('/#/complain', () => {
diff --git a/test/e2e/deluxeSpec.ts b/test/e2e/deluxeSpec.ts
index 88bd7e6970..f90e91ca71 100644
--- a/test/e2e/deluxeSpec.ts
+++ b/test/e2e/deluxeSpec.ts
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: MIT
  */
 
-const config = require('config')
 import request = require('request')
+const config = require('config')
 
 describe('/#/deluxe-membership', () => {
   describe('challenge "svgInjection"', () => {
diff --git a/test/e2e/totpSetupSpec.ts b/test/e2e/totpSetupSpec.ts
index 76a0c5e4ef..fcbf86043c 100644
--- a/test/e2e/totpSetupSpec.ts
+++ b/test/e2e/totpSetupSpec.ts
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: MIT
  */
 
-const otplib = require('otplib')
 import config = require('config')
+const otplib = require('otplib')
 
 const EC = protractor.ExpectedConditions
 
diff --git a/test/e2eSubfolder.ts b/test/e2eSubfolder.ts
index 235cc4c988..16bb4783de 100644
--- a/test/e2eSubfolder.ts
+++ b/test/e2eSubfolder.ts
@@ -3,12 +3,12 @@
  * SPDX-License-Identifier: MIT
  */
 
+import request = require('request')
+import serverApp = require('./../server')
 const app = require('express')()
 const server = require('http').Server(app)
-import request = require('request')
 const colors = require('colors/safe')
 const logger = require('./../lib/logger')
-import serverApp = require('./../server')
 
 const url = require('url')
 const originalBase = require('../protractor.conf.js').config.baseUrl