diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index de281b3..f17bc73 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,19 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="75ef5724-93bc-4ed4-82b2-ff12411188dc" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/gumtree/core/src/main/java/com/github/gumtreediff/io/TreeIoUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/gumtree/core/src/main/java/com/github/gumtreediff/io/TreeIoUtils.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/gumtree/core/src/test/java/com/github/gumtreediff/test/TestActionGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/gumtree/core/src/test/java/com/github/gumtreediff/test/TestActionGenerator.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/gumtree/core/src/test/java/com/github/gumtreediff/test/TreeLoader.java" beforeDir="false" afterPath="$PROJECT_DIR$/gumtree/core/src/test/java/com/github/gumtreediff/test/TreeLoader.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/gumtree/gen.srcml/src/test/java/com/github/gumtreediff/gen/srcml/TestSrcmlCGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/gumtree/gen.srcml/src/test/java/com/github/gumtreediff/gen/srcml/TestSrcmlCGenerator.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/gumtree/gen.srcml/src/test/java/com/github/gumtreediff/gen/srcml/TestSrcmlCppGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/gumtree/gen.srcml/src/test/java/com/github/gumtreediff/gen/srcml/TestSrcmlCppGenerator.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/gumtree/gen.srcml/src/test/java/com/github/gumtreediff/gen/srcml/TestSrcmlCsGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/gumtree/gen.srcml/src/test/java/com/github/gumtreediff/gen/srcml/TestSrcmlCsGenerator.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/gumtree/gen.srcml/src/test/java/com/github/gumtreediff/gen/srcml/TestSrcmlJavaGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/gumtree/gen.srcml/src/test/java/com/github/gumtreediff/gen/srcml/TestSrcmlJavaGenerator.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/jobs/EnhancedASTDiff.java" beforeDir="false" afterPath="$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/jobs/EnhancedASTDiff.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/FixPatternMiner/BaseTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/FixPatternMiner/BaseTest.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/config.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/config.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.travis.yml" beforeDir="false" afterPath="$PROJECT_DIR$/.travis.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/TestPredefinedCases.java" beforeDir="false" afterPath="$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/TestPredefinedCases.java" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/classes/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -36,20 +26,38 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/FixPatternMiner/TestRealCases.java">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/TestRealCases.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="225">
-              <caret line="30" column="15" selection-start-line="30" selection-start-column="15" selection-end-line="30" selection-end-column="15" />
+            <state relative-caret-position="75">
+              <caret line="13" column="18" selection-start-line="13" selection-start-column="18" selection-end-line="13" selection-end-column="18" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/FixPatternMiner/BaseTest.java">
+        <entry file="file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/TestPredefinedCases.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="195">
-              <caret line="13" column="23" lean-forward="true" selection-start-line="13" selection-start-column="23" selection-end-line="13" selection-end-column="23" />
+            <state relative-caret-position="438">
+              <caret line="86" selection-start-line="86" selection-end-line="86" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/.travis.yml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="30">
+              <caret line="2" column="27" selection-start-line="2" selection-start-column="27" selection-end-line="2" selection-end-column="27" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/TestIntroClass.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="450">
+              <caret line="30" column="21" selection-start-line="30" selection-start-column="21" selection-end-line="30" selection-end-column="21" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -97,7 +105,6 @@
         <option value="$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/Launcher.java" />
         <option value="$PROJECT_DIR$/richedit/pom.xml" />
         <option value="$PROJECT_DIR$/pom.xml" />
-        <option value="$PROJECT_DIR$/.travis.yml" />
         <option value="$PROJECT_DIR$/python/data/callJava.sh" />
         <option value="$PROJECT_DIR$/python/data/redis/stopServer.sh" />
         <option value="$PROJECT_DIR$/python/common/commons.py" />
@@ -116,6 +123,9 @@
         <option value="$PROJECT_DIR$/gumtree/gen.srcml/src/test/java/com/github/gumtreediff/gen/srcml/TestSrcmlCsGenerator.java" />
         <option value="$PROJECT_DIR$/gumtree/gen.srcml/src/test/java/com/github/gumtreediff/gen/srcml/TestSrcmlJavaGenerator.java" />
         <option value="$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/FixPatternMiner/BaseTest.java" />
+        <option value="$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/BaseTest.java" />
+        <option value="$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/TestPredefinedCases.java" />
+        <option value="$PROJECT_DIR$/.travis.yml" />
       </list>
     </option>
   </component>
