diff --git a/src/main/java/soot/JimpleBodyPack.java b/src/main/java/soot/JimpleBodyPack.java
index 7767c20e639..b2a25a56f2f 100644
--- a/src/main/java/soot/JimpleBodyPack.java
+++ b/src/main/java/soot/JimpleBodyPack.java
@@ -92,6 +92,7 @@ private void applyPhaseOptions(JimpleBody b, Map<String, String> opts) {
     pacman.getTransform("jb.lp").apply(b); // LocalPacker
     pacman.getTransform("jb.ne").apply(b); // NopEliminator
     pacman.getTransform("jb.uce").apply(b); // UnreachableCodeEliminator: Again, we might have new dead code
+    pacman.getTransform("jb.cp").apply(b); // CopyPropagator
 
     // LocalNameStandardizer: After all these changes, some locals
     // may end up being eliminated. If we want a stable local iteration
diff --git a/src/test/java/soot/portedtest/RedundantJimpleStatementsTest.java b/src/test/java/soot/portedtest/RedundantJimpleStatementsTest.java
index ab51952a5f7..1027b68433a 100644
--- a/src/test/java/soot/portedtest/RedundantJimpleStatementsTest.java
+++ b/src/test/java/soot/portedtest/RedundantJimpleStatementsTest.java
@@ -22,6 +22,7 @@
  * #L%
  */
 
+import com.google.common.base.Joiner;
 import org.junit.Ignore;
 import org.junit.Test;
 import soot.*;
@@ -58,23 +59,28 @@ public void loadClasses(String first, String... more) {
         Options.v().set_output_format(Options.output_format_jimple);
         Options.v().set_allow_phantom_refs(true);
         Options.v().set_ignore_resolving_levels(true);
+        PhaseOptions.v().setPhaseOption("jb", "stabilize-local-names:true");
+
         Scene.v().loadNecessaryClasses();
     }
 
-    private List<String> bodyStmtsAsStrings(Body body) {
-        List<String> contentList = new ArrayList<>();
-        for (Unit stmt : body.getUnits()) {
-            contentList.add(stmt.toString());
-        }
-        return contentList;
+    private String bodyStmtsAsString(Body body) {
+        return Joiner.on('\n').join(body.getUnits());
     }
 
     private void assertJimpleStmts(SootMethod method, List<String> expectedStmts) {
         Body body = method.retrieveActiveBody();
         assertNotNull(body);
-        List<String> actualStmts = bodyStmtsAsStrings(body);
+        String actualStmts = bodyStmtsAsString(body);
+
+        String exp = Joiner.on('\n').join(expectedStmts);
+        if (!exp.equals(actualStmts)) {
+            //Use a custom error message which is nicely readable;
+            //JUnits assertEquals mangles with the text, which makes it harder to retrieve the ground truth
+            throw new AssertionError(String.format("Expected:\n%s\n\nWas:\n%s", exp, actualStmts));
+        }
 
-        assertEquals(expectedStmts, actualStmts);
+}
     }
 
     @Test
@@ -82,28 +88,28 @@ public void test01() {
         loadClasses(resourcePath, "java8", "bin");
         SootMethod method = Scene.v().getMethod("<MethodAcceptingLamExpr: void lambdaAsParamMethod()>");
         List<String> expectedBodyStmts = Stream.of(
-                "r6 := @this: MethodAcceptingLamExpr",
-                "r0 = staticinvoke <MethodAcceptingLamExpr$lambda_lambdaAsParamMethod_0__1: Percentage bootstrap$()>()",
-                "$r2 = <java.lang.System: java.io.PrintStream out>",
-                "$r1 = new java.lang.StringBuilder",
-                "specialinvoke $r1.<java.lang.StringBuilder: void <init>()>()",
-                "$r3 = virtualinvoke $r1.<java.lang.StringBuilder: java.lang.StringBuilder append(java.lang.String)>(\"Percentage : \")",
-                "$d0 = interfaceinvoke r0.<Percentage: double calcPercentage(double)>(45.0)",
-                "$r4 = virtualinvoke $r3.<java.lang.StringBuilder: java.lang.StringBuilder append(double)>($d0)",
-                "$r5 = virtualinvoke $r4.<java.lang.StringBuilder: java.lang.String toString()>()",
-                "virtualinvoke $r2.<java.io.PrintStream: void println(java.lang.String)>($r5)",
-                "return").collect(Collectors.toCollection(ArrayList::new));
+        		"r0 := @this: MethodAcceptingLamExpr",
+        		"r1 = staticinvoke <MethodAcceptingLamExpr$lambda_lambdaAsParamMethod_0__1: Percentage bootstrap$()>()",
+        		"$r2 = <java.lang.System: java.io.PrintStream out>",
+        		"$r4 = new java.lang.StringBuilder",
+        		"specialinvoke $r4.<java.lang.StringBuilder: void <init>()>()",
+        		"$r5 = virtualinvoke $r4.<java.lang.StringBuilder: java.lang.StringBuilder append(java.lang.String)>(\"Percentage : \")",
+        		"$d0 = interfaceinvoke r1.<Percentage: double calcPercentage(double)>(45.0)",
+        		"$r6 = virtualinvoke $r5.<java.lang.StringBuilder: java.lang.StringBuilder append(double)>($d0)",
+        		"$r3 = virtualinvoke $r6.<java.lang.StringBuilder: java.lang.String toString()>()",
+        		"virtualinvoke $r2.<java.io.PrintStream: void println(java.lang.String)>($r3)",
+        		"return"
+        		).collect(Collectors.toCollection(ArrayList::new));
         assertJimpleStmts(method, expectedBodyStmts);
     }
 
     @Test
     public void test02() {
         loadClasses(resourcePath, "java9", "bin");
-        List<String> expectedBodyStmts = Stream.of(
-                "r1 = dynamicinvoke \"makeConcatWithConstants\" <java.lang.String (java.lang.String)>(\"This test\") <java.lang.invoke.StringConcatFactory: java.lang.invoke.CallSite makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup,java.lang.String,java.lang.invoke.MethodType,java.lang.String,java.lang.Object[])>(\"\\u0001 is cool\")",
-                "$r0 = <java.lang.System: java.io.PrintStream out>",
-                "virtualinvoke $r0.<java.io.PrintStream: void println(java.lang.String)>(r1)",
-                "return").collect(Collectors.toCollection(ArrayList::new));
+        List<String> expectedBodyStmts = Stream.of("r1 = dynamicinvoke \"makeConcatWithConstants\" <java.lang.String (java.lang.String)>(\"This test\") <java.lang.invoke.StringConcatFactory: java.lang.invoke.CallSite makeConcatWithConstants(java.lang.invoke.MethodHandles$Lookup,java.lang.String,java.lang.invoke.MethodType,java.lang.String,java.lang.Object[])>(\"\\u0001 is cool\")",
+        		"$r0 = <java.lang.System: java.io.PrintStream out>",
+        		"virtualinvoke $r0.<java.io.PrintStream: void println(java.lang.String)>(r1)",
+        		"return").collect(Collectors.toCollection(ArrayList::new));
         SootMethod method = Scene.v().getMethod("<DynamicInvoke: void stringConcatenation()>");
         assertJimpleStmts(method, expectedBodyStmts);
     }
