diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index ae1ba08c1..d8fafdea9 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -40,6 +40,7 @@
         <module name="teavm-maven-plugin" />
         <module name="teavm-maven-webapp" />
         <module name="teavm-metaprogramming-api" />
+        <module name="teavm-metaprogramming-impl" />
         <module name="teavm-platform" />
         <module name="teavm-samples-async" />
         <module name="teavm-samples-benchmark" />
@@ -69,6 +70,7 @@
       <module name="teavm-maven-plugin" target="1.8" />
       <module name="teavm-maven-webapp" target="1.5" />
       <module name="teavm-metaprogramming-api" target="1.8" />
+      <module name="teavm-metaprogramming-impl" target="1.8" />
       <module name="teavm-platform" target="1.8" />
       <module name="teavm-samples" target="1.5" />
       <module name="teavm-samples-async" target="1.8" />
diff --git a/.idea/modules.xml b/.idea/modules.xml
index a259e2964..1d2fb72df 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,7 +3,6 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/all-deps/all-deps.iml" filepath="$PROJECT_DIR$/all-deps/all-deps.iml" />
-      <module fileurl="file://$PROJECT_DIR$/metaprogramming/impl/impl.iml" filepath="$PROJECT_DIR$/metaprogramming/impl/impl.iml" />
       <module fileurl="file://$PROJECT_DIR$/teavm.iml" filepath="$PROJECT_DIR$/teavm.iml" />
       <module fileurl="file://$PROJECT_DIR$/tools/chrome-rdp/teavm-chrome-rdp.iml" filepath="$PROJECT_DIR$/tools/chrome-rdp/teavm-chrome-rdp.iml" />
       <module fileurl="file://$PROJECT_DIR$/classlib/teavm-classlib.iml" filepath="$PROJECT_DIR$/classlib/teavm-classlib.iml" />
@@ -21,6 +20,7 @@
       <module fileurl="file://$PROJECT_DIR$/tools/maven/plugin/teavm-maven-plugin.iml" filepath="$PROJECT_DIR$/tools/maven/plugin/teavm-maven-plugin.iml" />
       <module fileurl="file://$PROJECT_DIR$/tools/maven/webapp/teavm-maven-webapp.iml" filepath="$PROJECT_DIR$/tools/maven/webapp/teavm-maven-webapp.iml" />
       <module fileurl="file://$PROJECT_DIR$/metaprogramming/api/teavm-metaprogramming-api.iml" filepath="$PROJECT_DIR$/metaprogramming/api/teavm-metaprogramming-api.iml" />
+      <module fileurl="file://$PROJECT_DIR$/metaprogramming/impl/teavm-metaprogramming-impl.iml" filepath="$PROJECT_DIR$/metaprogramming/impl/teavm-metaprogramming-impl.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/teavm-platform.iml" filepath="$PROJECT_DIR$/platform/teavm-platform.iml" />
       <module fileurl="file://$PROJECT_DIR$/samples/teavm-samples.iml" filepath="$PROJECT_DIR$/samples/teavm-samples.iml" />
       <module fileurl="file://$PROJECT_DIR$/samples/async/teavm-samples-async.iml" filepath="$PROJECT_DIR$/samples/async/teavm-samples-async.iml" />
diff --git a/html4j/pom.xml b/html4j/pom.xml
index 0c736bd6d..1ff7d9579 100644
--- a/html4j/pom.xml
+++ b/html4j/pom.xml
@@ -66,70 +66,6 @@
 
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.teavm</groupId>
-        <artifactId>teavm-maven-plugin</artifactId>
-        <version>${project.version}</version>
-        <executions>
-          <execution>
-            <id>generate-javascript-tests</id>
-            <goals>
-              <goal>testCompile</goal>
-            </goals>
-            <configuration>
-              <minifying>false</minifying>
-              <targetDirectory>${project.build.directory}/javascript-test</targetDirectory>
-              <debugInformationGenerated>true</debugInformationGenerated>
-              <sourceMapsGenerated>true</sourceMapsGenerated>
-            </configuration>
-          </execution>
-          <execution>
-            <id>generate-javascript-tck</id>
-            <goals>
-              <goal>testCompile</goal>
-            </goals>
-            <configuration>
-              <minifying>false</minifying>
-              <scanDependencies>true</scanDependencies>
-              <targetDirectory>${project.build.directory}/javascript-tck</targetDirectory>
-              <adapterClass>org.teavm.html4j.testing.KOTestAdapter</adapterClass>
-              <transformers>
-                <param>org.teavm.javascript.NullPointerExceptionTransformer</param>
-              </transformers>
-              <debugInformationGenerated>true</debugInformationGenerated>
-              <sourceMapsGenerated>true</sourceMapsGenerated>
-              <sourceFilesCopied>true</sourceFilesCopied>
-              <excludeWildcards>
-                <wildcard>**.GC*Test</wildcard>
-              </excludeWildcards>
-            </configuration>
-          </execution>
-          <execution>
-            <id>run-javascript-tests</id>
-            <goals>
-              <goal>test</goal>
-            </goals>
-            <configuration>
-              <skip>${teavm.test.skip}</skip>
-              <numThreads>${teavm.test.threads}</numThreads>
-              <seleniumURL>${teavm.test.selenium}</seleniumURL>
-            </configuration>
-          </execution>
-          <execution>
-            <id>run-javascript-tck</id>
-            <goals>
-              <goal>test</goal>
-            </goals>
-            <configuration>
-              <testDirectory>${project.build.directory}/javascript-tck</testDirectory>
-              <reportFile>${project.build.directory}/teavm-tck-report.json</reportFile>
-              <skip>true</skip>
-              <numThreads>${teavm.test.threads}</numThreads>
-              <seleniumURL>${teavm.test.selenium}</seleniumURL>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
diff --git a/samples/kotlin/pom.xml b/samples/kotlin/pom.xml
index c1e22571b..4a0084e9b 100644
--- a/samples/kotlin/pom.xml
+++ b/samples/kotlin/pom.xml
@@ -96,7 +96,7 @@
             </goals>
             <configuration>
               <targetDirectory>${project.build.directory}/generated/js/teavm</targetDirectory>