@@ -178,6 +188,58 @@
               <item name="gumtree" type="b2602c69:ProjectViewProjectNode" />
               <item name="fixminer_source" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="gumtree" type="b2602c69:ProjectViewProjectNode" />
+              <item name="fixminer_source" type="462c0819:PsiDirectoryNode" />
+              <item name="gumtree" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="gumtree" type="b2602c69:ProjectViewProjectNode" />
+              <item name="fixminer_source" type="462c0819:PsiDirectoryNode" />
+              <item name="gumtree" type="462c0819:PsiDirectoryNode" />
+              <item name="core" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="gumtree" type="b2602c69:ProjectViewProjectNode" />
+              <item name="fixminer_source" type="462c0819:PsiDirectoryNode" />
+              <item name="gumtree" type="462c0819:PsiDirectoryNode" />
+              <item name="core" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="gumtree" type="b2602c69:ProjectViewProjectNode" />
+              <item name="fixminer_source" type="462c0819:PsiDirectoryNode" />
+              <item name="gumtree" type="462c0819:PsiDirectoryNode" />
+              <item name="core" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="gumtree" type="b2602c69:ProjectViewProjectNode" />
+              <item name="fixminer_source" type="462c0819:PsiDirectoryNode" />
+              <item name="gumtree" type="462c0819:PsiDirectoryNode" />
+              <item name="core" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="gumtree" type="b2602c69:ProjectViewProjectNode" />
+              <item name="fixminer_source" type="462c0819:PsiDirectoryNode" />
+              <item name="gumtree" type="462c0819:PsiDirectoryNode" />
+              <item name="core" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="test" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="gumtree" type="b2602c69:ProjectViewProjectNode" />
+              <item name="fixminer_source" type="462c0819:PsiDirectoryNode" />
+              <item name="gumtree" type="462c0819:PsiDirectoryNode" />
+              <item name="core" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="test" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="gumtree" type="b2602c69:ProjectViewProjectNode" />
               <item name="fixminer_source" type="462c0819:PsiDirectoryNode" />
@@ -235,7 +297,7 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="test" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="FixPatternMiner" type="462c0819:PsiDirectoryNode" />
+              <item name="serval" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="gumtree" type="b2602c69:ProjectViewProjectNode" />
@@ -288,7 +350,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="JUnit.TestIntroClass.test_manybugs_gmp_14166_14167">
+  <component name="RunManager" selected="JUnit.TestPredefinedCases">
     <configuration default="true" type="Applet">
       <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
       <method v="2">
@@ -301,39 +363,6 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="TestActionGenerator" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
-      <module name="core" />
-      <extension name="coverage">
-        <pattern>
-          <option name="PATTERN" value="com.github.gumtreediff.test.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <option name="PACKAGE_NAME" value="com.github.gumtreediff.test" />
-      <option name="MAIN_CLASS_NAME" value="com.github.gumtreediff.test.TestActionGenerator" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration name="TestActionGenerator.testWithActionExample" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
-      <module name="core" />
-      <extension name="coverage">
-        <pattern>
-          <option name="PATTERN" value="com.github.gumtreediff.test.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <option name="PACKAGE_NAME" value="com.github.gumtreediff.test" />
-      <option name="MAIN_CLASS_NAME" value="com.github.gumtreediff.test.TestActionGenerator" />
-      <option name="METHOD_NAME" value="testWithActionExample" />
-      <option name="TEST_OBJECT" value="method" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
     <configuration name="TestIntroClass.test_manybugs_gmp_14166_14167" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="RichEdit" />
       <extension name="coverage">
@@ -351,6 +380,55 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
+    <configuration name="TestPredefinedCases" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+      <module name="RichEdit" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="edu.lu.uni.serval.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <option name="PACKAGE_NAME" value="edu.lu.uni.serval" />
+      <option name="MAIN_CLASS_NAME" value="edu.lu.uni.serval.TestPredefinedCases" />
+      <option name="TEST_OBJECT" value="class" />
+      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="TestPredefinedCases.testIFCase1" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+      <module name="RichEdit" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="edu.lu.uni.serval.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <option name="PACKAGE_NAME" value="edu.lu.uni.serval" />
+      <option name="MAIN_CLASS_NAME" value="edu.lu.uni.serval.TestPredefinedCases" />
+      <option name="METHOD_NAME" value="testIFCase1" />
+      <option name="TEST_OBJECT" value="method" />
+      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="TestRealCases" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+      <module name="RichEdit" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="edu.lu.uni.serval.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <option name="PACKAGE_NAME" value="edu.lu.uni.serval" />
+      <option name="MAIN_CLASS_NAME" value="edu.lu.uni.serval.TestRealCases" />
+      <option name="TEST_OBJECT" value="class" />
+      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <configuration name="TestRealCases.test_287_A_14208510_14208532 (1)" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="RichEdit" />
       <extension name="coverage">