@@ -112,14 +118,14 @@ public void test02() {
     public void test03() {
         loadClasses(resourcePath, "java11", "bin");
         List<String> expectedBodyStmts = Stream.of(
-                "r5 := @this: TypeInferenceLambda",
-                "r0 = staticinvoke <TypeInferenceLambda$lambda_lambda_0__1: java.util.function.BinaryOperator bootstrap$()>()",
-                "$r2 = staticinvoke <java.lang.Integer: java.lang.Integer valueOf(int)>(2)",
-                "$r1 = staticinvoke <java.lang.Integer: java.lang.Integer valueOf(int)>(3)",
-                "$r3 = interfaceinvoke r0.<java.util.function.BinaryOperator: java.lang.Object apply(java.lang.Object,java.lang.Object)>($r2, $r1)",
-                "$r4 = (java.lang.Integer) $r3",
-                "virtualinvoke $r4.<java.lang.Integer: int intValue()>()",
-                "return").collect(Collectors.toCollection(ArrayList::new));
+        		"r0 := @this: TypeInferenceLambda",
+        		"r5 = staticinvoke <TypeInferenceLambda$lambda_lambda_0__1: java.util.function.BinaryOperator bootstrap$()>()",
+        		"$r1 = staticinvoke <java.lang.Integer: java.lang.Integer valueOf(int)>(2)",
+        		"$r2 = staticinvoke <java.lang.Integer: java.lang.Integer valueOf(int)>(3)",
+        		"$r4 = interfaceinvoke r5.<java.util.function.BinaryOperator: java.lang.Object apply(java.lang.Object,java.lang.Object)>($r1, $r2)",
+        		"$r3 = (java.lang.Integer) $r4",
+        		"virtualinvoke $r3.<java.lang.Integer: int intValue()>()",
+        		"return").collect(Collectors.toCollection(ArrayList::new));
         SootMethod method = Scene.v().getMethod("<TypeInferenceLambda: void lambda()>");
         assertJimpleStmts(method, expectedBodyStmts);
     }
