diff --git a/test/bytecode/LambdaTest.java b/test/bytecode/LambdaTest.java
index 8a4abcd5..b79ed16e 100644
--- a/test/bytecode/LambdaTest.java
+++ b/test/bytecode/LambdaTest.java
@@ -40,9 +40,9 @@ public class LambdaTest {
 		apply.setAccessible(true);
 
 		Integer i = 77;
-		// result = 77*77 = 5929
+		
 		Integer result = (Integer) apply.invoke(m.invoke(instanceOfClass), i); 
-//		assertEquals(5929, result);
+
 		assertEquals(77, result);
 	}
 
diff --git a/test/bytecode/LambdaVoidTest.java b/test/bytecode/LambdaVoidTest.java
new file mode 100644
index 00000000..ea83dbe0
--- /dev/null
+++ b/test/bytecode/LambdaVoidTest.java
@@ -0,0 +1,47 @@
+package bytecode;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.File;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.net.URLClassLoader;
+
+import org.junit.Test;
+
+import de.dhbwstuttgart.core.JavaTXCompiler;
+
+public class LambdaVoidTest {
+	private static String path;
+	private static File fileToTest;
+	private static JavaTXCompiler compiler;
+	private static ClassLoader loader;
+	private static Class<?> classToTest;
+	private static String pathToClassFile;
+	private static Object instanceOfClass;
+	
+	@Test
+	public void generateBC() throws Exception {
+		path = System.getProperty("user.dir")+"/test/bytecode/javFiles/Lambda.jav";
+		fileToTest = new File(path);
+		compiler = new JavaTXCompiler(fileToTest);
+		compiler.generateBytecode(System.getProperty("user.dir")+"/testBytecode/generatedBC/");
+		pathToClassFile = System.getProperty("user.dir")+"/testBytecode/generatedBC/";
+		loader = new URLClassLoader(new URL[] {new URL("file://"+pathToClassFile)});
+		classToTest = loader.loadClass("Lambda");
+		instanceOfClass = classToTest.getDeclaredConstructor().newInstance();
+
+		Method m = classToTest.getDeclaredMethod("m");
+		Class<?> lambda = m.invoke(instanceOfClass).getClass();
+		Method apply = lambda.getMethod("apply", Object.class);
+
+		// Damit man auf die Methode zugreifen kann
+		apply.setAccessible(true);
+
+		Integer i = 77;
+		apply.invoke(m.invoke(instanceOfClass), i); 
+	}
+
+
+}
diff --git a/test/bytecode/javFiles/Lambda.jav b/test/bytecode/javFiles/Lambda.jav
index bb7de0b4..ba466b18 100644
--- a/test/bytecode/javFiles/Lambda.jav
+++ b/test/bytecode/javFiles/Lambda.jav
@@ -6,13 +6,6 @@ public class Lambda {
    var lam1 = (x) -> {
         return x;
    };
-<<<<<<< HEAD
    return lam1;
-=======
-
-   return lam1.apply(new Apply());
-   //return lam1;
-   //return new Vector();
->>>>>>> 3fedbcc4a0e015ec8f5f6ccb77081f888135c850
   }
 }
diff --git a/test/bytecode/javFiles/LambdaVoid.jav b/test/bytecode/javFiles/LambdaVoid.jav
new file mode 100644
index 00000000..dc16fcbf
--- /dev/null
+++ b/test/bytecode/javFiles/LambdaVoid.jav
@@ -0,0 +1,9 @@
+import java.lang.Integer;
+
+public class Lambda {
+
+  m () {
+   var lam1 = (x) -> { };
+   return lam1;
+  }
+}