@@ -368,23 +446,6 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="TestRealCases.test_287_A_14208510_14208532" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
-      <module name="RichEdit" />
-      <extension name="coverage">
-        <pattern>
-          <option name="PATTERN" value="edu.lu.uni.serval.FixPatternMiner.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <option name="PACKAGE_NAME" value="edu.lu.uni.serval.FixPatternMiner" />
-      <option name="MAIN_CLASS_NAME" value="edu.lu.uni.serval.FixPatternMiner.TestRealCases" />
-      <option name="METHOD_NAME" value="test_287_A_14208510_14208532" />
-      <option name="TEST_OBJECT" value="method" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
     <configuration default="true" type="JUnit" factoryName="JUnit">
       <option name="TEST_OBJECT" value="class" />
       <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
@@ -465,19 +526,19 @@
     <list>
       <item itemvalue="Maven.FixPatternMiner [assembly:assembly]" />
       <item itemvalue="Maven.FixPatternMiner [package]" />
-      <item itemvalue="JUnit.TestActionGenerator.testWithActionExample" />
-      <item itemvalue="JUnit.TestActionGenerator" />
-      <item itemvalue="JUnit.TestRealCases.test_287_A_14208510_14208532" />
       <item itemvalue="JUnit.TestRealCases.test_287_A_14208510_14208532 (1)" />
       <item itemvalue="JUnit.TestIntroClass.test_manybugs_gmp_14166_14167" />
+      <item itemvalue="JUnit.TestRealCases" />
+      <item itemvalue="JUnit.TestPredefinedCases.testIFCase1" />
+      <item itemvalue="JUnit.TestPredefinedCases" />
     </list>
     <recent_temporary>
       <list>
+        <item itemvalue="JUnit.TestPredefinedCases" />
+        <item itemvalue="JUnit.TestPredefinedCases.testIFCase1" />
+        <item itemvalue="JUnit.TestRealCases" />
         <item itemvalue="JUnit.TestIntroClass.test_manybugs_gmp_14166_14167" />
         <item itemvalue="JUnit.TestRealCases.test_287_A_14208510_14208532 (1)" />
-        <item itemvalue="JUnit.TestRealCases.test_287_A_14208510_14208532" />
-        <item itemvalue="JUnit.TestActionGenerator" />
-        <item itemvalue="JUnit.TestActionGenerator.testWithActionExample" />
       </list>
     </recent_temporary>
   </component>
@@ -495,21 +556,6 @@
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="TestTreeUtils_testPostOrderNumbering - 2020.04.09 at 13h 12m 25s.xml">
-      <configuration name="TestTreeUtils.testPostOrderNumbering" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="TestTreeUtils_testPostOrderNumbering - 2020.04.09 at 13h 14m 26s.xml">
-      <configuration name="TestTreeUtils.testPostOrderNumbering" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="TestTreeUtils_testPostOrderNumbering - 2020.04.09 at 13h 15m 40s.xml">
-      <configuration name="TestTreeUtils.testPostOrderNumbering" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="TestTreeUtils_testPostOrderNumbering - 2020.04.09 at 13h 17m 55s.xml">
-      <configuration name="TestTreeUtils.testPostOrderNumbering" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="TestTreeUtils_testPostOrderNumbering - 2020.04.09 at 13h 19m 42s.xml">
-      <configuration name="TestTreeUtils.testPostOrderNumbering" configurationId="JUnit" />
-    </history-entry>
     <history-entry file="TestTreeUtils_testPostOrderNumbering - 2020.04.09 at 13h 19m 51s.xml">
       <configuration name="TestTreeUtils.testPostOrderNumbering" configurationId="JUnit" />
     </history-entry>
@@ -525,13 +571,28 @@
     <history-entry file="TestActionGenerator - 2020.04.09 at 13h 22m 01s.xml">
       <configuration name="TestActionGenerator" configurationId="JUnit" />
     </history-entry>