@@ -129,9 +135,9 @@ public void test04() {
         loadClasses(resourcePath, "java6", "bin");
 
         List<String> expectedBodyStmts = Stream.of(
-                "r0 := @this: Autoboxing",
-                "staticinvoke <java.lang.Integer: java.lang.Integer valueOf(int)>(6)",
-                "return").collect(Collectors.toCollection(ArrayList::new));
+        		"r0 := @this: Autoboxing",
+        		"staticinvoke <java.lang.Integer: java.lang.Integer valueOf(int)>(6)",
+        		"return").collect(Collectors.toCollection(ArrayList::new));
         SootMethod method = Scene.v().getMethod("<Autoboxing: void autoboxing()>");
         assertJimpleStmts(method, expectedBodyStmts);
     }
@@ -141,54 +147,54 @@ public void test05() {
         loadClasses(resourcePath, "java6", "bin");
 
         List<String> expectedBodyStmts = Stream.of(
-                "r12 := @this: GenTypeParam",
-                "$r0 = new java.util.ArrayList",
-                "specialinvoke $r0.<java.util.ArrayList: void <init>(int)>(3)",
-                "$r1 = newarray (java.lang.Integer)[3]",
-                "$r2 = staticinvoke <java.lang.Integer: java.lang.Integer valueOf(int)>(1)",
-                "$r1[0] = $r2",
-                "$r3 = staticinvoke <java.lang.Integer: java.lang.Integer valueOf(int)>(2)",
-                "$r1[1] = $r3",
-                "$r4 = staticinvoke <java.lang.Integer: java.lang.Integer valueOf(int)>(3)",
-                "$r1[2] = $r4",
-                "r5 = staticinvoke <java.util.Arrays: java.util.List asList(java.lang.Object[])>($r1)",
-                "$r6 = new GenTypeParam",
-                "specialinvoke $r6.<GenTypeParam: void <init>()>()",
-                "virtualinvoke $r6.<GenTypeParam: void copy(java.util.List,java.util.List)>($r0, r5)",
-                "$r7 = <java.lang.System: java.io.PrintStream out>",
-                "$r10 = staticinvoke <java.lang.Integer: java.lang.Integer valueOf(int)>(2)",
-                "$r9 = staticinvoke <java.lang.Integer: java.lang.Integer valueOf(int)>(8)",
-                "$r8 = staticinvoke <java.lang.Integer: java.lang.Integer valueOf(int)>(3)",
-                "$r11 = virtualinvoke $r6.<GenTypeParam: java.lang.Number largestNum(java.lang.Number,java.lang.Number,java.lang.Number)>($r10, $r9, $r8)",
-                "virtualinvoke $r7.<java.io.PrintStream: void println(java.lang.Object)>($r11)",
-                "return").collect(Collectors.toCollection(ArrayList::new));
+        		"r00 := @this: GenTypeParam",
+        		"$r11 = new java.util.ArrayList",
+        		"specialinvoke $r11.<java.util.ArrayList: void <init>(int)>(3)",
+        		"$r09 = newarray (java.lang.Integer)[3]",
+        		"$r03 = staticinvoke <java.lang.Integer: java.lang.Integer valueOf(int)>(1)",
+        		"$r09[0] = $r03",
+        		"$r04 = staticinvoke <java.lang.Integer: java.lang.Integer valueOf(int)>(2)",
+        		"$r09[1] = $r04",
+        		"$r05 = staticinvoke <java.lang.Integer: java.lang.Integer valueOf(int)>(3)",
+        		"$r09[2] = $r05",
+        		"r12 = staticinvoke <java.util.Arrays: java.util.List asList(java.lang.Object[])>($r09)",
+        		"$r01 = new GenTypeParam",
+        		"specialinvoke $r01.<GenTypeParam: void <init>()>()",
+        		"virtualinvoke $r01.<GenTypeParam: void copy(java.util.List,java.util.List)>($r11, r12)",
+        		"$r02 = <java.lang.System: java.io.PrintStream out>",
+        		"$r06 = staticinvoke <java.lang.Integer: java.lang.Integer valueOf(int)>(2)",
+        		"$r07 = staticinvoke <java.lang.Integer: java.lang.Integer valueOf(int)>(8)",
+        		"$r08 = staticinvoke <java.lang.Integer: java.lang.Integer valueOf(int)>(3)",
+        		"$r10 = virtualinvoke $r01.<GenTypeParam: java.lang.Number largestNum(java.lang.Number,java.lang.Number,java.lang.Number)>($r06, $r07, $r08)",
+        		"virtualinvoke $r02.<java.io.PrintStream: void println(java.lang.Object)>($r10)",
+        		"return").collect(Collectors.toCollection(ArrayList::new));
         SootMethod method = Scene.v().getMethod("<GenTypeParam: void geneTypeParamDisplay()>");
         assertJimpleStmts(method, expectedBodyStmts);
     }
 
     @Test