-              <mainClass>org.teavm.samples.kotlin.KotlinPackage</mainClass>
+              <mainClass>org.teavm.samples.kotlin.HelloKt</mainClass>
               <runtime>SEPARATE</runtime>
               <minifying>false</minifying>
               <debugInformationGenerated>true</debugInformationGenerated>
diff --git a/samples/kotlin/src/main/webapp/index.html b/samples/kotlin/src/main/webapp/index.html
index 988fa4e9a..b1f851d52 100644
--- a/samples/kotlin/src/main/webapp/index.html
+++ b/samples/kotlin/src/main/webapp/index.html
@@ -13,18 +13,12 @@
     <pre>
 package org.teavm.samples.kotlin
 
-import org.teavm.jso.*
-import org.teavm.dom.browser.*
-import org.teavm.dom.html.*
-import org.teavm.dom.events.*
+import org.teavm.jso.browser.*
 
-fun main(args : Array&lt;String&gt;) {
-    var window = JS.getGlobal() as Window;
-    var document = window.getDocument();
+fun main(args : Array&lt;String>) {
+    val document = Window.current().document;
 
-    document.getElementById("hello-kotlin").addEventListener("click", EventListener&lt;MouseEvent&gt;() {
-       window.alert("Hello, developer!");
-    })
+    document.getElementById("hello-kotlin").addEventListener("click") { Window.alert("Hello, developer!") }
 }
     </pre>
   </body>
diff --git a/tests/pom.xml b/tests/pom.xml
index 038ef44e3..61621a25a 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -84,11 +84,12 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.16</version>
         <configuration>
-          <excludes>
-            <exclude>org/teavm/platform/**/*.java</exclude>
-            <exclude>org/teavm/jso/**/*.java</exclude>
-          </excludes>
+          <systemProperties>
+            <teavm.junit.target>${project.build.directory}/js-tests</teavm.junit.target>
+            <teavm.junit.js.runner>htmlunit</teavm.junit.js.runner>
+          </systemProperties>
         </configuration>
       </plugin>
       <plugin>
diff --git a/tests/teavm-tests.iml b/tests/teavm-tests.iml
index d808ac0cf..eb265e73c 100644
--- a/tests/teavm-tests.iml
+++ b/tests/teavm-tests.iml
@@ -25,7 +25,7 @@
     <orderEntry type="module" module-name="teavm-platform" />
     <orderEntry type="module" module-name="teavm-jso-apis" />
     <orderEntry type="module" module-name="teavm-jso-apis" production-on-test="" />
-    <orderEntry type="module" module-name="impl" />
+    <orderEntry type="module" module-name="teavm-metaprogramming-impl" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.11" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
     <orderEntry type="module" module-name="teavm-tooling" scope="TEST" />
diff --git a/tools/junit/pom.xml b/tools/junit/pom.xml
index c931d5118..ba9ff4d51 100644
--- a/tools/junit/pom.xml
+++ b/tools/junit/pom.xml
@@ -64,6 +64,7 @@
         <artifactId>maven-checkstyle-plugin</artifactId>
         <configuration>
           <configLocation>../../checkstyle.xml</configLocation>
+          <propertyExpansion>config_loc=${basedir}/../..</propertyExpansion>
         </configuration>
       </plugin>
       <plugin>
diff --git a/tools/junit/src/main/java/org/teavm/junit/TestRunner.java b/tools/junit/src/main/java/org/teavm/junit/TestRunner.java
index 54ceb990c..0938fa027 100644
--- a/tools/junit/src/main/java/org/teavm/junit/TestRunner.java
+++ b/tools/junit/src/main/java/org/teavm/junit/TestRunner.java
@@ -17,7 +17,6 @@ package org.teavm.junit;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import java.io.IOException;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.LinkedBlockingQueue;