diff --git a/base/build.gradle.kts b/base/build.gradle.kts
index 8ed0fbb48..f99dc771e 100644
--- a/base/build.gradle.kts
+++ b/base/build.gradle.kts
@@ -20,9 +20,6 @@
 
 // Dependencies
 dependencies {
-    // Kotlin support
-    kotlin(property("dependencyKotlinStdIdentifier") as String)
-
     // sos!engine
     implementation(project(":logging"))
 }
diff --git a/logging/build.gradle.kts b/logging/build.gradle.kts
index 68b184400..8947aa1a2 100644
--- a/logging/build.gradle.kts
+++ b/logging/build.gradle.kts
@@ -17,9 +17,3 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-
-// Dependencies
-dependencies {
-    // Kotlin support
-    kotlin(property("dependencyKotlinStdIdentifier") as String)
-}
diff --git a/testapp/build.gradle.kts b/testapp/build.gradle.kts
index fe9e82895..944d1423b 100644
--- a/testapp/build.gradle.kts
+++ b/testapp/build.gradle.kts
@@ -26,9 +26,6 @@ plugins {
 
 // Dependencies
 dependencies {
-    // Kotlin support
-    kotlin(property("dependencyKotlinStdIdentifier") as String)
-
     // sos!engine
     implementation(project(":logging"))
     implementation(project(":base"))
@@ -37,30 +34,33 @@ dependencies {
 // Configure JAR
 tasks.withType<Jar> {
     manifest {
-        attributes.put("Main-Class", "de.staropensource.engine.testapp.MainKt")
+        attributes.put("Main-Class", "de.staropensource.engine.testapp.Main")
     }
 }
 
 // Configure application
 application {
     mainClass = "de.staropensource.engine.testapp.Main"
-    applicationDefaultJvmArgs = listOf(
-        // JVM
-        // -> VM option unlocks
-        "-XX:+UnlockDiagnosticVMOptions",
 
-        // -> Display GC log
-        //"-Xlog:gc",
+    // JVM arguments
+    val jvmArgs: MutableList<String> = mutableListOf()
+    // -> JVM
+    jvmArgs.add("-XX:+UnlockDiagnosticVMOptions")
 
-        // -> Method compilation logging
-        //"-XX:+PrintCompilation",
-        //"-XX:+PrintInlining",
+    if (hasProperty("run.args.logGC") && property("run.args.logGC") as String == "true")
+        jvmArgs.add("-Xlog:gc")
+    if (hasProperty("run.args.logJITandAOT") && property("run.args.logJITandAOT") as String == "true") {
+        jvmArgs.add("-XX:+PrintCompilation")
+        jvmArgs.add("-XX:+PrintInlining")
+    }
+    if (hasProperty("run.args.garbageCollector"))
+        when (property("run.args.garbageCollector")) {
+            "epsilon" -> jvmArgs.add("-XX:+UseEpsilonGC")
+            "serial" -> jvmArgs.add("-XX:+UseSerialGC")
+            "g1" -> jvmArgs.add("-XX:+UseG1GC")
+        }
+    // -> Jansi
+    jvmArgs.add("-Djansi.mode=force")
 
-        // Jansi
-        // -> Force writing ANSI
-        "-Djansi.mode=force",
-
-        // sos!engine
-        // *none yet*
-    )
+    applicationDefaultJvmArgs = jvmArgs
 }