diff --git a/tests/performance/database.ts b/tests/performance/database.ts
index 97cb95cf88832a54becafca68097e23324331ca4..a048e9a51b5d054a08999c2ff049c585a9009392 100644
--- a/tests/performance/database.ts
+++ b/tests/performance/database.ts
@@ -3,7 +3,7 @@ import * as fs from 'fs';
 
 import Contact from '../../scripts/wichtelbot/classes/contact';
 import ContactTestUtility from '../utility/contact';
-import Database from '../../scripts/wichtelbot/database';
+import Database from '../../scripts/wichtelbot/database/database';
 import Member from '../../scripts/wichtelbot/classes/member';
 
 const testCount = 100;
diff --git a/tests/tests/messages/statefulCommands.ts b/tests/tests/messages/statefulCommands.ts
index 1d3faa76c8ae6eb5fcc3aaf6969e51c345f5d641..7acfb45967f535d6f693239d0eb45fa9061118e6 100644
--- a/tests/tests/messages/statefulCommands.ts
+++ b/tests/tests/messages/statefulCommands.ts
@@ -6,7 +6,7 @@ import Config from '../../../scripts/utility/config';
 import ConfigTestUtility from '../../utility/config';
 import Contact from '../../../scripts/wichtelbot/classes/contact';
 import ContactType from '../../../scripts/wichtelbot/types/contactType';
-import Database from '../../../scripts/wichtelbot/database';
+import Database from '../../../scripts/wichtelbot/database/database';
 import GiftType from '../../../scripts/wichtelbot/types/giftType';
 import Information from '../../../scripts/wichtelbot/classes/information';
 import { KeyValuePairList } from '../../../scripts/utility/keyValuePair';
diff --git a/tests/tests/messages/statelessCommands.ts b/tests/tests/messages/statelessCommands.ts
index 526949e6cd41d317a770581ccc8fa3b095f51795..a3f6fd246672f57077200ebccd863bbaef278a03 100644
--- a/tests/tests/messages/statelessCommands.ts
+++ b/tests/tests/messages/statelessCommands.ts
@@ -3,7 +3,7 @@ import { assert } from 'chai';
 import { ChannelType } from '../../../scripts/wichtelbot/endpoint/definitions';
 import Config from '../../../scripts/utility/config';
 import ConfigTestUtility from '../../utility/config';
-import Database from '../../../scripts/wichtelbot/database';
+import Database from '../../../scripts/wichtelbot/database/database';
 import Localisation from '../../../scripts/utility/localisation';
 import MessageHandler from '../../../scripts/wichtelbot/message/messageHandler';
 import { TestMessageWithFixedAuthor } from '../../utility/message';
diff --git a/tests/tests/wichtelbot.database.ts b/tests/tests/wichtelbot.database.ts
index e4f83bd84a74adb8974cee4b89a2d4c6e43616de..e813f367bb044c54cc4e13ddc7699b9c3a10a5c4 100644
--- a/tests/tests/wichtelbot.database.ts
+++ b/tests/tests/wichtelbot.database.ts
@@ -2,7 +2,7 @@ import 'mocha';
 import { assert } from 'chai';
 
 import ContactTestUtility from '../utility/contact';
-import Database from '../../scripts/wichtelbot/database';
+import Database from '../../scripts/wichtelbot/database/database';
 import GeneralTestUtility from '../utility/general';
 import Member from '../../scripts/wichtelbot/classes/member';
 
diff --git a/tests/tests/wichtelbot.endpoint.implementations.discord.ts b/tests/tests/wichtelbot.endpoint.implementations.discord.ts
index dff140404bec90693cbcf8a81abe9f5488a54a88..220e61da07c25125bde816e5db52b05355f14b89 100644
--- a/tests/tests/wichtelbot.endpoint.implementations.discord.ts
+++ b/tests/tests/wichtelbot.endpoint.implementations.discord.ts
@@ -4,7 +4,6 @@ import * as DiscordEndpoint from '../../scripts/wichtelbot/endpoint/implementati
 import * as mockito from 'ts-mockito';
 import { assert } from 'chai';
 import { ChannelType } from '../../scripts/wichtelbot/endpoint/definitions';
-import GeneralTestUtility from '../utility/general';
 
 describe('discord client',
     function ()
diff --git a/tests/tests/wichtelbot.message.handler.ts b/tests/tests/wichtelbot.message.handler.ts
index b68a58e22f8858ee1ca5b6eb8e01197054dd4c92..06f02a8a5cfcd30b0021041f4b747d5959536f20 100644
--- a/tests/tests/wichtelbot.message.handler.ts
+++ b/tests/tests/wichtelbot.message.handler.ts
@@ -4,7 +4,7 @@ import { TestMessage, TestMessageWithFixedAuthor } from '../utility/message';
 import { assert } from 'chai';
 import Config from '../../scripts/utility/config';
 import ConfigTestUtility from '../utility/config';
-import Database from '../../scripts/wichtelbot/database';
+import Database from '../../scripts/wichtelbot/database/database';
 import { KeyValuePairList } from '../../scripts/utility/keyValuePair';
 import Localisation from '../../scripts/utility/localisation';
 import MessageHandler from '../../scripts/wichtelbot/message/messageHandler';
diff --git a/tests/utility/message.ts b/tests/utility/message.ts
index 604e8e869b79be9a44e6fb5b5e7c6b75948db76f..38cec7817db37481f413da101a84fa4bff373399 100644
--- a/tests/utility/message.ts
+++ b/tests/utility/message.ts
@@ -1,7 +1,6 @@
-
 import { Channel, ChannelType, Client, Component, Message, State, User } from '../../scripts/wichtelbot/endpoint/definitions';
 import Contact from '../../scripts/wichtelbot/classes/contact';
-import Database from '../../scripts/wichtelbot/database';
+import Database from '../../scripts/wichtelbot/database/database';
 import GeneralTestUtility from '../utility/general';
 import Information from '../../scripts/wichtelbot/classes/information';
 import Member from '../../scripts/wichtelbot/classes/member';