+    <history-entry file="TestIntroClass_test_manybugs_gmp_14166_14167 - 2020.04.09 at 13h 33m 42s.xml">
+      <configuration name="TestIntroClass.test_manybugs_gmp_14166_14167" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="TestRealCases - 2020.04.09 at 13h 34m 05s.xml">
+      <configuration name="TestRealCases" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="TestPredefinedCases_testIFCase1 - 2020.04.09 at 13h 34m 26s.xml">
+      <configuration name="TestPredefinedCases.testIFCase1" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="TestPredefinedCases - 2020.04.09 at 13h 34m 41s.xml">
+      <configuration name="TestPredefinedCases" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="TestPredefinedCases - 2020.04.09 at 13h 35m 47s.xml">
+      <configuration name="TestPredefinedCases" configurationId="JUnit" />
+    </history-entry>
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1680" height="1050" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49829933" visible="true" weight="0.30708182" />
-      <window_info id="Structure" order="1" sideWeight="0.5017007" side_tool="true" visible="true" weight="0.30708182" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49923897" visible="true" weight="0.30708182" />
+      <window_info id="Structure" order="1" sideWeight="0.50076103" side_tool="true" visible="true" weight="0.30708182" />
       <window_info id="Image Layers" order="2" />
       <window_info id="Designer" order="3" />
       <window_info id="UI Designer" order="4" />
@@ -540,11 +601,11 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" sideWeight="0.4993895" weight="0.32959184" />
       <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4920635" weight="0.32959184" />
-      <window_info active="true" anchor="bottom" id="Debug" order="3" sideWeight="0.4981685" visible="true" weight="0.4" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.4981685" weight="0.4" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Terminal" order="7" sideWeight="0.71428573" weight="0.32959184" />
+      <window_info anchor="bottom" id="Terminal" order="7" sideWeight="0.71428573" visible="true" weight="0.32959184" />
       <window_info anchor="bottom" id="Event Log" order="8" sideWeight="0.50183153" side_tool="true" weight="0.4" />
       <window_info anchor="bottom" id="Version Control" order="9" />
       <window_info anchor="bottom" id="Messages" order="10" sideWeight="0.498779" weight="0.32959184" />
@@ -706,26 +767,6 @@
     </expressions>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/HierarchicalRegrouperForC.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="614">
-          <caret line="430" column="33" selection-start-line="430" selection-start-column="33" selection-end-line="430" selection-end-column="33" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/HierarchicalRegrouper.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="449">
-          <caret line="222" column="64" selection-start-line="222" selection-start-column="64" selection-end-line="222" selection-end-column="64" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/EDiffWorker.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="52">
@@ -781,13 +822,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/.travis.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="15">
-          <caret line="1" column="13" selection-start-line="1" selection-start-column="13" selection-end-line="1" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/python/pairs.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="45">
@@ -1062,27 +1096,48 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/FixPatternMiner/BaseTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="195">
-          <caret line="13" column="23" lean-forward="true" selection-start-line="13" selection-start-column="23" selection-end-line="13" selection-end-column="23" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/FixPatternMiner/HunkParserTest.java">
+    <entry file="file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/HunkParserTest.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="66">
           <caret line="7" column="33" selection-start-line="7" selection-start-column="33" selection-end-line="7" selection-end-column="33" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/FixPatternMiner/TestRealCases.java">
+    <entry file="file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/BaseTest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="225">
-          <caret line="30" column="15" selection-start-line="30" selection-start-column="15" selection-end-line="30" selection-end-column="15" />
+        <state relative-caret-position="60">
+          <caret line="4" column="39" selection-start-line="4" selection-start-column="39" selection-end-line="4" selection-end-column="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/TestIntroClass.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="450">
+          <caret line="30" column="21" selection-start-line="30" selection-start-column="21" selection-end-line="30" selection-end-column="21" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/TestRealCases.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="75">
+          <caret line="13" column="18" selection-start-line="13" selection-start-column="18" selection-end-line="13" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/TestPredefinedCases.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="438">
+          <caret line="86" selection-start-line="86" selection-end-line="86" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/.travis.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" column="27" selection-start-line="2" selection-start-column="27" selection-end-line="2" selection-end-column="27" />
         </state>
       </provider>
     </entry>
@@ -1137,7 +1192,7 @@
       </state>
       <state key="ModuleStructureConfigurable.UI">
         <settings>
-          <last-edited>RichEdit</last-edited>
+          <last-edited>fixminer_source</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
diff --git a/.travis.yml b/.travis.yml
index 2188251..efea235 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: java
 install: true
