diff --git a/forge-main/build.gradle.kts b/forge-main/build.gradle.kts
index 99f54132..64e00b21 100644
--- a/forge-main/build.gradle.kts
+++ b/forge-main/build.gradle.kts
@@ -49,6 +49,7 @@ neoForge {
     mods.create(modId) {
         modSourceSets.add(forgeApi.sourceSets.main)
         modSourceSets.add(sourceSets.main)
+        modSourceSets.add(sourceSets.test)
     }
 
     runs {
@@ -134,6 +135,8 @@ repositories {
     }
 }
 
+val USE_JARINJAR_FOR_API = false
+
 dependencies {
     implementation("org.jetbrains:annotations:24.0.0")
 
@@ -144,7 +147,10 @@ dependencies {
 
     compileOnly(forgeApi)
     testCompileOnly(forgeApi)
-    jarJar(forgeApi)
+
+    if(USE_JARINJAR_FOR_API) {
+        jarJar(forgeApi)
+    }
 
     // JEI
     modCompileOnly(libs.jei.commonApi)
@@ -156,6 +162,13 @@ dependencies {
     modCompileOnly("curse.maven:jade-324717:5776962")
 }
 
+if(!USE_JARINJAR_FOR_API) {
+    tasks.named<Jar>("jar") {
+        from(forgeApi.sourceSets["main"].output)
+        finalizedBy("reobfJar")
+    }
+}
+
 tasks.withType<Jar> {
     val gitVersion = providers.exec {
         commandLine("git", "rev-parse", "HEAD")
diff --git a/forge-main/src/test/java/dev/compactmods/machines/test/core/CompactMachinesTests.java b/forge-main/src/test/java/dev/compactmods/machines/test/CompactMachinesTests.java
similarity index 83%
rename from forge-main/src/test/java/dev/compactmods/machines/test/core/CompactMachinesTests.java
rename to forge-main/src/test/java/dev/compactmods/machines/test/CompactMachinesTests.java
index 1525fdcb..cce3493f 100644
--- a/forge-main/src/test/java/dev/compactmods/machines/test/core/CompactMachinesTests.java
+++ b/forge-main/src/test/java/dev/compactmods/machines/test/CompactMachinesTests.java
@@ -1,10 +1,7 @@
-package dev.compactmods.machines.test.core;
+package dev.compactmods.machines.test;
 
-import dev.compactmods.machines.CompactMachines;
 import dev.compactmods.machines.api.core.Constants;
 import dev.compactmods.machines.client.CreativeTabs;
-import dev.compactmods.machines.core.Registries;
-import dev.compactmods.machines.test.TestBatches;
 import net.minecraft.gametest.framework.GameTest;
 import net.minecraft.gametest.framework.GameTestHelper;
 import net.minecraftforge.gametest.GameTestHolder;