diff --git a/src/test/kotlin/org/hmcore/tests/KotlinTests.kt b/src/test/kotlin/org/hmcore/tests/KotlinTests.kt
index 8e961ec..94736c4 100644
--- a/src/test/kotlin/org/hmcore/tests/KotlinTests.kt
+++ b/src/test/kotlin/org/hmcore/tests/KotlinTests.kt
@@ -6,12 +6,14 @@ import org.junit.jupiter.api.Test
 // The primary function of the Kotlin tests is to ensure Kotlin-specific features are preserved
 // Meaning some tests might only make sure features work at compile time.
 
-@Test
-fun `Module should support index access operator`() {
-    HMCore.modules["ores"]!!["other"]
-}
+class KotlinTests {
+    @Test
+    fun `Module should support index access operator`() {
+        HMCore.modules["ores"]?.apply { this["other"] }
+    }
 
-@Test
-fun `Module should support 'in' keyword`() {
-    HMCore.modules["ores"]?.let { "copper" in it }
-}
\ No newline at end of file
+    @Test
+    fun `Module should support 'in' keyword`() {
+        HMCore.modules["ores"]?.let { "copper" in it }
+    }
+}