-script: mvn clean package -DskipTests=true
+script: mvn clean package #-DskipTests=true
 
 #after_success:
 #  - mvn clean test jacoco:report coveralls:report
\ No newline at end of file
diff --git a/richedit/src/test/java/edu/lu/uni/serval/TestPredefinedCases.java b/richedit/src/test/java/edu/lu/uni/serval/TestPredefinedCases.java
index 21795fa..be570e2 100644
--- a/richedit/src/test/java/edu/lu/uni/serval/TestPredefinedCases.java
+++ b/richedit/src/test/java/edu/lu/uni/serval/TestPredefinedCases.java
@@ -35,7 +35,7 @@ public class TestPredefinedCases {
         hierarchicalActionSets.size();
         Assert.assertEquals(hierarchicalActionSets.size(),1);
         Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD if@@if x >= 5 y += 4 @TO@ if x > 5 y += 4 @AT@ 2 @LENGTH@ 16\n" +
-                "---UPD condition@@x >= 5 @TO@ x > 5 @AT@ 2 @LENGTH@ 9\n" +
+                "---UPD condition@@x >= 5 @TO@ x > 5 @AT@ 2 @LENGTH@ 6\n" +
                 "------UPD expr@@x >= 5 @TO@ x > 5 @AT@ 3 @LENGTH@ 6\n" +
                 "---------UPD operator@@>= @TO@ > @AT@ 5 @LENGTH@ 2\n");
 
@@ -58,16 +58,14 @@ public class TestPredefinedCases {
         List<HierarchicalActionSet> hierarchicalActionSets = parser.parseChangedSourceCodeWithGumTree2(prevFile, revFile, srcMLPath,false);
         hierarchicalActionSets.size();
         Assert.assertEquals(hierarchicalActionSets.size(),1);
-        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD for@@i = 0 i < max i ++ if line ] == ' ' if line ] == '\\t' tab ++ @TO@ i = 0 i < max i ++ if line ] == ' ' space ++ if line ] == '\\t' tab ++ @AT@ 4 @LENGTH@ 60\n" +
-                "---UPD block@@if line ] == ' ' if line ] == '\\t' tab ++ @TO@ if line ] == ' ' space ++ if line ] == '\\t' tab ++ @AT@ 26 @LENGTH@ 98\n" +
-                "------UPD if@@if line ] == ' ' @TO@ if line ] == ' ' space ++ @AT@ 33 @LENGTH@ 16\n" +
-                "---------UPD then@@ @TO@ space ++ @AT@ 54 @LENGTH@ 0\n" +
-                "------------UPD block@@ @TO@ space ++ @AT@ 54 @LENGTH@ 22\n" +
-                "---------------INS expr_stmt@@space ++ @TO@ block@@ @AT@ 62 @LENGTH@ 8\n" +
-                "------------------INS expr@@space ++ @TO@ expr_stmt@@space ++ @AT@ 62 @LENGTH@ 8\n" +
-                "---------------------INS name@@space @TO@ expr@@space ++ @AT@ 62 @LENGTH@ 5\n" +
-                "---------------------INS operator@@++ @TO@ expr@@space ++ @AT@ 67 @LENGTH@ 2\n" +
-                "---------------DEL continue@@ @AT@ 62 @LENGTH@ 0\n");
+        Assert.assertEquals(hierarchicalActionSets.get(0).toString(),"UPD if@@if line ][i == ' ' continue; @TO@ if line ][i == ' ' space ++ @AT@ 33 @LENGTH@ 28\n" +
+                "---UPD then@@continue; @TO@ space ++ @AT@ 54 @LENGTH@ 9\n" +
+                "------UPD block@@continue; @TO@ space ++ @AT@ 54 @LENGTH@ 9\n" +
+                "---------INS expr_stmt@@space ++ @TO@ block@@continue; @AT@ 62 @LENGTH@ 8\n" +
+                "------------INS expr@@space ++ @TO@ expr_stmt@@space ++ @AT@ 62 @LENGTH@ 8\n" +
+                "---------------INS name@@space @TO@ expr@@space ++ @AT@ 62 @LENGTH@ 5\n" +
+                "---------------INS operator@@++ @TO@ expr@@space ++ @AT@ 67 @LENGTH@ 2\n" +
+                "---------DEL continue@@continue; @AT@ 62 @LENGTH@ 9\n");
 
     }
     @Test