diff --git a/test/de/inetsoftware/jwebassembly/runtime/CallFunctions.java b/test/de/inetsoftware/jwebassembly/runtime/CallFunctions.java
index 1707f48..5486dc4 100644
--- a/test/de/inetsoftware/jwebassembly/runtime/CallFunctions.java
+++ b/test/de/inetsoftware/jwebassembly/runtime/CallFunctions.java
@@ -19,15 +19,12 @@ import java.util.ArrayList;
 import java.util.Collection;
 
 import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
-import org.webassembly.annotation.Export;
-import org.webassembly.annotation.Import;
 
 import de.inetsoftware.jwebassembly.ScriptEngine;
 import de.inetsoftware.jwebassembly.WasmRule;
+import de.inetsoftware.jwebassembly.api.annotation.Export;
+import de.inetsoftware.jwebassembly.api.annotation.Import;
 
 /**
  * @author Volker Berlin
diff --git a/test/de/inetsoftware/jwebassembly/runtime/ControlFlowOperators.java b/test/de/inetsoftware/jwebassembly/runtime/ControlFlowOperators.java
index 1e3fe1c..4a80601 100644
--- a/test/de/inetsoftware/jwebassembly/runtime/ControlFlowOperators.java
+++ b/test/de/inetsoftware/jwebassembly/runtime/ControlFlowOperators.java
@@ -20,10 +20,10 @@ import java.util.Collection;
 
 import org.junit.ClassRule;
 import org.junit.runners.Parameterized.Parameters;
-import org.webassembly.annotation.Export;
 
 import de.inetsoftware.jwebassembly.ScriptEngine;
 import de.inetsoftware.jwebassembly.WasmRule;
+import de.inetsoftware.jwebassembly.api.annotation.Export;
 
 public class ControlFlowOperators extends AbstractBaseTest {
 
diff --git a/test/de/inetsoftware/jwebassembly/runtime/MathOperations.java b/test/de/inetsoftware/jwebassembly/runtime/MathOperations.java
index da2617f..7c8a4f4 100644
--- a/test/de/inetsoftware/jwebassembly/runtime/MathOperations.java
+++ b/test/de/inetsoftware/jwebassembly/runtime/MathOperations.java
@@ -19,13 +19,11 @@ import java.util.ArrayList;
 import java.util.Collection;
 
 import org.junit.ClassRule;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
-import org.webassembly.annotation.Export;
 
 import de.inetsoftware.jwebassembly.ScriptEngine;
 import de.inetsoftware.jwebassembly.WasmRule;
+import de.inetsoftware.jwebassembly.api.annotation.Export;
 
 /**
  * @author Volker Berlin
diff --git a/test/de/inetsoftware/jwebassembly/runtime/RuntimeErrors.java b/test/de/inetsoftware/jwebassembly/runtime/RuntimeErrors.java
index dff4cfc..8fd0de4 100644
--- a/test/de/inetsoftware/jwebassembly/runtime/RuntimeErrors.java
+++ b/test/de/inetsoftware/jwebassembly/runtime/RuntimeErrors.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Volker Berlin (i-net software)
+ * Copyright 2017 - 2018 Volker Berlin (i-net software)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,11 +27,11 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
-import org.webassembly.annotation.Export;
 
 import de.inetsoftware.jwebassembly.ScriptEngine;
 import de.inetsoftware.jwebassembly.WasmException;
 import de.inetsoftware.jwebassembly.WasmRule;
+import de.inetsoftware.jwebassembly.api.annotation.Export;
 
 /**
  * @author Volker Berlin
diff --git a/test/de/inetsoftware/jwebassembly/samples/FunctionParameters.java b/test/de/inetsoftware/jwebassembly/samples/FunctionParameters.java
index 18cb067..9855136 100644
--- a/test/de/inetsoftware/jwebassembly/samples/FunctionParameters.java
+++ b/test/de/inetsoftware/jwebassembly/samples/FunctionParameters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Volker Berlin (i-net software)
+ * Copyright 2017 - 2018 Volker Berlin (i-net software)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 package de.inetsoftware.jwebassembly.samples;
 
-import org.webassembly.annotation.Export;
+import de.inetsoftware.jwebassembly.api.annotation.Export;
 
 /**
  *