diff --git a/Java/src/test/java/org/ciyam/at/BlockchainFunctionCodeTests.java b/Java/src/test/java/org/ciyam/at/BlockchainFunctionCodeTests.java
index aa9cf06..5df06f8 100644
--- a/Java/src/test/java/org/ciyam/at/BlockchainFunctionCodeTests.java
+++ b/Java/src/test/java/org/ciyam/at/BlockchainFunctionCodeTests.java
@@ -5,12 +5,6 @@ import static org.junit.Assert.*;
 import java.util.Arrays;
 import java.util.Random;
 
-import org.ciyam.at.API;
-import org.ciyam.at.ExecutionException;
-import org.ciyam.at.FunctionCode;
-import org.ciyam.at.MachineState;
-import org.ciyam.at.OpCode;
-import org.ciyam.at.Timestamp;
 import org.ciyam.at.test.ExecutableTest;
 import org.ciyam.at.test.TestAPI;
 import org.ciyam.at.test.TestAPI.TestAccount;
diff --git a/Java/src/test/java/org/ciyam/at/BranchingOpCodeTests.java b/Java/src/test/java/org/ciyam/at/BranchingOpCodeTests.java
index 41b3d86..c9c6a43 100644
--- a/Java/src/test/java/org/ciyam/at/BranchingOpCodeTests.java
+++ b/Java/src/test/java/org/ciyam/at/BranchingOpCodeTests.java
@@ -2,8 +2,6 @@ package org.ciyam.at;
 
 import static org.junit.Assert.*;
 
-import org.ciyam.at.ExecutionException;
-import org.ciyam.at.OpCode;
 import org.ciyam.at.test.ExecutableTest;
 import org.junit.Test;
 
diff --git a/Java/src/test/java/org/ciyam/at/CallStackOpCodeTests.java b/Java/src/test/java/org/ciyam/at/CallStackOpCodeTests.java
index 4a83c1c..2c5a1f9 100644
--- a/Java/src/test/java/org/ciyam/at/CallStackOpCodeTests.java
+++ b/Java/src/test/java/org/ciyam/at/CallStackOpCodeTests.java
@@ -2,9 +2,6 @@ package org.ciyam.at;
 
 import static org.junit.Assert.*;
 
-import org.ciyam.at.ExecutionException;
-import org.ciyam.at.MachineState;
-import org.ciyam.at.OpCode;
 import org.ciyam.at.test.ExecutableTest;
 import org.junit.Test;
 
diff --git a/Java/src/test/java/org/ciyam/at/DataOpCodeTests.java b/Java/src/test/java/org/ciyam/at/DataOpCodeTests.java
index be0d8e8..69e8ab6 100644
--- a/Java/src/test/java/org/ciyam/at/DataOpCodeTests.java
+++ b/Java/src/test/java/org/ciyam/at/DataOpCodeTests.java
@@ -2,8 +2,6 @@ package org.ciyam.at;
 
 import static org.junit.Assert.*;
 
-import org.ciyam.at.ExecutionException;
-import org.ciyam.at.OpCode;
 import org.ciyam.at.test.ExecutableTest;
 import org.junit.Test;
 
diff --git a/Java/src/test/java/org/ciyam/at/DisassemblyTests.java b/Java/src/test/java/org/ciyam/at/DisassemblyTests.java
index d74a9ca..8df104c 100644
--- a/Java/src/test/java/org/ciyam/at/DisassemblyTests.java
+++ b/Java/src/test/java/org/ciyam/at/DisassemblyTests.java
@@ -6,10 +6,6 @@ import static org.junit.Assert.fail;
 import java.nio.charset.StandardCharsets;
 import java.util.Random;
 
-import org.ciyam.at.ExecutionException;
-import org.ciyam.at.FunctionCode;
-import org.ciyam.at.MachineState;
-import org.ciyam.at.OpCode;
 import org.ciyam.at.test.ExecutableTest;
 import org.ciyam.at.test.TestUtils;
 import org.junit.Test;
diff --git a/Java/src/test/java/org/ciyam/at/FunctionCodeTests.java b/Java/src/test/java/org/ciyam/at/FunctionCodeTests.java
index c1a6bb3..35894c7 100644
--- a/Java/src/test/java/org/ciyam/at/FunctionCodeTests.java
+++ b/Java/src/test/java/org/ciyam/at/FunctionCodeTests.java
@@ -4,11 +4,6 @@ import static org.junit.Assert.*;
 
 import java.util.Arrays;
 