-    @Ignore("The variable names r10 and r11 may be used in swapped order")
     public void test06() {
         loadClasses(resourcePath, "java6", "bin");
         List<String> expectedBodyStmts = Stream.of(
-                "r9 := @this: Reflection",
-                "$r0 = new Reflection",
-                "specialinvoke $r0.<Reflection: void <init>()>()",
-                "r1 = class \"LReflection;\"",
-                "r11 = class \"LReflection;\"",
-                "r10 = class \"LReflection;\"",
-                "$r2 = <java.lang.System: java.io.PrintStream out>",
-                "virtualinvoke $r2.<java.io.PrintStream: void println(java.lang.Object)>(class \"LReflection;\")",
-                "$r3 = newarray (java.lang.Class)[0]",
-                "r4 = virtualinvoke r11.<java.lang.Class: java.lang.reflect.Constructor getConstructor(java.lang.Class[])>($r3)",
-                "$r5 = <java.lang.System: java.io.PrintStream out>",
-                "$r6 = virtualinvoke r4.<java.lang.reflect.Constructor: java.lang.String getName()>()",
-                "virtualinvoke $r5.<java.io.PrintStream: void println(java.lang.String)>($r6)",
-                "$r7 = <java.lang.System: java.io.PrintStream out>",
-                "$r8 = virtualinvoke r10.<java.lang.Class: java.lang.reflect.Method[] getMethods()>()",
-                "$i0 = lengthof $r8",
-                "virtualinvoke $r7.<java.io.PrintStream: void println(int)>($i0)",
-                "return").collect(Collectors.toCollection(ArrayList::new));
+        		"r00 := @this: Reflection",
+        		"$r01 = new Reflection",
+        		"specialinvoke $r01.<Reflection: void <init>()>()",
+        		"r05 = class \"LReflection;\"",
+        		"r06 = class \"LReflection;\"",
+        		"r07 = class \"LReflection;\"",
+        		"$r02 = <java.lang.System: java.io.PrintStream out>",
+        		"virtualinvoke $r02.<java.io.PrintStream: void println(java.lang.Object)>(class \"LReflection;\")",
+        		"$r08 = newarray (java.lang.Class)[0]",
+        		"r10 = virtualinvoke r06.<java.lang.Class: java.lang.reflect.Constructor getConstructor(java.lang.Class[])>($r08)",
+        		"$r03 = <java.lang.System: java.io.PrintStream out>",
+        		"$r09 = virtualinvoke r10.<java.lang.reflect.Constructor: java.lang.String getName()>()",
+        		"virtualinvoke $r03.<java.io.PrintStream: void println(java.lang.String)>($r09)",
+        		"$r04 = <java.lang.System: java.io.PrintStream out>",
+        		"$r11 = virtualinvoke r07.<java.lang.Class: java.lang.reflect.Method[] getMethods()>()",
+        		"$i00 = lengthof $r11",
+        		"virtualinvoke $r04.<java.io.PrintStream: void println(int)>($i00)",
+        		"return"
+        		).collect(Collectors.toCollection(ArrayList::new));
         SootMethod method = Scene.v().getMethod("<Reflection: void checkReflection()>");
         assertJimpleStmts(method, expectedBodyStmts);
     }
