diff --git a/.runConfigurations/Test.run.xml b/.runConfigurations/Test.run.xml
new file mode 100644
index 0000000..4d75d24
--- /dev/null
+++ b/.runConfigurations/Test.run.xml
@@ -0,0 +1,23 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Test" type="GradleRunConfiguration" factoryName="Gradle">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="test" />
+        </list>
+      </option>
+      <option name="vmOptions" value="" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/uranos-api/src/main/kotlin/space/uranos/Uranos.kt b/uranos-api/src/main/kotlin/space/uranos/Uranos.kt
index 96e499e..7f40294 100644
--- a/uranos-api/src/main/kotlin/space/uranos/Uranos.kt
+++ b/uranos-api/src/main/kotlin/space/uranos/Uranos.kt
@@ -4,4 +4,4 @@ import space.uranos.server.Server
 
 private lateinit var serverInstance: Server
 
-object Uranos : Server by serverInstance
+val Uranos get() = serverInstance
diff --git a/uranos-server/src/test/kotlin/space/blokk/event/EventBusTest.kt b/uranos-server/src/test/kotlin/space/uranos/event/EventBusTest.kt
similarity index 96%
rename from uranos-server/src/test/kotlin/space/blokk/event/EventBusTest.kt
rename to uranos-server/src/test/kotlin/space/uranos/event/EventBusTest.kt
index 9c15b7d..cb1f0b7 100644
--- a/uranos-server/src/test/kotlin/space/blokk/event/EventBusTest.kt
+++ b/uranos-server/src/test/kotlin/space/uranos/event/EventBusTest.kt
@@ -29,7 +29,6 @@ class EventBusTest {
 
     @BeforeEach
     fun initServer() {
-        // Does not work because Uranos will not be reinitialized. When we use DI, we do no longer need this.
         UranosServer.setServerInstance(UranosServer())
     }
 
@@ -87,8 +86,8 @@ class EventBusTest {
         val order = listOf(
             EventHandlerPosition.FIRST,
             Position1,
-            EventHandlerPosition.NORMAL,
             Position2,
+            EventHandlerPosition.NORMAL,
             Position3,
             EventHandlerPosition.LAST
         )