-import org.ciyam.at.ExecutionException;
-import org.ciyam.at.FunctionCode;
-import org.ciyam.at.MachineState;
-import org.ciyam.at.OpCode;
-import org.ciyam.at.Timestamp;
 import org.ciyam.at.test.ExecutableTest;
 import org.junit.Test;
 
diff --git a/Java/src/test/java/org/ciyam/at/HashingFunctionCodeTests.java b/Java/src/test/java/org/ciyam/at/HashingFunctionCodeTests.java
index c6c9ba6..99deb8b 100644
--- a/Java/src/test/java/org/ciyam/at/HashingFunctionCodeTests.java
+++ b/Java/src/test/java/org/ciyam/at/HashingFunctionCodeTests.java
@@ -5,9 +5,6 @@ import static org.junit.Assert.*;
 
 import java.nio.charset.StandardCharsets;
 
-import org.ciyam.at.ExecutionException;
-import org.ciyam.at.FunctionCode;
-import org.ciyam.at.OpCode;
 import org.ciyam.at.test.ExecutableTest;
 import org.junit.Test;
 
diff --git a/Java/src/test/java/org/ciyam/at/MiscTests.java b/Java/src/test/java/org/ciyam/at/MiscTests.java
index 4bc9178..21841cd 100644
--- a/Java/src/test/java/org/ciyam/at/MiscTests.java
+++ b/Java/src/test/java/org/ciyam/at/MiscTests.java
@@ -2,10 +2,6 @@ package org.ciyam.at;
 
 import static org.junit.Assert.*;
 
-import org.ciyam.at.ExecutionException;
-import org.ciyam.at.FunctionCode;
-import org.ciyam.at.MachineState;
-import org.ciyam.at.OpCode;
 import org.ciyam.at.test.ExecutableTest;
 import org.ciyam.at.test.TestAPI;
 import org.ciyam.at.test.TestUtils;
diff --git a/Java/src/test/java/org/ciyam/at/OpCodeTests.java b/Java/src/test/java/org/ciyam/at/OpCodeTests.java
index f406e16..b262484 100644
--- a/Java/src/test/java/org/ciyam/at/OpCodeTests.java
+++ b/Java/src/test/java/org/ciyam/at/OpCodeTests.java
@@ -3,8 +3,6 @@ package org.ciyam.at;
 import static org.ciyam.at.test.TestUtils.hexToBytes;
 import static org.junit.Assert.*;
 
-import org.ciyam.at.ExecutionException;
-import org.ciyam.at.OpCode;
 import org.ciyam.at.test.ExecutableTest;
 import org.junit.Test;
 
diff --git a/Java/src/test/java/org/ciyam/at/SerializationTests.java b/Java/src/test/java/org/ciyam/at/SerializationTests.java
index d12b133..1433bee 100644
--- a/Java/src/test/java/org/ciyam/at/SerializationTests.java
+++ b/Java/src/test/java/org/ciyam/at/SerializationTests.java
@@ -5,10 +5,6 @@ import static org.junit.Assert.*;
 
 import java.util.Arrays;
 
-import org.ciyam.at.ExecutionException;
-import org.ciyam.at.FunctionCode;
-import org.ciyam.at.MachineState;
-import org.ciyam.at.OpCode;
 import org.ciyam.at.test.ExecutableTest;
 import org.ciyam.at.test.TestUtils;
 import org.junit.Test;
diff --git a/Java/src/test/java/org/ciyam/at/UserStackOpCodeTests.java b/Java/src/test/java/org/ciyam/at/UserStackOpCodeTests.java
index 34dd2d9..bf76c2b 100644
--- a/Java/src/test/java/org/ciyam/at/UserStackOpCodeTests.java
+++ b/Java/src/test/java/org/ciyam/at/UserStackOpCodeTests.java
@@ -2,9 +2,6 @@ package org.ciyam.at;
 
 import static org.junit.Assert.*;
 
-import org.ciyam.at.ExecutionException;
-import org.ciyam.at.MachineState;
-import org.ciyam.at.OpCode;
 import org.ciyam.at.test.ExecutableTest;
 import org.junit.Test;