@@ -197,20 +203,20 @@ public void test06() {
     public void test07() {
         loadClasses(resourcePath, "java6", "bin");
         List<String> expectedBodyStmts = Stream.of(
-                "r7 := @this: UncheckedCast",
-                "$r0 = newarray (java.lang.Integer)[4]",
-                "$r1 = staticinvoke <java.lang.Integer: java.lang.Integer valueOf(int)>(5)",
-                "$r0[0] = $r1",
-                "$r2 = staticinvoke <java.lang.Integer: java.lang.Integer valueOf(int)>(8)",
-                "$r0[1] = $r2",
-                "$r3 = staticinvoke <java.lang.Integer: java.lang.Integer valueOf(int)>(9)",
-                "$r0[2] = $r3",
-                "$r4 = staticinvoke <java.lang.Integer: java.lang.Integer valueOf(int)>(6)",
-                "$r0[3] = $r4",
-                "r5 = staticinvoke <java.util.Arrays: java.util.List asList(java.lang.Object[])>($r0)",
-                "$r6 = <java.lang.System: java.io.PrintStream out>",
-                "virtualinvoke $r6.<java.io.PrintStream: void println(java.lang.Object)>(r5)",
-                "return").collect(Collectors.toCollection(ArrayList::new));
+        		"r0 := @this: UncheckedCast",
+        		"$r6 = newarray (java.lang.Integer)[4]",
+        		"$r2 = staticinvoke <java.lang.Integer: java.lang.Integer valueOf(int)>(5)",
+        		"$r6[0] = $r2",
+        		"$r3 = staticinvoke <java.lang.Integer: java.lang.Integer valueOf(int)>(8)",
+        		"$r6[1] = $r3",
+        		"$r4 = staticinvoke <java.lang.Integer: java.lang.Integer valueOf(int)>(9)",
+        		"$r6[2] = $r4",
+        		"$r5 = staticinvoke <java.lang.Integer: java.lang.Integer valueOf(int)>(6)",
+        		"$r6[3] = $r5",
+        		"r7 = staticinvoke <java.util.Arrays: java.util.List asList(java.lang.Object[])>($r6)",
+        		"$r1 = <java.lang.System: java.io.PrintStream out>",
+        		"virtualinvoke $r1.<java.io.PrintStream: void println(java.lang.Object)>(r7)",
+        		"return").collect(Collectors.toCollection(ArrayList::new));
         SootMethod method = Scene.v().getMethod("<UncheckedCast: void uncheckedCastDisplay()>");
         assertJimpleStmts(method, expectedBodyStmts);
     }
