diff --git a/.classpath b/.classpath
index 7f1f3f7..de71593 100644
--- a/.classpath
+++ b/.classpath
@@ -3,7 +3,6 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="tst"/>
 	<classpathentry kind="src" path="testclasses"/>
-	<classpathentry kind="src" path="jacoco"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
 		<accessrules>
 			<accessrule kind="accessible" pattern="sun/reflect/**"/>
diff --git a/bin/nl/jssl/autounit/CoverageAnalyser.class b/bin/nl/jssl/autounit/CoverageAnalyser.class
index 7fd5a44..4f39d4b 100644
Binary files a/bin/nl/jssl/autounit/CoverageAnalyser.class and b/bin/nl/jssl/autounit/CoverageAnalyser.class differ
diff --git a/bin/nl/jssl/autounit/PrimtiveTypeTests.class b/bin/nl/jssl/autounit/PrimtiveTypeTests.class
index 35434b4..bf336c0 100644
Binary files a/bin/nl/jssl/autounit/PrimtiveTypeTests.class and b/bin/nl/jssl/autounit/PrimtiveTypeTests.class differ
diff --git a/bin/org/jacoco/examples/CoreTutorial$MemoryClassLoader.class b/bin/org/jacoco/examples/CoreTutorial$MemoryClassLoader.class
deleted file mode 100644
index d45b51d..0000000
Binary files a/bin/org/jacoco/examples/CoreTutorial$MemoryClassLoader.class and /dev/null differ
diff --git a/bin/org/jacoco/examples/CoreTutorial$TestTarget.class b/bin/org/jacoco/examples/CoreTutorial$TestTarget.class
deleted file mode 100644
index 1417539..0000000
Binary files a/bin/org/jacoco/examples/CoreTutorial$TestTarget.class and /dev/null differ
diff --git a/bin/org/jacoco/examples/CoreTutorial.class b/bin/org/jacoco/examples/CoreTutorial.class
deleted file mode 100644
index 1d09add..0000000
Binary files a/bin/org/jacoco/examples/CoreTutorial.class and /dev/null differ
diff --git a/src/nl/jssl/autounit/CoverageAnalyser.java b/src/nl/jssl/autounit/CoverageAnalyser.java
index b3c5fc0..199eba3 100644
--- a/src/nl/jssl/autounit/CoverageAnalyser.java
+++ b/src/nl/jssl/autounit/CoverageAnalyser.java
@@ -4,6 +4,7 @@ import java.io.InputStream;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
+import nl.jssl.autounit.utils.MemoryClassloader;
 import nl.jssl.autounit.utils.SilentObjectCreator;
 
 import org.jacoco.core.analysis.Analyzer;
@@ -15,7 +16,6 @@ import org.jacoco.core.instr.Instrumenter;
 import org.jacoco.core.runtime.IRuntime;
 import org.jacoco.core.runtime.LoggerRuntime;
 import org.jacoco.core.runtime.RuntimeData;
-import org.jacoco.examples.CoreTutorial.MemoryClassLoader;
 
 public class CoverageAnalyser {
 	private IRuntime runtime;
@@ -33,7 +33,7 @@ public class CoverageAnalyser {
 			data = new RuntimeData();
 			runtime.startup(data);
 
-			MemoryClassLoader memoryClassLoader = new MemoryClassLoader();
+			MemoryClassloader memoryClassLoader = new MemoryClassloader();
 			memoryClassLoader.addDefinition(targetName, instrumented);
 			Class<T> targetClass = (Class<T>) memoryClassLoader.loadClass(targetName);
 
diff --git a/tst/nl/jssl/autounit/PrimtiveTypeTests.java b/tst/nl/jssl/autounit/PrimtiveTypeTests.java
index 2bac963..e0e89d0 100644
--- a/tst/nl/jssl/autounit/PrimtiveTypeTests.java
+++ b/tst/nl/jssl/autounit/PrimtiveTypeTests.java
@@ -1,6 +1,6 @@
 package nl.jssl.autounit;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.lang.reflect.Method;
@@ -18,12 +18,9 @@ import org.junit.Test;
 public class PrimtiveTypeTests {
 	@Test
 	public void testGetPublicMethods() throws NoSuchMethodException, SecurityException {
-		Method evenOrUneven = IntArguments.class.getMethod("evenOrUneven", int.class);
 		List<Method> publicMethods = new Recorder(IntArguments.class).getPublicMethods();
 
 		assertEquals(2, publicMethods.size());
-		assertEquals(evenOrUneven, publicMethods.get(0));
-
 	}
 
 	@Test