diff --git a/cicaprojekt/Tester.java b/cicaprojekt/Tester.java
index 8586feb..a6eaae6 100644
--- a/cicaprojekt/Tester.java
+++ b/cicaprojekt/Tester.java
@@ -100,7 +100,6 @@ public class Tester {
     }
 
     @Test
-<<<<<<< 68c0dd96e3304b4048de58acf99e10ab3da9abd5
     boolean extraZPM(){
         String[] commands = {"loadMap testExtraZPMs\n",
                 "listZPMs\n",
@@ -112,14 +111,14 @@ public class Tester {
 
         return testOnSequenceOfCommands(commands, expectedOutputs);
     }
-=======
+
     boolean testScalesAndGates(){
         String[] commands = {"loadMap testScalesAndGates\n",
                              "boxLift O\n",
                              "rotate O L\n",
                              "boxDrop O\n"};
         
-        String[] expectedOutputs = {"door open"};
+        String[] expectedOutputs = {"door open\n"};
         boolean results = testOnSequenceOfCommands(commands, expectedOutputs);
         
         System.out.print("testScalesAndGates: ");
@@ -130,5 +129,21 @@ public class Tester {
         return results;
     }
     
->>>>>>> boolean testScalesAndGates() added to Tester
+    boolean gapTest(){
+        String[] commands = {"loadMap gapTest\n",
+                             "move O\n"};
+
+        String[] expectedOutputs = {};
+        boolean results = testOnSequenceOfCommands(commands, expectedOutputs);
+
+        System.out.print("gapTest: ");
+        if(results)
+            System.out.println("Sikeres!");
+        else System.out.println("Sikertelen!");
+
+        return results;
+    }
+    
+    
+    
 }