@@ -219,14 +225,14 @@ public void test07() {
     public void test08() {
         loadClasses(resourcePath, "java11", "bin");
         List<String> expectedBodyStmts = Stream.of(
-                "r5 := @this: TypeInferenceLambda",
-                "r0 = staticinvoke <TypeInferenceLambda$lambda_lambda_0__1: java.util.function.BinaryOperator bootstrap$()>()",
-                "$r2 = staticinvoke <java.lang.Integer: java.lang.Integer valueOf(int)>(2)",
-                "$r1 = staticinvoke <java.lang.Integer: java.lang.Integer valueOf(int)>(3)",
-                "$r3 = interfaceinvoke r0.<java.util.function.BinaryOperator: java.lang.Object apply(java.lang.Object,java.lang.Object)>($r2, $r1)",
-                "$r4 = (java.lang.Integer) $r3",
-                "virtualinvoke $r4.<java.lang.Integer: int intValue()>()",
-                "return").collect(Collectors.toCollection(ArrayList::new));
+        		"r0 := @this: TypeInferenceLambda",
+        		"r5 = staticinvoke <TypeInferenceLambda$lambda_lambda_0__1: java.util.function.BinaryOperator bootstrap$()>()",
+        		"$r1 = staticinvoke <java.lang.Integer: java.lang.Integer valueOf(int)>(2)",
+        		"$r2 = staticinvoke <java.lang.Integer: java.lang.Integer valueOf(int)>(3)",
+        		"$r4 = interfaceinvoke r5.<java.util.function.BinaryOperator: java.lang.Object apply(java.lang.Object,java.lang.Object)>($r1, $r2)",
+        		"$r3 = (java.lang.Integer) $r4",
+        		"virtualinvoke $r3.<java.lang.Integer: int intValue()>()",
+        		"return").collect(Collectors.toCollection(ArrayList::new));
 
         SootMethod method = Scene.v().getMethod("<TypeInferenceLambda: void lambda()>");
         assertJimpleStmts(method, expectedBodyStmts);
@@ -237,16 +243,17 @@ public void test08() {
     public void test09() {
         loadClasses(resourcePath, "java9", "bin");
         List<String> expectedBodyStmts = Stream.of(
-                "r1 := @this: AnonymousDiamondOperator",
-                        "$r6 = new AnonymousDiamondOperator$1",
-                        "specialinvoke $r6.<AnonymousDiamondOperator$1: void <init>(AnonymousDiamondOperator)>(r1)",
-                        "$r3 = staticinvoke <java.lang.Integer: java.lang.Integer valueOf(int)>(22)",
-                        "$r2 = staticinvoke <java.lang.Integer: java.lang.Integer valueOf(int)>(23)",
-                        "$r7 = (MyClass) $r6",
-                        "$r4 = virtualinvoke $r7.<MyClass: java.lang.Object add(java.lang.Object,java.lang.Object)>($r3, $r2)",
-                        "r5 = (java.lang.Integer) $r4",
-                        "$i0 = virtualinvoke r5.<java.lang.Integer: int intValue()>()",
-                        "return $i0").collect(Collectors.toCollection(ArrayList::new));
+        		"r0 := @this: AnonymousDiamondOperator",
+        		"$r1 = new AnonymousDiamondOperator$1",
+        		"specialinvoke $r1.<AnonymousDiamondOperator$1: void <init>(AnonymousDiamondOperator)>(r0)",
+        		"$r3 = staticinvoke <java.lang.Integer: java.lang.Integer valueOf(int)>(22)",
+        		"$r4 = staticinvoke <java.lang.Integer: java.lang.Integer valueOf(int)>(23)",
+        		"$r2 = (MyClass) $r1",
+        		"$r7 = virtualinvoke $r2.<MyClass: java.lang.Object add(java.lang.Object,java.lang.Object)>($r3, $r4)",
+        		"$r5 = (java.lang.Integer) $r7",
+        		"r6 = $r5",
+        		"$i0 = virtualinvoke r6.<java.lang.Integer: int intValue()>()",
+        		"return $i0").collect(Collectors.toCollection(ArrayList::new));
         SootMethod method = Scene.v().getMethod("<AnonymousDiamondOperator: int innerClassDiamond()>");
         assertJimpleStmts(method, expectedBodyStmts);
     }
@@ -255,17 +262,17 @@ public void test09() {
     public void test10() {
         loadClasses(resourcePath, "java6", "bin");
         List<String> expectedBodyStmts = Stream.of(
-                "r3 := @this: DeclareEnum",
-                        "r0 = staticinvoke <DeclareEnum$Type: DeclareEnum$Type[] values()>()",
-                        "i0 = lengthof r0",
-                        "i1 = 0",
-                        "if i1 >= i0 goto return",
-                        "r1 = r0[i1]",
-                        "$r2 = <java.lang.System: java.io.PrintStream out>",
-                        "virtualinvoke $r2.<java.io.PrintStream: void println(java.lang.Object)>(r1)",
-                        "i1 = i1 + 1",
-                        "goto [?= (branch)]",
-                        "return").collect(Collectors.toCollection(ArrayList::new));
+        		"r0 := @this: DeclareEnum",
+        		"r2 = staticinvoke <DeclareEnum$Type: DeclareEnum$Type[] values()>()",
+        		"i0 = lengthof r2",
+        		"i1 = 0",
+        		"if i1 >= i0 goto return",
+        		"r1 = r2[i1]",
+        		"$r3 = <java.lang.System: java.io.PrintStream out>",
+        		"virtualinvoke $r3.<java.io.PrintStream: void println(java.lang.Object)>(r1)",
+        		"i1 = i1 + 1",
+        		"goto [?= (branch)]",
+        		"return").collect(Collectors.toCollection(ArrayList::new));
         SootMethod method = Scene.v().getMethod("<DeclareEnum: void declareEnum()>");
         assertJimpleStmts(method, expectedBodyStmts);
     }
@@ -274,15 +281,15 @@ public void test10() {
     public void test11() {
         loadClasses(resourcePath, "java6", "bin");
         List<String> expectedBodyStmts = Stream.of(
-                "r1 := @this: GenericTypeParamOnClass",
-                        "$r0 = new GenericTypeParamOnClass$A",
-                        "specialinvoke $r0.<GenericTypeParamOnClass$A: void <init>(GenericTypeParamOnClass)>(r1)",
-                        "$r2 = staticinvoke <java.lang.Integer: java.lang.Integer valueOf(int)>(5)",
-                        "staticinvoke <GenericTypeParamOnClass$A: void access$000(GenericTypeParamOnClass$A,java.lang.Object)>($r0, $r2)",
-                        "$r3 = virtualinvoke $r0.<GenericTypeParamOnClass$A: java.lang.Object get()>()",
-                        "$r4 = (java.lang.Integer) $r3",
-                        "virtualinvoke $r4.<java.lang.Integer: int intValue()>()",
-                        "return").collect(Collectors.toCollection(ArrayList::new));
+        		"r0 := @this: GenericTypeParamOnClass",
+        		"$r1 = new GenericTypeParamOnClass$A",
+        		"specialinvoke $r1.<GenericTypeParamOnClass$A: void <init>(GenericTypeParamOnClass)>(r0)",
+        		"$r2 = staticinvoke <java.lang.Integer: java.lang.Integer valueOf(int)>(5)",
+        		"staticinvoke <GenericTypeParamOnClass$A: void access$000(GenericTypeParamOnClass$A,java.lang.Object)>($r1, $r2)",
+        		"$r4 = virtualinvoke $r1.<GenericTypeParamOnClass$A: java.lang.Object get()>()",
+        		"$r3 = (java.lang.Integer) $r4",
+        		"virtualinvoke $r3.<java.lang.Integer: int intValue()>()",
+        		"return").collect(Collectors.toCollection(ArrayList::new));
         SootMethod method = Scene.v().getMethod("<GenericTypeParamOnClass: void genericTypeParamOnClass()>");
         assertJimpleStmts(method, expectedBodyStmts);
     }