diff --git a/endtoend-testing/src/test/resources/results/java/sortAlgo.json b/endtoend-testing/src/test/resources/results/java/sortAlgo.json
index dc4679a87..70c8ebbbc 100644
--- a/endtoend-testing/src/test/resources/results/java/sortAlgo.json
+++ b/endtoend-testing/src/test/resources/results/java/sortAlgo.json
@@ -4,9 +4,9 @@
   },
   "tests" : {
     "SortAlgo-SortAlgo5" : {
-      "minimal_similarity" : 0.6046511627906976,
-      "maximum_similarity" : 0.6341463414634146,
-      "matched_token_number" : 26
+      "minimal_similarity" : 0.6511627906976745,
+      "maximum_similarity" : 0.6829268292682927,
+      "matched_token_number" : 28
     },
     "SortAlgo-SortAlgo6" : {
       "minimal_similarity" : 0.6122448979591837,
@@ -19,9 +19,9 @@
       "matched_token_number" : 38
     },
     "SortAlgo3_5-SortAlgo3_6" : {
-      "minimal_similarity" : 0.6428571428571429,
-      "maximum_similarity" : 0.6428571428571429,
-      "matched_token_number" : 36
+      "minimal_similarity" : 0.7142857142857143,
+      "maximum_similarity" : 0.7142857142857143,
+      "matched_token_number" : 40
     },
     "SortAlgo6-SortAlgo7" : {
       "minimal_similarity" : 0.44642857142857145,
@@ -64,9 +64,9 @@
       "matched_token_number" : 33
     },
     "SortAlgo1_3-SortAlgo5" : {
-      "minimal_similarity" : 0.3620689655172414,
-      "maximum_similarity" : 0.4883720930232558,
-      "matched_token_number" : 21
+      "minimal_similarity" : 0.4482758620689655,
+      "maximum_similarity" : 0.6046511627906976,
+      "matched_token_number" : 26
     },
     "SortAlgo-SortAlgo4" : {
       "minimal_similarity" : 0.7906976744186046,
@@ -79,9 +79,9 @@
       "matched_token_number" : 30
     },
     "SortAlgo2-SortAlgo2_5" : {
-      "minimal_similarity" : 0.6046511627906976,
-      "maximum_similarity" : 0.6341463414634146,
-      "matched_token_number" : 26
+      "minimal_similarity" : 0.6511627906976745,
+      "maximum_similarity" : 0.6829268292682927,
+      "matched_token_number" : 28
     },
     "SortAlgo1_2-SortAlgo2" : {
       "minimal_similarity" : 0.7454545454545455,
@@ -94,9 +94,9 @@
       "matched_token_number" : 34
     },
     "SortAlgo5-SortAlgo6" : {
-      "minimal_similarity" : 0.46938775510204084,
-      "maximum_similarity" : 0.5348837209302325,
-      "matched_token_number" : 23
+      "minimal_similarity" : 0.5510204081632653,
+      "maximum_similarity" : 0.627906976744186,
+      "matched_token_number" : 27
     },
     "SortAlgo1_2-SortAlgo4" : {
       "minimal_similarity" : 0.7272727272727273,
@@ -104,14 +104,14 @@
       "matched_token_number" : 40
     },
     "SortAlgo5-SortAlgo7" : {
-      "minimal_similarity" : 0.3392857142857143,
-      "maximum_similarity" : 0.4418604651162791,
-      "matched_token_number" : 19
+      "minimal_similarity" : 0.375,
+      "maximum_similarity" : 0.4883720930232558,
+      "matched_token_number" : 21
     },
     "SortAlgo1_2-SortAlgo5" : {
-      "minimal_similarity" : 0.4727272727272727,
-      "maximum_similarity" : 0.6046511627906976,
-      "matched_token_number" : 26
+      "minimal_similarity" : 0.5636363636363636,
+      "maximum_similarity" : 0.7209302325581395,
+      "matched_token_number" : 31
     },
     "SortAlgo1_2-SortAlgo6" : {
       "minimal_similarity" : 0.5454545454545454,
@@ -124,9 +124,9 @@
       "matched_token_number" : 44
     },
     "SortAlgo1-SortAlgo2_5" : {
-      "minimal_similarity" : 0.6046511627906976,
-      "maximum_similarity" : 0.6341463414634146,
-      "matched_token_number" : 26
+      "minimal_similarity" : 0.6511627906976745,
+      "maximum_similarity" : 0.6829268292682927,
+      "matched_token_number" : 28
     },
     "SortAlgo1_3-SortAlgo3_6" : {
       "minimal_similarity" : 0.7758620689655172,
@@ -134,9 +134,9 @@
       "matched_token_number" : 45
     },
     "SortAlgo4-SortAlgo5" : {
-      "minimal_similarity" : 0.5813953488372093,
-      "maximum_similarity" : 0.5813953488372093,
-      "matched_token_number" : 25
+      "minimal_similarity" : 0.627906976744186,
+      "maximum_similarity" : 0.627906976744186,
+      "matched_token_number" : 27
     },
     "SortAlgo4-SortAlgo6" : {
       "minimal_similarity" : 0.5306122448979592,
@@ -149,9 +149,9 @@
       "matched_token_number" : 33
     },
     "SortAlgo1_4-SortAlgo3_5" : {
-      "minimal_similarity" : 0.35714285714285715,
-      "maximum_similarity" : 0.46511627906976744,
-      "matched_token_number" : 20
+      "minimal_similarity" : 0.42857142857142855,
+      "maximum_similarity" : 0.5581395348837209,
+      "matched_token_number" : 24
     },
     "SortAlgo1_4-SortAlgo3_6" : {
       "minimal_similarity" : 0.5535714285714286,
@@ -159,9 +159,9 @@
       "matched_token_number" : 31
     },
     "SortAlgo1_5-SortAlgo3_6" : {
-      "minimal_similarity" : 0.39285714285714285,
-      "maximum_similarity" : 0.5116279069767442,
-      "matched_token_number" : 22
+      "minimal_similarity" : 0.5,
+      "maximum_similarity" : 0.6511627906976745,
+      "matched_token_number" : 28
     },
     "SortAlgo1_5-SortAlgo3_5" : {
       "minimal_similarity" : 0.6607142857142857,
@@ -169,9 +169,9 @@
       "matched_token_number" : 37
     },
     "SortAlgo1_6-SortAlgo3_5" : {
-      "minimal_similarity" : 0.39285714285714285,
-      "maximum_similarity" : 0.5116279069767442,
-      "matched_token_number" : 22
+      "minimal_similarity" : 0.4642857142857143,
+      "maximum_similarity" : 0.6046511627906976,
+      "matched_token_number" : 26
     },
     "SortAlgo-SortAlgo4d3" : {
       "minimal_similarity" : 0.8297872340425532,
@@ -199,9 +199,9 @@
       "matched_token_number" : 35
     },
     "SortAlgo3-SortAlgo3_5" : {
-      "minimal_similarity" : 0.6428571428571429,
-      "maximum_similarity" : 0.6666666666666666,
-      "matched_token_number" : 36
+      "minimal_similarity" : 0.6785714285714286,
+      "maximum_similarity" : 0.7037037037037037,
+      "matched_token_number" : 38
     },
     "SortAlgo1_4-SortAlgo4" : {
       "minimal_similarity" : 0.9534883720930233,
@@ -224,14 +224,14 @@
       "matched_token_number" : 32
     },
     "SortAlgo1_4-SortAlgo5" : {
-      "minimal_similarity" : 0.5348837209302325,
-      "maximum_similarity" : 0.5348837209302325,
-      "matched_token_number" : 23
+      "minimal_similarity" : 0.6046511627906976,
+      "maximum_similarity" : 0.6046511627906976,
+      "matched_token_number" : 26
     },
     "SortAlgo2-SortAlgo3_5" : {
-      "minimal_similarity" : 0.375,
-      "maximum_similarity" : 0.5121951219512195,
-      "matched_token_number" : 21
+      "minimal_similarity" : 0.4107142857142857,
+      "maximum_similarity" : 0.5609756097560976,
+      "matched_token_number" : 23
     },
     "SortAlgo1_4-SortAlgo6" : {
       "minimal_similarity" : 0.6530612244897959,
@@ -249,9 +249,9 @@
       "matched_token_number" : 26
     },
     "SortAlgo1-SortAlgo3_5" : {
-      "minimal_similarity" : 0.375,
-      "maximum_similarity" : 0.5121951219512195,
-      "matched_token_number" : 21
+      "minimal_similarity" : 0.4107142857142857,
+      "maximum_similarity" : 0.5609756097560976,
+      "matched_token_number" : 23
     },
     "SortAlgo-SortAlgo1_2" : {
       "minimal_similarity" : 0.7454545454545455,
@@ -259,14 +259,14 @@
       "matched_token_number" : 41
     },
     "SortAlgo1_3-SortAlgo3_5" : {
-      "minimal_similarity" : 0.5172413793103449,
-      "maximum_similarity" : 0.5357142857142857,
-      "matched_token_number" : 30
+      "minimal_similarity" : 0.603448275862069,
+      "maximum_similarity" : 0.625,
+      "matched_token_number" : 35
     },
     "SortAlgo1_2-SortAlgo3_5" : {
-      "minimal_similarity" : 0.375,
-      "maximum_similarity" : 0.38181818181818183,
-      "matched_token_number" : 21
+      "minimal_similarity" : 0.4642857142857143,
+      "maximum_similarity" : 0.4727272727272727,
+      "matched_token_number" : 26
     },
     "SortAlgo1_2-SortAlgo3_6" : {
       "minimal_similarity" : 0.5714285714285714,
@@ -279,9 +279,9 @@
       "matched_token_number" : 34
     },
     "SortAlgo-SortAlgo1_5" : {
-      "minimal_similarity" : 0.6046511627906976,
-      "maximum_similarity" : 0.6341463414634146,
-      "matched_token_number" : 26
+      "minimal_similarity" : 0.6511627906976745,
+      "maximum_similarity" : 0.6829268292682927,
+      "matched_token_number" : 28
     },
     "SortAlgo-SortAlgo1_4" : {
       "minimal_similarity" : 0.8372093023255814,
@@ -309,9 +309,9 @@
       "matched_token_number" : 34
     },
     "SortAlgo4d2-SortAlgo5" : {
-      "minimal_similarity" : 0.4897959183673469,
-      "maximum_similarity" : 0.5581395348837209,
-      "matched_token_number" : 24
+      "minimal_similarity" : 0.5306122448979592,
+      "maximum_similarity" : 0.6046511627906976,
+      "matched_token_number" : 26
     },
     "SortAlgo4d2-SortAlgo6" : {
       "minimal_similarity" : 0.6938775510204082,
@@ -359,9 +359,9 @@
       "matched_token_number" : 40
     },
     "SortAlgo1_6-SortAlgo2_5" : {
-      "minimal_similarity" : 0.627906976744186,
-      "maximum_similarity" : 0.627906976744186,
-      "matched_token_number" : 27
+      "minimal_similarity" : 0.7209302325581395,
+      "maximum_similarity" : 0.7209302325581395,
+      "matched_token_number" : 31
     },
     "SortAlgo1_4-SortAlgo4d1" : {
       "minimal_similarity" : 0.7083333333333334,
@@ -369,9 +369,9 @@
       "matched_token_number" : 34
     },
     "SortAlgo1_5-SortAlgo4d3" : {
-      "minimal_similarity" : 0.5106382978723404,
-      "maximum_similarity" : 0.5581395348837209,
-      "matched_token_number" : 24
+      "minimal_similarity" : 0.5531914893617021,
+      "maximum_similarity" : 0.6046511627906976,
+      "matched_token_number" : 26
     },
     "SortAlgo1_4-SortAlgo4d2" : {
       "minimal_similarity" : 0.6938775510204082,
@@ -379,9 +379,9 @@
       "matched_token_number" : 34
     },
     "SortAlgo1_5-SortAlgo4d2" : {
-      "minimal_similarity" : 0.4897959183673469,
-      "maximum_similarity" : 0.5581395348837209,
-      "matched_token_number" : 24
+      "minimal_similarity" : 0.5306122448979592,
+      "maximum_similarity" : 0.6046511627906976,
+      "matched_token_number" : 26
     },
     "SortAlgo1_4-SortAlgo4d3" : {
       "minimal_similarity" : 0.723404255319149,
@@ -389,9 +389,9 @@
       "matched_token_number" : 34
     },
     "SortAlgo1_5-SortAlgo4d1" : {
-      "minimal_similarity" : 0.5,
-      "maximum_similarity" : 0.5581395348837209,
-      "matched_token_number" : 24
+      "minimal_similarity" : 0.5416666666666666,
+      "maximum_similarity" : 0.6046511627906976,
+      "matched_token_number" : 26
     },
     "SortAlgo4d2-SortAlgo4d3" : {
       "minimal_similarity" : 0.9183673469387755,
@@ -419,9 +419,9 @@
       "matched_token_number" : 40
     },
     "SortAlgo2-SortAlgo5" : {
-      "minimal_similarity" : 0.6046511627906976,
-      "maximum_similarity" : 0.6341463414634146,
-      "matched_token_number" : 26
+      "minimal_similarity" : 0.6511627906976745,
+      "maximum_similarity" : 0.6829268292682927,
+      "matched_token_number" : 28
     },
     "SortAlgo4d1-SortAlgo4d3" : {
       "minimal_similarity" : 0.9375,
@@ -449,14 +449,14 @@
       "matched_token_number" : 37
     },
     "SortAlgo3_6-SortAlgo5" : {
-      "minimal_similarity" : 0.39285714285714285,
-      "maximum_similarity" : 0.5116279069767442,
-      "matched_token_number" : 22
+      "minimal_similarity" : 0.5,
+      "maximum_similarity" : 0.6511627906976745,
+      "matched_token_number" : 28
     },
     "SortAlgo2_5-SortAlgo3_6" : {
-      "minimal_similarity" : 0.39285714285714285,
-      "maximum_similarity" : 0.5116279069767442,
-      "matched_token_number" : 22
+      "minimal_similarity" : 0.5,
+      "maximum_similarity" : 0.6511627906976745,
+      "matched_token_number" : 28
     },
     "SortAlgo3_6-SortAlgo7" : {
       "minimal_similarity" : 0.42857142857142855,
@@ -474,14 +474,14 @@
       "matched_token_number" : 36
     },
     "SortAlgo4d3-SortAlgo5" : {
-      "minimal_similarity" : 0.5106382978723404,
-      "maximum_similarity" : 0.5581395348837209,
-      "matched_token_number" : 24
+      "minimal_similarity" : 0.5531914893617021,
+      "maximum_similarity" : 0.6046511627906976,
+      "matched_token_number" : 26
     },
     "SortAlgo1_4-SortAlgo2_5" : {
-      "minimal_similarity" : 0.5348837209302325,
-      "maximum_similarity" : 0.5348837209302325,
-      "matched_token_number" : 23
+      "minimal_similarity" : 0.6046511627906976,
+      "maximum_similarity" : 0.6046511627906976,
+      "matched_token_number" : 26
     },
     "SortAlgo1-SortAlgo4" : {
       "minimal_similarity" : 0.7906976744186046,
@@ -489,9 +489,9 @@
       "matched_token_number" : 34
     },
     "SortAlgo1-SortAlgo5" : {
-      "minimal_similarity" : 0.6046511627906976,
-      "maximum_similarity" : 0.6341463414634146,
-      "matched_token_number" : 26
+      "minimal_similarity" : 0.6511627906976745,
+      "maximum_similarity" : 0.6829268292682927,
+      "matched_token_number" : 28
     },
     "SortAlgo1-SortAlgo2" : {
       "minimal_similarity" : 1.0,
@@ -509,9 +509,9 @@
       "matched_token_number" : 33
     },
     "SortAlgo1_3-SortAlgo2_5" : {
-      "minimal_similarity" : 0.3620689655172414,
-      "maximum_similarity" : 0.4883720930232558,
-      "matched_token_number" : 21
+      "minimal_similarity" : 0.4482758620689655,
+      "maximum_similarity" : 0.6046511627906976,
+      "matched_token_number" : 26
     },
     "SortAlgo1_6-SortAlgo2" : {
       "minimal_similarity" : 0.7906976744186046,
@@ -529,9 +529,9 @@
       "matched_token_number" : 38
     },
     "SortAlgo1_2-SortAlgo2_5" : {
-      "minimal_similarity" : 0.4727272727272727,
-      "maximum_similarity" : 0.6046511627906976,
-      "matched_token_number" : 26
+      "minimal_similarity" : 0.5636363636363636,
+      "maximum_similarity" : 0.7209302325581395,
+      "matched_token_number" : 31
     },
     "SortAlgo1_6-SortAlgo6" : {
       "minimal_similarity" : 0.7959183673469388,
@@ -539,14 +539,14 @@
       "matched_token_number" : 39
     },
     "SortAlgo-SortAlgo2_5" : {
-      "minimal_similarity" : 0.6046511627906976,
-      "maximum_similarity" : 0.6341463414634146,
-      "matched_token_number" : 26
+      "minimal_similarity" : 0.6511627906976745,
+      "maximum_similarity" : 0.6829268292682927,
+      "matched_token_number" : 28
     },
     "SortAlgo1_6-SortAlgo5" : {
-      "minimal_similarity" : 0.627906976744186,
-      "maximum_similarity" : 0.627906976744186,
-      "matched_token_number" : 27
+      "minimal_similarity" : 0.7209302325581395,
+      "maximum_similarity" : 0.7209302325581395,
+      "matched_token_number" : 31
     },
     "SortAlgo1_6-SortAlgo4" : {
       "minimal_similarity" : 0.6976744186046512,
@@ -559,19 +559,19 @@
       "matched_token_number" : 29
     },
     "SortAlgo1_5-SortAlgo6" : {
-      "minimal_similarity" : 0.46938775510204084,
-      "maximum_similarity" : 0.5348837209302325,
-      "matched_token_number" : 23
+      "minimal_similarity" : 0.5510204081632653,
+      "maximum_similarity" : 0.627906976744186,
+      "matched_token_number" : 27
     },
     "SortAlgo2_5-SortAlgo7" : {
-      "minimal_similarity" : 0.3392857142857143,
-      "maximum_similarity" : 0.4418604651162791,
-      "matched_token_number" : 19
+      "minimal_similarity" : 0.375,
+      "maximum_similarity" : 0.4883720930232558,
+      "matched_token_number" : 21
     },
     "SortAlgo1_5-SortAlgo7" : {
-      "minimal_similarity" : 0.3392857142857143,
-      "maximum_similarity" : 0.4418604651162791,
-      "matched_token_number" : 19
+      "minimal_similarity" : 0.375,
+      "maximum_similarity" : 0.4883720930232558,
+      "matched_token_number" : 21
     },
     "SortAlgo1-SortAlgo4d3" : {
       "minimal_similarity" : 0.8297872340425532,
@@ -579,9 +579,9 @@
       "matched_token_number" : 39
     },
     "SortAlgo1_5-SortAlgo4" : {
-      "minimal_similarity" : 0.5813953488372093,
-      "maximum_similarity" : 0.5813953488372093,
-      "matched_token_number" : 25
+      "minimal_similarity" : 0.627906976744186,
+      "maximum_similarity" : 0.627906976744186,
+      "matched_token_number" : 27
     },
     "SortAlgo1_5-SortAlgo5" : {
       "minimal_similarity" : 1.0,
@@ -598,25 +598,25 @@
       "maximum_similarity" : 0.9512195121951219,
       "matched_token_number" : 39
     },
-    "SortAlgo1_5-SortAlgo2" : {
-      "minimal_similarity" : 0.6046511627906976,
-      "maximum_similarity" : 0.6341463414634146,
-      "matched_token_number" : 26
-    },
     "SortAlgo3_5-SortAlgo6" : {
-      "minimal_similarity" : 0.5714285714285714,
-      "maximum_similarity" : 0.6530612244897959,
-      "matched_token_number" : 32
+      "minimal_similarity" : 0.6428571428571429,
+      "maximum_similarity" : 0.7346938775510204,
+      "matched_token_number" : 36
+    },
+    "SortAlgo1_5-SortAlgo2" : {
+      "minimal_similarity" : 0.6511627906976745,
+      "maximum_similarity" : 0.6829268292682927,
+      "matched_token_number" : 28
     },
     "SortAlgo1_5-SortAlgo3" : {
-      "minimal_similarity" : 0.3888888888888889,
-      "maximum_similarity" : 0.4883720930232558,
-      "matched_token_number" : 21
+      "minimal_similarity" : 0.46296296296296297,
+      "maximum_similarity" : 0.5813953488372093,
+      "matched_token_number" : 25
     },
     "SortAlgo3_5-SortAlgo7" : {
-      "minimal_similarity" : 0.26785714285714285,
-      "maximum_similarity" : 0.26785714285714285,
-      "matched_token_number" : 15
+      "minimal_similarity" : 0.30357142857142855,
+      "maximum_similarity" : 0.30357142857142855,
+      "matched_token_number" : 17
     },
     "SortAlgo3-SortAlgo4d1" : {
       "minimal_similarity" : 0.7407407407407407,
@@ -649,9 +649,9 @@
       "matched_token_number" : 39
     },
     "SortAlgo1_5-SortAlgo1_6" : {
-      "minimal_similarity" : 0.627906976744186,
-      "maximum_similarity" : 0.627906976744186,
-      "matched_token_number" : 27
+      "minimal_similarity" : 0.7209302325581395,
+      "maximum_similarity" : 0.7209302325581395,
+      "matched_token_number" : 31
     },
     "SortAlgo4d1-SortAlgo7" : {
       "minimal_similarity" : 0.6428571428571429,
@@ -694,19 +694,19 @@
       "matched_token_number" : 28
     },
     "SortAlgo4d1-SortAlgo5" : {
-      "minimal_similarity" : 0.5,
-      "maximum_similarity" : 0.5581395348837209,
-      "matched_token_number" : 24
+      "minimal_similarity" : 0.5416666666666666,
+      "maximum_similarity" : 0.6046511627906976,
+      "matched_token_number" : 26
     },
     "SortAlgo3_5-SortAlgo4d2" : {
-      "minimal_similarity" : 0.4107142857142857,
-      "maximum_similarity" : 0.46938775510204084,
-      "matched_token_number" : 23
+      "minimal_similarity" : 0.44642857142857145,
+      "maximum_similarity" : 0.5102040816326531,
+      "matched_token_number" : 25
     },
     "SortAlgo3_5-SortAlgo4" : {
-      "minimal_similarity" : 0.30357142857142855,
-      "maximum_similarity" : 0.3953488372093023,
-      "matched_token_number" : 17
+      "minimal_similarity" : 0.35714285714285715,
+      "maximum_similarity" : 0.46511627906976744,
+      "matched_token_number" : 20
     },
     "SortAlgo3_5-SortAlgo5" : {
       "minimal_similarity" : 0.6607142857142857,
@@ -714,29 +714,29 @@
       "matched_token_number" : 37
     },
     "SortAlgo3_5-SortAlgo4d3" : {
-      "minimal_similarity" : 0.4107142857142857,
-      "maximum_similarity" : 0.48936170212765956,
-      "matched_token_number" : 23
+      "minimal_similarity" : 0.44642857142857145,
+      "maximum_similarity" : 0.5319148936170213,
+      "matched_token_number" : 25
     },
     "SortAlgo2_5-SortAlgo4" : {
-      "minimal_similarity" : 0.5813953488372093,
+      "minimal_similarity" : 0.627906976744186,
+      "maximum_similarity" : 0.627906976744186,
+      "matched_token_number" : 27
+    },
+    "SortAlgo2_5-SortAlgo3" : {
+      "minimal_similarity" : 0.46296296296296297,
       "maximum_similarity" : 0.5813953488372093,
       "matched_token_number" : 25
     },
     "SortAlgo3_5-SortAlgo4d1" : {
-      "minimal_similarity" : 0.4107142857142857,
-      "maximum_similarity" : 0.4791666666666667,
-      "matched_token_number" : 23
-    },
-    "SortAlgo2_5-SortAlgo3" : {
-      "minimal_similarity" : 0.3888888888888889,
-      "maximum_similarity" : 0.4883720930232558,
-      "matched_token_number" : 21
+      "minimal_similarity" : 0.44642857142857145,
+      "maximum_similarity" : 0.5208333333333334,
+      "matched_token_number" : 25
     },
     "SortAlgo2_5-SortAlgo6" : {
-      "minimal_similarity" : 0.46938775510204084,
-      "maximum_similarity" : 0.5348837209302325,
-      "matched_token_number" : 23
+      "minimal_similarity" : 0.5510204081632653,
+      "maximum_similarity" : 0.627906976744186,
+      "matched_token_number" : 27
     },
     "SortAlgo2_5-SortAlgo5" : {
       "minimal_similarity" : 1.0,
@@ -759,44 +759,44 @@
       "matched_token_number" : 34
     },
     "SortAlgo1-SortAlgo1_5" : {
-      "minimal_similarity" : 0.6046511627906976,
-      "maximum_similarity" : 0.6341463414634146,
-      "matched_token_number" : 26
+      "minimal_similarity" : 0.6511627906976745,
+      "maximum_similarity" : 0.6829268292682927,
+      "matched_token_number" : 28
     },
     "SortAlgo1-SortAlgo1_4" : {
       "minimal_similarity" : 0.8372093023255814,
       "maximum_similarity" : 0.8780487804878049,
       "matched_token_number" : 36
     },
+    "SortAlgo2_5-SortAlgo4d1" : {
+      "minimal_similarity" : 0.5416666666666666,
+      "maximum_similarity" : 0.6046511627906976,
+      "matched_token_number" : 26
+    },
     "SortAlgo3-SortAlgo7" : {
       "minimal_similarity" : 0.5535714285714286,
       "maximum_similarity" : 0.5740740740740741,
       "matched_token_number" : 31
     },
-    "SortAlgo2_5-SortAlgo4d1" : {
-      "minimal_similarity" : 0.5,
-      "maximum_similarity" : 0.5581395348837209,
-      "matched_token_number" : 24
-    },
     "SortAlgo3-SortAlgo6" : {
       "minimal_similarity" : 0.7222222222222222,
       "maximum_similarity" : 0.7959183673469388,
       "matched_token_number" : 39
     },
     "SortAlgo2_5-SortAlgo4d2" : {
-      "minimal_similarity" : 0.4897959183673469,
-      "maximum_similarity" : 0.5581395348837209,
-      "matched_token_number" : 24
+      "minimal_similarity" : 0.5306122448979592,
+      "maximum_similarity" : 0.6046511627906976,
+      "matched_token_number" : 26
     },
     "SortAlgo1_4-SortAlgo1_5" : {
-      "minimal_similarity" : 0.5348837209302325,
-      "maximum_similarity" : 0.5348837209302325,
-      "matched_token_number" : 23
+      "minimal_similarity" : 0.6046511627906976,
+      "maximum_similarity" : 0.6046511627906976,
+      "matched_token_number" : 26
     },
     "SortAlgo3-SortAlgo5" : {
-      "minimal_similarity" : 0.3888888888888889,
-      "maximum_similarity" : 0.4883720930232558,
-      "matched_token_number" : 21
+      "minimal_similarity" : 0.46296296296296297,
+      "maximum_similarity" : 0.5813953488372093,
+      "matched_token_number" : 25
     },
     "SortAlgo1_4-SortAlgo1_6" : {
       "minimal_similarity" : 0.7441860465116279,
@@ -809,9 +809,9 @@
       "matched_token_number" : 29
     },
     "SortAlgo1_3-SortAlgo1_5" : {
-      "minimal_similarity" : 0.3620689655172414,
-      "maximum_similarity" : 0.4883720930232558,
-      "matched_token_number" : 21
+      "minimal_similarity" : 0.4482758620689655,
+      "maximum_similarity" : 0.6046511627906976,
+      "matched_token_number" : 26
     },
     "SortAlgo1_3-SortAlgo1_4" : {
       "minimal_similarity" : 0.5689655172413793,
@@ -819,34 +819,34 @@
       "matched_token_number" : 33
     },
     "SortAlgo2_5-SortAlgo4d3" : {
-      "minimal_similarity" : 0.5106382978723404,
-      "maximum_similarity" : 0.5581395348837209,
-      "matched_token_number" : 24
+      "minimal_similarity" : 0.5531914893617021,
+      "maximum_similarity" : 0.6046511627906976,
+      "matched_token_number" : 26
     },
     "SortAlgo1_3-SortAlgo1_6" : {
       "minimal_similarity" : 0.5344827586206896,
       "maximum_similarity" : 0.7209302325581395,
       "matched_token_number" : 31
     },
+    "SortAlgo1_2-SortAlgo1_5" : {
+      "minimal_similarity" : 0.5636363636363636,
+      "maximum_similarity" : 0.7209302325581395,
+      "matched_token_number" : 31
+    },
     "SortAlgo-SortAlgo3_6" : {
       "minimal_similarity" : 0.4642857142857143,
       "maximum_similarity" : 0.6341463414634146,
       "matched_token_number" : 26
     },
-    "SortAlgo1_2-SortAlgo1_5" : {
-      "minimal_similarity" : 0.4727272727272727,
-      "maximum_similarity" : 0.6046511627906976,
-      "matched_token_number" : 26
-    },
     "SortAlgo1_2-SortAlgo1_6" : {
       "minimal_similarity" : 0.6181818181818182,
       "maximum_similarity" : 0.7906976744186046,
       "matched_token_number" : 34
     },
     "SortAlgo-SortAlgo3_5" : {
-      "minimal_similarity" : 0.375,
-      "maximum_similarity" : 0.5121951219512195,
-      "matched_token_number" : 21
+      "minimal_similarity" : 0.4107142857142857,
+      "maximum_similarity" : 0.5609756097560976,
+      "matched_token_number" : 23
     },
     "SortAlgo1_2-SortAlgo1_3" : {
       "minimal_similarity" : 0.6206896551724138,
@@ -865,9 +865,9 @@
   },
   "tests" : {
     "SortAlgo-SortAlgo5" : {
-      "minimal_similarity" : 0.2558139534883721,
-      "maximum_similarity" : 0.2682926829268293,
-      "matched_token_number" : 11
+      "minimal_similarity" : 0.27906976744186046,
+      "maximum_similarity" : 0.2926829268292683,
+      "matched_token_number" : 12
     },
     "SortAlgo-SortAlgo6" : {
       "minimal_similarity" : 0.42857142857142855,
@@ -880,9 +880,9 @@
       "matched_token_number" : 38
     },
     "SortAlgo3_5-SortAlgo3_6" : {
-      "minimal_similarity" : 0.16071428571428573,
-      "maximum_similarity" : 0.16071428571428573,
-      "matched_token_number" : 9
+      "minimal_similarity" : 0.17857142857142858,
+      "maximum_similarity" : 0.17857142857142858,
+      "matched_token_number" : 10
     },
     "SortAlgo6-SortAlgo7" : {
       "minimal_similarity" : 0.19642857142857142,
@@ -940,9 +940,9 @@
       "matched_token_number" : 22
     },
     "SortAlgo2-SortAlgo2_5" : {
-      "minimal_similarity" : 0.2558139534883721,
-      "maximum_similarity" : 0.2682926829268293,
-      "matched_token_number" : 11
+      "minimal_similarity" : 0.27906976744186046,
+      "maximum_similarity" : 0.2926829268292683,
+      "matched_token_number" : 12
     },
     "SortAlgo1_2-SortAlgo2" : {
       "minimal_similarity" : 0.7454545454545455,
@@ -965,15 +965,15 @@
       "matched_token_number" : 27
     },
     "SortAlgo5-SortAlgo7" : {
-      "minimal_similarity" : 0.17857142857142858,
-      "maximum_similarity" : 0.23255813953488372,
-      "matched_token_number" : 10
-    },
-    "SortAlgo1_2-SortAlgo5" : {
-      "minimal_similarity" : 0.2,
+      "minimal_similarity" : 0.19642857142857142,
       "maximum_similarity" : 0.2558139534883721,
       "matched_token_number" : 11
     },
+    "SortAlgo1_2-SortAlgo5" : {
+      "minimal_similarity" : 0.21818181818181817,
+      "maximum_similarity" : 0.27906976744186046,
+      "matched_token_number" : 12
+    },
     "SortAlgo1_2-SortAlgo6" : {
       "minimal_similarity" : 0.38181818181818183,
       "maximum_similarity" : 0.42857142857142855,
@@ -985,9 +985,9 @@
       "matched_token_number" : 38
     },
     "SortAlgo1-SortAlgo2_5" : {
-      "minimal_similarity" : 0.2558139534883721,
-      "maximum_similarity" : 0.2682926829268293,
-      "matched_token_number" : 11
+      "minimal_similarity" : 0.27906976744186046,
+      "maximum_similarity" : 0.2926829268292683,
+      "matched_token_number" : 12
     },
     "SortAlgo1_3-SortAlgo3_6" : {
       "minimal_similarity" : 0.3103448275862069,
@@ -1060,9 +1060,9 @@
       "matched_token_number" : 19
     },
     "SortAlgo3-SortAlgo3_5" : {
-      "minimal_similarity" : 0.16071428571428573,
-      "maximum_similarity" : 0.16666666666666666,
-      "matched_token_number" : 9
+      "minimal_similarity" : 0.17857142857142858,
+      "maximum_similarity" : 0.18518518518518517,
+      "matched_token_number" : 10
     },
     "SortAlgo1_4-SortAlgo4" : {
       "minimal_similarity" : 0.7674418604651163,
@@ -1085,9 +1085,9 @@
       "matched_token_number" : 17
     },
     "SortAlgo1_4-SortAlgo5" : {
-      "minimal_similarity" : 0.23255813953488372,
-      "maximum_similarity" : 0.23255813953488372,
-      "matched_token_number" : 10
+      "minimal_similarity" : 0.2558139534883721,
+      "maximum_similarity" : 0.2558139534883721,
+      "matched_token_number" : 11
     },
     "SortAlgo2-SortAlgo3_5" : {
       "minimal_similarity" : 0.0,
@@ -1140,9 +1140,9 @@
       "matched_token_number" : 25
     },
     "SortAlgo-SortAlgo1_5" : {
-      "minimal_similarity" : 0.2558139534883721,
-      "maximum_similarity" : 0.2682926829268293,
-      "matched_token_number" : 11
+      "minimal_similarity" : 0.27906976744186046,
+      "maximum_similarity" : 0.2926829268292683,
+      "matched_token_number" : 12
     },
     "SortAlgo-SortAlgo1_4" : {
       "minimal_similarity" : 0.5348837209302325,
@@ -1220,9 +1220,9 @@
       "matched_token_number" : 29
     },
     "SortAlgo1_6-SortAlgo2_5" : {
-      "minimal_similarity" : 0.2558139534883721,
-      "maximum_similarity" : 0.2558139534883721,
-      "matched_token_number" : 11
+      "minimal_similarity" : 0.27906976744186046,
+      "maximum_similarity" : 0.27906976744186046,
+      "matched_token_number" : 12
     },
     "SortAlgo1_4-SortAlgo4d1" : {
       "minimal_similarity" : 0.3541666666666667,
@@ -1280,9 +1280,9 @@
       "matched_token_number" : 29
     },
     "SortAlgo2-SortAlgo5" : {
-      "minimal_similarity" : 0.2558139534883721,
-      "maximum_similarity" : 0.2682926829268293,
-      "matched_token_number" : 11
+      "minimal_similarity" : 0.27906976744186046,
+      "maximum_similarity" : 0.2926829268292683,
+      "matched_token_number" : 12
     },
     "SortAlgo4d1-SortAlgo4d3" : {
       "minimal_similarity" : 0.9375,
@@ -1340,9 +1340,9 @@
       "matched_token_number" : 0
     },
     "SortAlgo1_4-SortAlgo2_5" : {
-      "minimal_similarity" : 0.23255813953488372,
-      "maximum_similarity" : 0.23255813953488372,
-      "matched_token_number" : 10
+      "minimal_similarity" : 0.2558139534883721,
+      "maximum_similarity" : 0.2558139534883721,
+      "matched_token_number" : 11
     },
     "SortAlgo1-SortAlgo4" : {
       "minimal_similarity" : 0.5581395348837209,
@@ -1350,9 +1350,9 @@
       "matched_token_number" : 24
     },
     "SortAlgo1-SortAlgo5" : {
-      "minimal_similarity" : 0.2558139534883721,
-      "maximum_similarity" : 0.2682926829268293,
-      "matched_token_number" : 11
+      "minimal_similarity" : 0.27906976744186046,
+      "maximum_similarity" : 0.2926829268292683,
+      "matched_token_number" : 12
     },
     "SortAlgo1-SortAlgo2" : {
       "minimal_similarity" : 1.0,
@@ -1390,9 +1390,9 @@
       "matched_token_number" : 38
     },
     "SortAlgo1_2-SortAlgo2_5" : {
-      "minimal_similarity" : 0.2,
-      "maximum_similarity" : 0.2558139534883721,
-      "matched_token_number" : 11
+      "minimal_similarity" : 0.21818181818181817,
+      "maximum_similarity" : 0.27906976744186046,
+      "matched_token_number" : 12
     },
     "SortAlgo1_6-SortAlgo6" : {
       "minimal_similarity" : 0.7959183673469388,
@@ -1400,14 +1400,14 @@
       "matched_token_number" : 39
     },
     "SortAlgo-SortAlgo2_5" : {
-      "minimal_similarity" : 0.2558139534883721,
-      "maximum_similarity" : 0.2682926829268293,
-      "matched_token_number" : 11
+      "minimal_similarity" : 0.27906976744186046,
+      "maximum_similarity" : 0.2926829268292683,
+      "matched_token_number" : 12
     },
     "SortAlgo1_6-SortAlgo5" : {
-      "minimal_similarity" : 0.2558139534883721,
-      "maximum_similarity" : 0.2558139534883721,
-      "matched_token_number" : 11
+      "minimal_similarity" : 0.27906976744186046,
+      "maximum_similarity" : 0.27906976744186046,
+      "matched_token_number" : 12
     },
     "SortAlgo1_6-SortAlgo4" : {
       "minimal_similarity" : 0.5581395348837209,
@@ -1425,14 +1425,14 @@
       "matched_token_number" : 0
     },
     "SortAlgo2_5-SortAlgo7" : {
-      "minimal_similarity" : 0.17857142857142858,
-      "maximum_similarity" : 0.23255813953488372,
-      "matched_token_number" : 10
+      "minimal_similarity" : 0.19642857142857142,
+      "maximum_similarity" : 0.2558139534883721,
+      "matched_token_number" : 11
     },
     "SortAlgo1_5-SortAlgo7" : {
-      "minimal_similarity" : 0.17857142857142858,
-      "maximum_similarity" : 0.23255813953488372,
-      "matched_token_number" : 10
+      "minimal_similarity" : 0.19642857142857142,
+      "maximum_similarity" : 0.2558139534883721,
+      "matched_token_number" : 11
     },
     "SortAlgo1-SortAlgo4d3" : {
       "minimal_similarity" : 0.6595744680851063,
@@ -1460,14 +1460,14 @@
       "matched_token_number" : 31
     },
     "SortAlgo1_5-SortAlgo2" : {
-      "minimal_similarity" : 0.2558139534883721,
-      "maximum_similarity" : 0.2682926829268293,
-      "matched_token_number" : 11
+      "minimal_similarity" : 0.27906976744186046,
+      "maximum_similarity" : 0.2926829268292683,
+      "matched_token_number" : 12
     },
     "SortAlgo3_5-SortAlgo6" : {
-      "minimal_similarity" : 0.16071428571428573,
-      "maximum_similarity" : 0.1836734693877551,
-      "matched_token_number" : 9
+      "minimal_similarity" : 0.17857142857142858,
+      "maximum_similarity" : 0.20408163265306123,
+      "matched_token_number" : 10
     },
     "SortAlgo3_5-SortAlgo7" : {
       "minimal_similarity" : 0.0,
@@ -1510,9 +1510,9 @@
       "matched_token_number" : 31
     },
     "SortAlgo1_5-SortAlgo1_6" : {
-      "minimal_similarity" : 0.2558139534883721,
-      "maximum_similarity" : 0.2558139534883721,
-      "matched_token_number" : 11
+      "minimal_similarity" : 0.27906976744186046,
+      "maximum_similarity" : 0.27906976744186046,
+      "matched_token_number" : 12
     },
     "SortAlgo3_6-SortAlgo4d2" : {
       "minimal_similarity" : 0.30357142857142855,
@@ -1584,12 +1584,12 @@
       "maximum_similarity" : 0.2558139534883721,
       "matched_token_number" : 11
     },
-    "SortAlgo2_5-SortAlgo3" : {
+    "SortAlgo3_5-SortAlgo4d1" : {
       "minimal_similarity" : 0.0,
       "maximum_similarity" : 0.0,
       "matched_token_number" : 0
     },
-    "SortAlgo3_5-SortAlgo4d1" : {
+    "SortAlgo2_5-SortAlgo3" : {
       "minimal_similarity" : 0.0,
       "maximum_similarity" : 0.0,
       "matched_token_number" : 0
@@ -1620,9 +1620,9 @@
       "matched_token_number" : 25
     },
     "SortAlgo1-SortAlgo1_5" : {
-      "minimal_similarity" : 0.2558139534883721,
-      "maximum_similarity" : 0.2682926829268293,
-      "matched_token_number" : 11
+      "minimal_similarity" : 0.27906976744186046,
+      "maximum_similarity" : 0.2926829268292683,
+      "matched_token_number" : 12
     },
     "SortAlgo1-SortAlgo1_4" : {
       "minimal_similarity" : 0.5348837209302325,
@@ -1650,9 +1650,9 @@
       "matched_token_number" : 0
     },
     "SortAlgo1_4-SortAlgo1_5" : {
-      "minimal_similarity" : 0.23255813953488372,
-      "maximum_similarity" : 0.23255813953488372,
-      "matched_token_number" : 10
+      "minimal_similarity" : 0.2558139534883721,
+      "maximum_similarity" : 0.2558139534883721,
+      "matched_token_number" : 11
     },
     "SortAlgo3-SortAlgo5" : {
       "minimal_similarity" : 0.0,
@@ -1695,9 +1695,9 @@
       "matched_token_number" : 19
     },
     "SortAlgo1_2-SortAlgo1_5" : {
-      "minimal_similarity" : 0.2,
-      "maximum_similarity" : 0.2558139534883721,
-      "matched_token_number" : 11
+      "minimal_similarity" : 0.21818181818181817,
+      "maximum_similarity" : 0.27906976744186046,
+      "matched_token_number" : 12
     },
     "SortAlgo1_2-SortAlgo1_6" : {
       "minimal_similarity" : 0.45454545454545453,
diff --git a/languages/java/src/main/java/de/jplag/java/JavaTokenType.java b/languages/java/src/main/java/de/jplag/java/JavaTokenType.java
index cfad295ab..698ece84f 100644
--- a/languages/java/src/main/java/de/jplag/java/JavaTokenType.java
+++ b/languages/java/src/main/java/de/jplag/java/JavaTokenType.java
@@ -12,12 +12,8 @@ public enum JavaTokenType implements TokenType {
     J_VARDEF("VARDEF"), // check
     J_SYNC_BEGIN("SYNC{"), // check
     J_SYNC_END("}SYNC"), // check
-    J_DO_BEGIN("DO{"), // check
-    J_DO_END("}DO"), // check
-    J_WHILE_BEGIN("WHILE{"), // check
-    J_WHILE_END("}WHILE"), // check
-    J_FOR_BEGIN("FOR{"), // check
-    J_FOR_END("}FOR"), // check
+    J_LOOP_BEGIN("LOOP{"), // check
+    J_LOOP_END("}LOOP"), // check
     J_SWITCH_BEGIN("SWITCH{"), // check
     J_SWITCH_END("}SWITCH"), // check
     J_CASE("CASE"), // check
diff --git a/languages/java/src/main/java/de/jplag/java/TokenGeneratingTreeScanner.java b/languages/java/src/main/java/de/jplag/java/TokenGeneratingTreeScanner.java
index 079050c24..c026b975a 100644
--- a/languages/java/src/main/java/de/jplag/java/TokenGeneratingTreeScanner.java
+++ b/languages/java/src/main/java/de/jplag/java/TokenGeneratingTreeScanner.java
@@ -216,10 +216,10 @@ public Void visitSynchronized(SynchronizedTree node, Void unused) {
     @Override
     public Void visitDoWhileLoop(DoWhileLoopTree node, Void unused) {
         long start = positions.getStartPosition(ast, node);
-        long end = positions.getEndPosition(ast, node) - 1;
-        addToken(JavaTokenType.J_DO_BEGIN, start, 2, CodeSemantics.createLoopBegin());
+        long end = positions.getEndPosition(ast, node.getStatement()) - 1;
+        addToken(JavaTokenType.J_LOOP_BEGIN, start, 2, CodeSemantics.createLoopBegin());
         scan(node.getStatement(), null);
-        addToken(JavaTokenType.J_DO_END, end, 1, CodeSemantics.createLoopEnd());
+        addToken(JavaTokenType.J_LOOP_END, end, 1, CodeSemantics.createLoopEnd());
         scan(node.getCondition(), null);
         return null;
     }
@@ -228,9 +228,9 @@ public Void visitDoWhileLoop(DoWhileLoopTree node, Void unused) {
     public Void visitWhileLoop(WhileLoopTree node, Void unused) {
         long start = positions.getStartPosition(ast, node);
         long end = positions.getEndPosition(ast, node) - 1;
-        addToken(JavaTokenType.J_WHILE_BEGIN, start, 5, CodeSemantics.createLoopBegin());
+        addToken(JavaTokenType.J_LOOP_BEGIN, start, 5, CodeSemantics.createLoopBegin());
         super.visitWhileLoop(node, null);
-        addToken(JavaTokenType.J_WHILE_END, end, 1, CodeSemantics.createLoopEnd());
+        addToken(JavaTokenType.J_LOOP_END, end, 1, CodeSemantics.createLoopEnd());
         return null;
     }
 
@@ -239,9 +239,9 @@ public Void visitForLoop(ForLoopTree node, Void unused) {
         variableRegistry.enterLocalScope();
         long start = positions.getStartPosition(ast, node);
         long end = positions.getEndPosition(ast, node) - 1;
-        addToken(JavaTokenType.J_FOR_BEGIN, start, 3, CodeSemantics.createLoopBegin());
+        addToken(JavaTokenType.J_LOOP_BEGIN, start, 3, CodeSemantics.createLoopBegin());
         super.visitForLoop(node, null);
-        addToken(JavaTokenType.J_FOR_END, end, 1, CodeSemantics.createLoopEnd());
+        addToken(JavaTokenType.J_LOOP_END, end, 1, CodeSemantics.createLoopEnd());
         variableRegistry.exitLocalScope();
         return null;
     }
@@ -251,9 +251,9 @@ public Void visitEnhancedForLoop(EnhancedForLoopTree node, Void unused) {
         variableRegistry.enterLocalScope();
         long start = positions.getStartPosition(ast, node);
         long end = positions.getEndPosition(ast, node) - 1;
-        addToken(JavaTokenType.J_FOR_BEGIN, start, 3, CodeSemantics.createLoopBegin());
+        addToken(JavaTokenType.J_LOOP_BEGIN, start, 3, CodeSemantics.createLoopBegin());
         super.visitEnhancedForLoop(node, null);
-        addToken(JavaTokenType.J_FOR_END, end, 1, CodeSemantics.createLoopEnd());
+        addToken(JavaTokenType.J_LOOP_END, end, 1, CodeSemantics.createLoopEnd());
         variableRegistry.exitLocalScope();
         return null;
     }
diff --git a/languages/java/src/test/java/de/jplag/java/JavaLanguageTest.java b/languages/java/src/test/java/de/jplag/java/JavaLanguageTest.java
index 606011087..51e36d7c2 100644
--- a/languages/java/src/test/java/de/jplag/java/JavaLanguageTest.java
+++ b/languages/java/src/test/java/de/jplag/java/JavaLanguageTest.java
@@ -24,19 +24,19 @@ protected void collectTestData(TestDataCollector collector) {
                 J_IF_END, J_METHOD_END, J_CLASS_END);
 
         collector.testFile("Verbose.java", "Compact.java").testSourceCoverage().testTokenSequence(J_PACKAGE, J_IMPORT, J_CLASS_BEGIN, J_METHOD_BEGIN,
-                J_VARDEF, J_VARDEF, J_IF_BEGIN, J_APPLY, J_RETURN, J_IF_END, J_VARDEF, J_FOR_BEGIN, J_VARDEF, J_APPLY, J_ASSIGN, J_IF_BEGIN, J_APPLY,
-                J_APPLY, J_ASSIGN, J_IF_END, J_FOR_END, J_IF_BEGIN, J_APPLY, J_ASSIGN, J_IF_END, J_IF_BEGIN, J_APPLY, J_APPLY, J_ASSIGN, J_IF_END,
+                J_VARDEF, J_VARDEF, J_IF_BEGIN, J_APPLY, J_RETURN, J_IF_END, J_VARDEF, J_LOOP_BEGIN, J_VARDEF, J_APPLY, J_ASSIGN, J_IF_BEGIN, J_APPLY,
+                J_APPLY, J_ASSIGN, J_IF_END, J_LOOP_END, J_IF_BEGIN, J_APPLY, J_ASSIGN, J_IF_END, J_IF_BEGIN, J_APPLY, J_APPLY, J_ASSIGN, J_IF_END,
                 J_RETURN, J_METHOD_END, J_CLASS_END);
 
         // Test difference between try block and try-with-resource block.
         collector.testFile("Try.java", "TryWithResource.java").testSourceCoverage().testTokenSequence(J_PACKAGE, J_IMPORT, J_IMPORT, J_IMPORT,
                 J_CLASS_BEGIN, J_METHOD_BEGIN, J_VARDEF, J_APPLY, J_NEWCLASS, J_METHOD_END, J_METHOD_BEGIN, J_VARDEF, J_VARDEF, J_TRY_BEGIN, J_VARDEF,
-                J_ASSIGN, J_NEWCLASS, J_NEWCLASS, J_WHILE_BEGIN, J_APPLY, J_APPLY, J_APPLY, J_WHILE_END, J_CATCH_BEGIN, J_VARDEF, J_APPLY,
-                J_CATCH_END, J_FINALLY_BEGIN, J_IF_BEGIN, J_APPLY, J_IF_END, J_FINALLY_END, J_TRY_END, J_METHOD_END, J_CLASS_END);
+                J_ASSIGN, J_NEWCLASS, J_NEWCLASS, J_LOOP_BEGIN, J_APPLY, J_APPLY, J_APPLY, J_LOOP_END, J_CATCH_BEGIN, J_VARDEF, J_APPLY, J_CATCH_END,
+                J_FINALLY_BEGIN, J_IF_BEGIN, J_APPLY, J_IF_END, J_FINALLY_END, J_TRY_END, J_METHOD_END, J_CLASS_END);
 
-        collector.testFile("CLI.java").testSourceCoverage().testContainedTokens(J_TRY_END, J_IMPORT, J_VARDEF, J_FOR_BEGIN, J_ARRAY_INIT_BEGIN,
+        collector.testFile("CLI.java").testSourceCoverage().testContainedTokens(J_TRY_END, J_IMPORT, J_VARDEF, J_LOOP_BEGIN, J_ARRAY_INIT_BEGIN,
                 J_IF_BEGIN, J_CATCH_END, J_COND, J_ARRAY_INIT_END, J_METHOD_BEGIN, J_TRY_BEGIN, J_CLASS_END, J_RETURN, J_ASSIGN, J_METHOD_END,
-                J_IF_END, J_CLASS_BEGIN, J_NEWARRAY, J_PACKAGE, J_APPLY, J_FOR_END, J_THROW, J_NEWCLASS, J_CATCH_BEGIN);
+                J_IF_END, J_CLASS_BEGIN, J_NEWARRAY, J_PACKAGE, J_APPLY, J_LOOP_END, J_THROW, J_NEWCLASS, J_CATCH_BEGIN);
     }
 
     @Override