diff --git a/metafacture-commons/src/test/java/org/metafacture/commons/XmlUtilTest.java b/metafacture-commons/src/test/java/org/metafacture/commons/XmlUtilTest.java
index c05ba03a3..715eb93e5 100644
--- a/metafacture-commons/src/test/java/org/metafacture/commons/XmlUtilTest.java
+++ b/metafacture-commons/src/test/java/org/metafacture/commons/XmlUtilTest.java
@@ -54,11 +54,8 @@ public void escape_shouldEscapeAllNonAsciiChars() {
         assertEquals("København", result);
     }
 
-    /**
-     * Test for <a href="https://github.com/culturegraph/metafacture-core/issues/267">#267</a>.
-     */
     @Test
-    public void escape_shouldEscapeSurrogatePairsAsSingleEntity() {
+    public void issue267_escape_shouldEscapeSurrogatePairsAsSingleEntity() {
         final String unescaped = "Smile: \ud83d\ude09";
         final String result = XmlUtil.escape(unescaped);
 
diff --git a/metafacture-formeta/src/test/java/org/metafacture/formeta/formatter/AbstactFormatterTest.java b/metafacture-formeta/src/test/java/org/metafacture/formeta/formatter/AbstactFormatterTest.java
index d28ddcbc5..b2d5ac98b 100644
--- a/metafacture-formeta/src/test/java/org/metafacture/formeta/formatter/AbstactFormatterTest.java
+++ b/metafacture-formeta/src/test/java/org/metafacture/formeta/formatter/AbstactFormatterTest.java
@@ -52,9 +52,6 @@ protected boolean shouldQuoteText(final char[] buffer, final int len) {
         };
     }
 
-    /*
-     * Test for issue https://github.com/culturegraph/metafacture-core/issues/161
-     */
     @Test
     public void issue161() {
         final String longValue = StringUtil.repeatChars('a', AbstractFormatter.BUFFER_SIZE * 2 + 1);
diff --git a/metafix/src/test/java/org/metafacture/metafix/MetafixBindTest.java b/metafix/src/test/java/org/metafacture/metafix/MetafixBindTest.java
index 889179169..21277696a 100644
--- a/metafix/src/test/java/org/metafacture/metafix/MetafixBindTest.java
+++ b/metafix/src/test/java/org/metafacture/metafix/MetafixBindTest.java
@@ -697,19 +697,19 @@ public void shouldIterateOverList() {
     }
 
     @Test
-    // See https://github.com/metafacture/metafacture-fix/issues/119
+    // See issue metafacture-fix#119
     public void shouldIterateOverListWithCharacterClass() {
         shouldIterateOverList("n[ao]me", 3);
     }
 
     @Test
-    // See https://github.com/metafacture/metafacture-fix/issues/119
+    // See issue metafacture-fix#119
     public void shouldIterateOverListWithAlternation() {
         shouldIterateOverList("name|nome", 3);
     }
 
     @Test
-    // See https://github.com/metafacture/metafacture-fix/issues/119
+    // See issue metafacture-fix#119
     public void shouldIterateOverListWithWildcard() {
         shouldIterateOverList("n?me", 3);
     }
@@ -749,26 +749,26 @@ public void shouldIterateOverListOfHashes() {
     }
 
     @Test
-    // See https://github.com/metafacture/metafacture-fix/issues/119
+    // See issue metafacture-fix#119
     public void shouldIterateOverListOfHashesWithCharacterClass() {
         shouldIterateOverListOfHashes("n[ao]me.value", 3);
     }
 
     @Test
-    // See https://github.com/metafacture/metafacture-fix/issues/119
-    @MetafixToDo("See https://github.com/metafacture/metafacture-fix/issues/143")
+    // See issue metafacture-fix#119
+    @MetafixToDo("See issue #603")
     public void shouldIterateOverListOfHashesWithAlternation() {
         shouldIterateOverListOfHashes("name.value|nome.value", 3);
     }
 
     @Test
-    // See https://github.com/metafacture/metafacture-fix/issues/119
+    // See issue metafacture-fix#119
     public void shouldIterateOverListOfHashesWithWildcard() {
         shouldIterateOverListOfHashes("n?me.value", 3);
     }
 
     @Test // checkstyle-disable-line JavaNCSS
-    // See https://github.com/metafacture/metafacture-fix/issues/119
+    // See issue metafacture-fix#119
     public void shouldPerformComplexOperationWithPathWildcard() {
         MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
                 "set_array('coll[]')",
diff --git a/metafix/src/test/java/org/metafacture/metafix/MetafixIfTest.java b/metafix/src/test/java/org/metafacture/metafix/MetafixIfTest.java
index 5b8000dcc..9defe084c 100644
--- a/metafix/src/test/java/org/metafacture/metafix/MetafixIfTest.java
+++ b/metafix/src/test/java/org/metafacture/metafix/MetafixIfTest.java
@@ -634,19 +634,19 @@ public void shouldEqualAny() {
     }
 
     @Test
-    // See https://github.com/metafacture/metafacture-fix/issues/115
+    // See issue metafacture-fix#115
     public void shouldEqualAnyCharacterClass() {
         shouldEqualAny("n[ao]me");
     }
 
     @Test
-    // See https://github.com/metafacture/metafacture-fix/issues/115
+    // See issue metafacture-fix#115
     public void shouldEqualAnyAlternation() {
         shouldEqualAny("name|nome");
     }
 
     @Test
-    // See https://github.com/metafacture/metafacture-fix/issues/115
+    // See issue metafacture-fix#115
     public void shouldEqualAnyWildcard() {
         shouldEqualAny("n?me");
     }
@@ -685,7 +685,7 @@ public void shouldEqualAnyNested() {
     }
 
     @Test
-    // See https://github.com/metafacture/metafacture-fix/issues/115
+    // See issue metafacture-fix#115
     public void shouldEqualAnyNestedCharacterClass() {
         shouldEqualAnyNested("data.n[ao]me");
     }
@@ -696,7 +696,7 @@ public void shouldEqualAnyNestedAlternation() {
     }
 
     @Test
-    // See https://github.com/metafacture/metafacture-fix/issues/115
+    // See issue metafacture-fix#115
     public void shouldEqualAnyNestedWildcard() {
         shouldEqualAnyNested("data.n?me");
     }
@@ -737,7 +737,7 @@ public void shouldEqualAnyListBind() {
     }
 
     @Test
-    // See https://github.com/metafacture/metafacture-fix/issues/115
+    // See issue metafacture-fix#115
     public void shouldEqualAnyListBindCharacterClass() {
         shouldEqualAnyListBind("$i.n[ao]me");
     }
@@ -748,7 +748,7 @@ public void shouldEqualAnyListBindAlternation() {
     }
 
     @Test
-    // See https://github.com/metafacture/metafacture-fix/issues/115
+    // See issue metafacture-fix#115
     public void shouldEqualAnyListBindWildcard() {
         shouldEqualAnyListBind("$i.n?me");
     }
@@ -802,7 +802,7 @@ public void shouldContainImmediateField() {
     }
 
     @Test
-    // See https://github.com/metafacture/metafacture-fix/issues/117
+    // See issue metafacture-fix#117
     public void shouldContainNestedField() {
         MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
                 "if exists('data.name')",
@@ -861,7 +861,7 @@ public void shouldContainNestedField() {
     }
 
     @Test
-    // See https://github.com/metafacture/metafacture-fix/issues/117
+    // See issue metafacture-fix#117
     public void shouldContainNestedArrayField() {
         MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
                 "if exists('data[].*.name')",
diff --git a/metafix/src/test/java/org/metafacture/metafix/MetafixLookupTest.java b/metafix/src/test/java/org/metafacture/metafix/MetafixLookupTest.java
index d527fb80c..24c26f501 100644
--- a/metafix/src/test/java/org/metafacture/metafix/MetafixLookupTest.java
+++ b/metafix/src/test/java/org/metafacture/metafix/MetafixLookupTest.java
@@ -387,7 +387,7 @@ public void shouldLookupMovedExternalArrayWithAsteriskExplicitAppend() {
     }
 
     @Test
-    // See https://github.com/metafacture/metafacture-fix/issues/121
+    // See issue #601
     public void shouldLookupArraySubFieldWithAsterisk() {
         MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
                 "lookup('animals[].*.Aanimal', '" + TSV_MAP + "', 'sep_char': '\t')"
@@ -594,7 +594,7 @@ public void shouldDeleteLookupInExternalFileMapWithWrongOptions() {
     }
 
     @Test
-    // See https://github.com/metafacture/metafacture-fix/issues/149
+    // See issue metafacture-fix#149
     public void shouldKeepOriginalValueIfNotFoundAndNoDefault() {
         MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
                 "lookup('title.*', Aloha: 'Alohaeha', 'Moin': 'Moin zäme')"
@@ -685,7 +685,7 @@ public void shouldPreferDefaultOptionValueOverDefaultMapValue() {
     }
 
     @Test
-    // See https://github.com/metafacture/metafacture-fix/issues/149
+    // See issue metafacture-fix#149
     public void shouldDeleteNonFoundLookupOnDemand() {
         MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
                 "lookup('title.*', Aloha: Alohaeha, 'Moin': 'Moin zäme', delete: 'true')"
@@ -707,7 +707,7 @@ public void shouldDeleteNonFoundLookupOnDemand() {
     }
 
     @Test
-    // See https://github.com/metafacture/metafacture-fix/issues/149
+    // See issue metafacture-fix#149
     public void shouldNotDeleteNonFoundLookupExplicitly() {
         MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
                 "lookup('title.*', Aloha: Alohaeha, 'Moin': 'Moin zäme', delete: 'false')"
@@ -773,7 +773,7 @@ public void shouldLookupAfterDeletingUnsuccessfulLookup() {
     }
 
     @Test
-    // See https://github.com/metafacture/metafacture-fix/issues/149
+    // See issue metafacture-fix#149
     public void shouldDeleteNonFoundLookupOnDemandNonRepeatedField() {
         MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
                 "lookup('title', Aloha: Alohaeha, 'Moin': 'Moin zäme', delete: 'true')"
diff --git a/metafix/src/test/java/org/metafacture/metafix/MetafixMethodTest.java b/metafix/src/test/java/org/metafacture/metafix/MetafixMethodTest.java
index c198e8a23..7f0b94744 100644
--- a/metafix/src/test/java/org/metafacture/metafix/MetafixMethodTest.java
+++ b/metafix/src/test/java/org/metafacture/metafix/MetafixMethodTest.java
@@ -721,7 +721,7 @@ public void wildcardNestedPartialMulti() {
     }
 
     @Test
-    @MetafixToDo("See https://github.com/metafacture/metafacture-fix/issues/121")
+    @MetafixToDo("See issue #601")
     public void wildcardFullFieldNonIndex() {
         MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
                 "trim('*')"),
@@ -751,7 +751,7 @@ public void wildcardFullFieldNonIndex() {
     }
 
     @Test
-    @MetafixToDo("See https://github.com/metafacture/metafacture-fix/issues/121")
+    @MetafixToDo("See issue #601")
     public void wildcardNestedFullFieldNonIndex() {
         MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
                 "trim('work.*')"),
@@ -902,7 +902,7 @@ public void shouldAppendValueInArray() {
     }
 
     @Test
-    // See https://github.com/metafacture/metafacture-fix/issues/100
+    // See issue metafacture-fix#100
     public void shouldAppendValueInEntireArray() {
         MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
                 "append('animals[].*', ' is cool')"
@@ -950,7 +950,7 @@ public void shouldNotAppendValueToArray() {
     }
 
     @Test
-    // See https://github.com/metafacture/metafacture-fix/issues/100
+    // See issue metafacture-fix#100
     public void shouldNotAppendValueToHash() {
         MetafixTestHelpers.assertExecutionException(IllegalStateException.class, "Expected String, got Hash", () ->
             MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
@@ -972,7 +972,7 @@ public void shouldNotAppendValueToHash() {
     }
 
     @Test
-    // See https://github.com/metafacture/metafacture-fix/issues/123
+    // See issue metafacture-fix#123
     public void shouldIncludeLocationAndTextInExecutionException() {
         final String text = "append('animals', ' is cool')";
         final String message = "Error while executing Fix expression (at FILE, line 2): " + text;
@@ -1270,7 +1270,7 @@ public void shouldConvertInvalidObjectFromJsonWithErrorString() {
     }
 
     @Test
-    // See https://github.com/metafacture/metafacture-fix/issues/100
+    // See issue metafacture-fix#100
     public void shouldFilterArrayObjectValues() {
         MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
                 "filter('animals[]', '[Cc]at')"
@@ -1611,7 +1611,7 @@ public void shouldJoinSingleField() {
     }
 
     @Test
-    // See https://github.com/metafacture/metafacture-fix/issues/100
+    // See issue metafacture-fix#100
     public void shouldJoinArrayObjectField() {
         MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
                 "join_field('animals[]', ',')"
@@ -1704,7 +1704,7 @@ public void shouldPrependValueInArray() {
     }
 
     @Test
-    // See https://github.com/metafacture/metafacture-fix/issues/100
+    // See issue metafacture-fix#100
     public void shouldPrependValueInEntireArray() {
         MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
                 "prepend('animals[].*', 'cool ')"
@@ -1731,7 +1731,7 @@ public void shouldPrependValueInEntireArray() {
     }
 
     @Test
-    // See https://github.com/metafacture/metafacture-fix/issues/121
+    // See issue #601
     public void shouldPrependValueInNestedArray() {
         MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
                 "prepend('nestedTest[].*.test[].*', 'Number ')"
@@ -1777,7 +1777,7 @@ public void shouldPrependValueInNestedArray() {
     }
 
     @Test
-    // See https://github.com/metafacture/metafacture-fix/issues/121
+    // See issue #601
     public void shouldPrependValueInArraySubField() {
         MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
                 "prepend('coll[].*.a', 'HELLO ')"
@@ -1825,7 +1825,7 @@ public void shouldPrependValueInArraySubField() {
     }
 
     @Test
-    // See https://github.com/metafacture/metafacture-fix/issues/100
+    // See issue metafacture-fix#100
     public void shouldNotPrependValueToArray() {
         MetafixTestHelpers.assertExecutionException(IllegalStateException.class, "Expected String, got Array", () ->
             MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
@@ -1963,7 +1963,7 @@ public void shouldReplaceAllRegexesWithGroupName() {
     }
 
     @Test
-    // See https://github.com/metafacture/metafacture-fix/issues/100
+    // See issue metafacture-fix#100
     public void shouldReplaceAllRegexesInArray() {
         MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
                 "replace_all('animals[].*', a, QR)"
@@ -1990,7 +1990,7 @@ public void shouldReplaceAllRegexesInArray() {
     }
 
     @Test
-    // See https://github.com/metafacture/metafacture-fix/issues/121
+    // See issue #601
     public void shouldReplaceAllRegexesInArraySubField() {
         MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
                 "replace_all('coll[].*.a', 'o', '__')"
@@ -2038,7 +2038,7 @@ public void shouldReplaceAllRegexesInArraySubField() {
     }
 
     @Test
-    // See https://github.com/metafacture/metafacture-fix/issues/255
+    // See issue metafacture-fix#255
     public void shouldFailToReplaceAllInRepeatedSubfieldOfObjectWithAsterisk() {
         MetafixTestHelpers.assertProcessException(IllegalArgumentException.class, "Can't find: 2 in: null", () ->
             MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
@@ -2707,7 +2707,7 @@ public void shouldMoveFieldToPathWithTwoReservedFields() {
     }
 
     @Test
-    // See https://github.com/metafacture/metafacture-fix/issues/121
+    // See issue #601
     public void shouldReplaceAllRegexesInNestedArray() {
         MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
                 "replace_all('nestedTest[].*.test[].*', 'o', '__')"
@@ -3172,7 +3172,7 @@ public void shouldReverseArray() {
     }
 
     @Test
-    @MetafixToDo("See https://github.com/metafacture/metafacture-fix/issues/121")
+    @MetafixToDo("See issue #601")
     public void shouldReverseArrayOfStringsWithAsterisk() {
         MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
                 "reverse('test[].*')"
@@ -3199,7 +3199,7 @@ public void shouldReverseArrayOfStringsWithAsterisk() {
     }
 
     @Test
-    @MetafixToDo("java.lang.ArrayIndexOutOfBoundsException: 0; see https://github.com/metafacture/metafacture-fix/issues/121")
+    @MetafixToDo("java.lang.ArrayIndexOutOfBoundsException: 0; see issue #601")
     public void shouldReverseArrayOfHashesWithAsterisk() {
         MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
                 "reverse('ANIMALS[].*')"
diff --git a/metafix/src/test/java/org/metafacture/metafix/MetafixRecordTest.java b/metafix/src/test/java/org/metafacture/metafix/MetafixRecordTest.java
index b8c13b873..31bfab6f3 100644
--- a/metafix/src/test/java/org/metafacture/metafix/MetafixRecordTest.java
+++ b/metafix/src/test/java/org/metafacture/metafix/MetafixRecordTest.java
@@ -580,7 +580,7 @@ public void complexAppendWithArrayOfStrings() {
     }
 
     @Test
-    // See https://github.com/metafacture/metafacture-fix/issues/92
+    // See issue metafacture-fix#92
     public void complexAppendWithArrayOfObjects() {
         MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
                 "copy_field('others', 'animals[].$append')",
@@ -662,7 +662,7 @@ public void appendWithWildcard() {
     }
 
     @Test
-    // See https://github.com/metafacture/metafacture-fix/issues/99
+    // See issue metafacture-fix#99
     public void simpleCopyWithWildcard() {
         MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
                 "copy_field('?nimal', 'animal')"
@@ -785,7 +785,7 @@ public void appendWithBracketWildcard() {
     }
 
     @Test
-    // See https://github.com/metafacture/metafacture-fix/issues/89
+    // See issue metafacture-fix#89
     public void appendWithAsteriksWildcardAtTheEnd() {
         MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
                 "set_array('stringimals[]')",
@@ -864,7 +864,7 @@ public void shouldCopyArrayFieldWithoutAsterisk() {
     }
 
     @Test
-    @MetafixToDo("See https://github.com/metafacture/metafacture-fix/issues/113")
+    @MetafixToDo("See issue metafacture-fix#113")
     public void copyFieldArrayOfObjectsAndListNewArrayOfObjectsAndMoveSubfield() {
         MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
                 "copy_field('author[]','creator[]')",
@@ -891,7 +891,7 @@ public void copyFieldArrayOfObjectsAndListNewArrayOfObjectsAndMoveSubfield() {
     }
 
     @Test
-    // See https://github.com/metafacture/metafacture-fix/issues/121
+    // See issue #601
     public void shouldCopyArrayFieldWithAsterisk() {
         MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
                 "set_array('TEST_TWO[]')",
@@ -924,7 +924,7 @@ public void shouldCopyArrayFieldWithAsterisk() {
     }
 
     @Test
-    // See https://github.com/metafacture/metafacture-fix/issues/121
+    // See issue #601
     public void shouldCopyNestedArrayFieldWithAsterisk() {
         MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
                 "set_array('TEST_4[]')",
@@ -979,7 +979,7 @@ public void shouldCopyNestedArrayFieldWithAsterisk() {
     }
 
     @Test
-    // See https://github.com/metafacture/metafacture-fix/issues/121
+    // See issue #601
     public void shouldCopyArraySubFieldWithAsterisk() {
         MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
                 "set_array('TEST_5[]')",
@@ -1631,7 +1631,7 @@ public void copyIntoArrayTopLevel() {
     }
 
     @Test
-    // See https://github.com/metafacture/metafacture-fix/issues/106
+    // See issue metafacture-fix#106
     public void shouldCopyMarkedArrayOfStringsIntoUnmarkedArray() {
         MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
                 "copy_field('animal_string_Array[]', 'animals_repeated_SimpleField')"
@@ -1658,7 +1658,7 @@ public void shouldCopyMarkedArrayOfStringsIntoUnmarkedArray() {
     }
 
     @Test
-    // See https://github.com/metafacture/metafacture-fix/issues/106
+    // See issue metafacture-fix#106
     public void shouldCopyMarkedArrayOfHashesIntoUnmarkedArray() {
         MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
                 "copy_field('animal_object_Array[]', 'animals_repeated_ObjectField')"
@@ -1696,7 +1696,7 @@ public void shouldCopyMarkedArrayOfHashesIntoUnmarkedArray() {
     }
 
     @Test
-    // See https://github.com/metafacture/metafacture-fix/issues/106
+    // See issue metafacture-fix#106
     public void shouldCopyMarkedArrayOfHashesIntoMarkedArray() {
         MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
                 "copy_field('animal_object_Array[]', 'test_animal_object_Array[]')"
@@ -1870,7 +1870,7 @@ public void setArray() {
     }
 
     @Test
-    // See https://github.com/metafacture/metafacture-fix/issues/111
+    // See issue metafacture-fix#111
     public void setArrayReplaceExisting() {
         MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
                 "set_array('foo[]','a','b','c')"),
@@ -1894,7 +1894,7 @@ public void setArrayReplaceExisting() {
     }
 
     @Test
-    // See https://github.com/metafacture/metafacture-fix/issues/130
+    // See issue metafacture-fix#130
     public void setArrayInArrayWithAsterisk() {
         MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
                 "set_array('foo[].*.test[]', 'test')"),
@@ -1944,7 +1944,7 @@ public void setHash() {
     }
 
     @Test
-    // See https://github.com/metafacture/metafacture-fix/issues/111
+    // See issue metafacture-fix#111
     public void setHashReplaceExisting() {
         MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
                 "set_hash('foo','a': 'b','c': 'd')"),
@@ -3338,7 +3338,7 @@ public void shouldAddRandomNumber() {
     }
 
     @Test
-    // See https://github.com/metafacture/metafacture-fix/issues/100
+    // See issue metafacture-fix#100
     public void shouldReplaceExistingValueWithRandomNumber() {
         MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
                 "random(others, '100')"
@@ -3424,7 +3424,7 @@ public void shouldAddRandomNumberToUnmarkedArray() {
     }
 
     @Test
-    @MetafixToDo("See https://github.com/metafacture/metafacture-fix/issues/100")
+    @MetafixToDo("See issue metafacture-fix#100")
     public void shouldNotAppendRandomNumberToHash() {
         MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
                 "random('animals.$append', '100')"
@@ -3471,7 +3471,7 @@ public void shouldRenameFieldsInHash() {
     }
 
     @Test
-    // See https://github.com/metafacture/metafacture-fix/issues/100
+    // See issue metafacture-fix#100
     public void shouldRecursivelyRenameFieldsInHash() {
         MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
                 "rename(others, ani, QR)"
@@ -3501,7 +3501,7 @@ public void shouldRecursivelyRenameFieldsInHash() {
     }
 
     @Test
-    // See https://github.com/metafacture/metafacture-fix/issues/100
+    // See issue metafacture-fix#100
     public void shouldRecursivelyRenameFieldsInArray() {
         MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
                 "rename('animals[]', ani, XY)"
@@ -3533,7 +3533,7 @@ public void shouldRecursivelyRenameFieldsInArray() {
     }
 
     @Test
-    @MetafixToDo("java.lang.ArrayIndexOutOfBoundsException: 0; see https://github.com/metafacture/metafacture-fix/issues/100")
+    @MetafixToDo("java.lang.ArrayIndexOutOfBoundsException: 0; see issue metafacture-fix#100")
     public void shouldRenameAllFieldsInHash() {
         MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
                 "rename('.', ani, XY)"
@@ -3577,7 +3577,7 @@ public void shouldRenameAllFieldsInHash() {
     }
 
     @Test
-    @MetafixToDo("java.lang.ArrayIndexOutOfBoundsException: 0; see https://github.com/metafacture/metafacture-fix/issues/121")
+    @MetafixToDo("java.lang.ArrayIndexOutOfBoundsException: 0; see issue #601")
     public void shouldRenameArrayFieldWithAsterisk() {
         MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
                 "rename('OTHERS[].*', 'd', 'XY')"
diff --git a/metafix/src/test/java/org/metafacture/metafix/MetafixTest.java b/metafix/src/test/java/org/metafacture/metafix/MetafixTest.java
index 5ddbe182b..119a5f929 100644
--- a/metafix/src/test/java/org/metafacture/metafix/MetafixTest.java
+++ b/metafix/src/test/java/org/metafacture/metafix/MetafixTest.java
@@ -158,7 +158,7 @@ public void shouldGetDefaultValueForUnknownKey() {
     }
 
     @Test
-    // See https://github.com/metafacture/metafacture-fix/issues/79
+    // See issue metafacture-fix#79
     public void shouldThrowExceptionForInvalidFixFile() {
         final String fixFile = "src/test/resources/org/metafacture/metafix/fixes/invalid.fix";
         MetafixTestHelpers.assertThrows(FixParseException.class, "Invalid FixStandaloneSetup resource: " + fixFile, () -> new Metafix(fixFile));
diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/bind/fromJson/toJson/listSimpleArrayOfStringsWithVariableAndAppend/todo.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/bind/fromJson/toJson/listSimpleArrayOfStringsWithVariableAndAppend/todo.txt
index 9dd034d9d..0e9663c13 100644
--- a/metafix/src/test/resources/org/metafacture/metafix/integration/bind/fromJson/toJson/listSimpleArrayOfStringsWithVariableAndAppend/todo.txt
+++ b/metafix/src/test/resources/org/metafacture/metafix/integration/bind/fromJson/toJson/listSimpleArrayOfStringsWithVariableAndAppend/todo.txt
@@ -1 +1 @@
-See issue #189
+See issue #613
diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/bind/fromJson/toJson/listSimpleArrayOfStringsWithoutVariableAndAppend/todo.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/bind/fromJson/toJson/listSimpleArrayOfStringsWithoutVariableAndAppend/todo.txt
index efdfa1745..6a0e8578c 100644
--- a/metafix/src/test/resources/org/metafacture/metafix/integration/bind/fromJson/toJson/listSimpleArrayOfStringsWithoutVariableAndAppend/todo.txt
+++ b/metafix/src/test/resources/org/metafacture/metafix/integration/bind/fromJson/toJson/listSimpleArrayOfStringsWithoutVariableAndAppend/todo.txt
@@ -1 +1 @@
-See issue #191
+See issue #614
diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/lookup/fromJson/toJson/lookupInSubfieldInArrayOfObjects_complex_2_withNotMatchingValue/todo.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/lookup/fromJson/toJson/lookupInSubfieldInArrayOfObjects_complex_2_withNotMatchingValue/todo.txt
index f5546343c..72641b682 100644
--- a/metafix/src/test/resources/org/metafacture/metafix/integration/lookup/fromJson/toJson/lookupInSubfieldInArrayOfObjects_complex_2_withNotMatchingValue/todo.txt
+++ b/metafix/src/test/resources/org/metafacture/metafix/integration/lookup/fromJson/toJson/lookupInSubfieldInArrayOfObjects_complex_2_withNotMatchingValue/todo.txt
@@ -1 +1 @@
-See issue #149
+See issue metafacture-fix#149
diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/replace_allInArrayOfStringsWithDoList/todo.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/replace_allInArrayOfStringsWithDoList/todo.txt
index 9dd034d9d..0e9663c13 100644
--- a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/replace_allInArrayOfStringsWithDoList/todo.txt
+++ b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/replace_allInArrayOfStringsWithDoList/todo.txt
@@ -1 +1 @@
-See issue #189
+See issue #613
diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/reverseSubfieldInArrayOfObjects/todo.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/reverseSubfieldInArrayOfObjects/todo.txt
index 0b9661d26..d9200c8b3 100644
--- a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/reverseSubfieldInArrayOfObjects/todo.txt
+++ b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/reverseSubfieldInArrayOfObjects/todo.txt
@@ -1 +1 @@
-See issue #121
+See issue #601
diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/reverseValuesInArrayOfStrings/todo.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/reverseValuesInArrayOfStrings/todo.txt
index 0b9661d26..d9200c8b3 100644
--- a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/reverseValuesInArrayOfStrings/todo.txt
+++ b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/reverseValuesInArrayOfStrings/todo.txt
@@ -1 +1 @@
-See issue #121
+See issue #601
diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/sort_fieldInArrayOfObjectsWithAsterisk/todo.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/sort_fieldInArrayOfObjectsWithAsterisk/todo.txt
index 0b9661d26..d9200c8b3 100644
--- a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/sort_fieldInArrayOfObjectsWithAsterisk/todo.txt
+++ b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/sort_fieldInArrayOfObjectsWithAsterisk/todo.txt
@@ -1 +1 @@
-See issue #121
+See issue #601
diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/split_fieldSubfieldInArrayOfObjectsWithAsterisk/todo.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/split_fieldSubfieldInArrayOfObjectsWithAsterisk/todo.txt
index 0b9661d26..d9200c8b3 100644
--- a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/split_fieldSubfieldInArrayOfObjectsWithAsterisk/todo.txt
+++ b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/split_fieldSubfieldInArrayOfObjectsWithAsterisk/todo.txt
@@ -1 +1 @@
-See issue #121
+See issue #601
diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/sumSubfieldInArrayOfObjects/todo.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/sumSubfieldInArrayOfObjects/todo.txt
index 0b9661d26..d9200c8b3 100644
--- a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/sumSubfieldInArrayOfObjects/todo.txt
+++ b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/sumSubfieldInArrayOfObjects/todo.txt
@@ -1 +1 @@
-See issue #121
+See issue #601
diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/uniqMultipleArraysWithAsterisk/todo.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/uniqMultipleArraysWithAsterisk/todo.txt
index ccaae036c..0013a87c7 100644
--- a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/uniqMultipleArraysWithAsterisk/todo.txt
+++ b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/uniqMultipleArraysWithAsterisk/todo.txt
@@ -1 +1 @@
-See issue #261
+See issue #625
diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/upcaseInArrayOfStringsWithDoList/todo.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/upcaseInArrayOfStringsWithDoList/todo.txt
index 9dd034d9d..0e9663c13 100644
--- a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/upcaseInArrayOfStringsWithDoList/todo.txt
+++ b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromJson/toJson/upcaseInArrayOfStringsWithDoList/todo.txt
@@ -1 +1 @@
-See issue #189
+See issue #613
diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_toUpper/todo.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_toUpper/todo.txt
index 26653fd69..5539bc76a 100644
--- a/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_toUpper/todo.txt
+++ b/metafix/src/test/resources/org/metafacture/metafix/integration/method/fromXml/toJson/replace_toUpper/todo.txt
@@ -1 +1 @@
-See issue #251
+See issue metafacture-fix#251
diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldArrayOfObjectsAndListNewArrayOfObjectsAndMoveSubfield/todo.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldArrayOfObjectsAndListNewArrayOfObjectsAndMoveSubfield/todo.txt
index a5c105dfb..11bb100ec 100644
--- a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldArrayOfObjectsAndListNewArrayOfObjectsAndMoveSubfield/todo.txt
+++ b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldArrayOfObjectsAndListNewArrayOfObjectsAndMoveSubfield/todo.txt
@@ -1 +1 @@
-See issue #113
+See issue metafacture-fix#113
diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldArrayOfObjectsAsRepeatedObjectAndThenArrayOfStringsIntoTheArrayOfObjectsWithLastWildcard/todo.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldArrayOfObjectsAsRepeatedObjectAndThenArrayOfStringsIntoTheArrayOfObjectsWithLastWildcard/todo.txt
index 9b87121b8..7e1e975dd 100644
--- a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldArrayOfObjectsAsRepeatedObjectAndThenArrayOfStringsIntoTheArrayOfObjectsWithLastWildcard/todo.txt
+++ b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldArrayOfObjectsAsRepeatedObjectAndThenArrayOfStringsIntoTheArrayOfObjectsWithLastWildcard/todo.txt
@@ -1 +1 @@
-See issue #132
+See issue #602
diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldArrayOfStringsIntoArrayOfObjectsWithAsteriskWildcard/todo.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldArrayOfStringsIntoArrayOfObjectsWithAsteriskWildcard/todo.txt
index 760ffe30d..5f8aef700 100644
--- a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldArrayOfStringsIntoArrayOfObjectsWithAsteriskWildcard/todo.txt
+++ b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldArrayOfStringsIntoArrayOfObjectsWithAsteriskWildcard/todo.txt
@@ -1 +1 @@
-See issue #193
+See issue #615
diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldArrayOfStringsWithSingleValueAsIndexedRepeatedField/todo.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldArrayOfStringsWithSingleValueAsIndexedRepeatedField/todo.txt
index c1e768f6f..91de8d207 100644
--- a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldArrayOfStringsWithSingleValueAsIndexedRepeatedField/todo.txt
+++ b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldArrayOfStringsWithSingleValueAsIndexedRepeatedField/todo.txt
@@ -1 +1 @@
-See issue #239
+See issue #621
diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldArrayWithoutValues/todo.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldArrayWithoutValues/todo.txt
index 17d1dcd1b..6ed8fc15e 100644
--- a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldArrayWithoutValues/todo.txt
+++ b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldArrayWithoutValues/todo.txt
@@ -1 +1 @@
-See #195
+See issue #616
diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldValuesOfArrayOfStringsIntoArray/todo.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldValuesOfArrayOfStringsIntoArray/todo.txt
index 15815c538..e5cb7c432 100644
--- a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldValuesOfArrayOfStringsIntoArray/todo.txt
+++ b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldValuesOfArrayOfStringsIntoArray/todo.txt
@@ -1 +1 @@
-See issue #148
+See issue #604
diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldWithAlternationOfFieldInArrayOfObjects/todo.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldWithAlternationOfFieldInArrayOfObjects/todo.txt
index e32a6f359..f54cf3bf6 100644
--- a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldWithAlternationOfFieldInArrayOfObjects/todo.txt
+++ b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldWithAlternationOfFieldInArrayOfObjects/todo.txt
@@ -1 +1 @@
-See issue #143
+See issue #603
diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldWithAlternationOfFieldInMultipleArraysOfObjects/todo.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldWithAlternationOfFieldInMultipleArraysOfObjects/todo.txt
index e32a6f359..f54cf3bf6 100644
--- a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldWithAlternationOfFieldInMultipleArraysOfObjects/todo.txt
+++ b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldWithAlternationOfFieldInMultipleArraysOfObjects/todo.txt
@@ -1 +1 @@
-See issue #143
+See issue #603
diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldWithAlternationOfNestedFields/todo.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldWithAlternationOfNestedFields/todo.txt
index e32a6f359..f54cf3bf6 100644
--- a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldWithAlternationOfNestedFields/todo.txt
+++ b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/copy_fieldWithAlternationOfNestedFields/todo.txt
@@ -1 +1 @@
-See issue #143
+See issue #603
diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldArrayWithoutValue/todo.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldArrayWithoutValue/todo.txt
index 17d1dcd1b..6ed8fc15e 100644
--- a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldArrayWithoutValue/todo.txt
+++ b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldArrayWithoutValue/todo.txt
@@ -1 +1 @@
-See #195
+See issue #616
diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldIntoOwnSubfield/todo.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldIntoOwnSubfield/todo.txt
index d1cb719fd..9dc0958cc 100644
--- a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldIntoOwnSubfield/todo.txt
+++ b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldIntoOwnSubfield/todo.txt
@@ -1 +1 @@
-See #104
+See issue #599
diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldSimpleWithAsteriskPathWildcard/todo.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldSimpleWithAsteriskPathWildcard/todo.txt
index d0162332a..54ff97f6b 100644
--- a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldSimpleWithAsteriskPathWildcard/todo.txt
+++ b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldSimpleWithAsteriskPathWildcard/todo.txt
@@ -1 +1 @@
-See issue #185
+See issue #612
diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldSimpleWithLeadingQuestionmarkPathWildcard/todo.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldSimpleWithLeadingQuestionmarkPathWildcard/todo.txt
index d0162332a..54ff97f6b 100644
--- a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldSimpleWithLeadingQuestionmarkPathWildcard/todo.txt
+++ b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldSimpleWithLeadingQuestionmarkPathWildcard/todo.txt
@@ -1 +1 @@
-See issue #185
+See issue #612
diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldSimpleWithTrailingAsteriskPathWildcard/todo.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldSimpleWithTrailingAsteriskPathWildcard/todo.txt
index d0162332a..54ff97f6b 100644
--- a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldSimpleWithTrailingAsteriskPathWildcard/todo.txt
+++ b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldSimpleWithTrailingAsteriskPathWildcard/todo.txt
@@ -1 +1 @@
-See issue #185
+See issue #612
diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldWithAlternationOfFieldInArrayOfObjects/todo.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldWithAlternationOfFieldInArrayOfObjects/todo.txt
index 15815c538..e5cb7c432 100644
--- a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldWithAlternationOfFieldInArrayOfObjects/todo.txt
+++ b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldWithAlternationOfFieldInArrayOfObjects/todo.txt
@@ -1 +1 @@
-See issue #148
+See issue #604
diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldWithAlternationOfFieldInMultipleArraysOfObjects/todo.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldWithAlternationOfFieldInMultipleArraysOfObjects/todo.txt
index e32a6f359..f54cf3bf6 100644
--- a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldWithAlternationOfFieldInMultipleArraysOfObjects/todo.txt
+++ b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldWithAlternationOfFieldInMultipleArraysOfObjects/todo.txt
@@ -1 +1 @@
-See issue #143
+See issue #603
diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldWithAlternationOfNestedFields/todo.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldWithAlternationOfNestedFields/todo.txt
index e32a6f359..f54cf3bf6 100644
--- a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldWithAlternationOfNestedFields/todo.txt
+++ b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/move_fieldWithAlternationOfNestedFields/todo.txt
@@ -1 +1 @@
-See issue #143
+See issue #603
diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/remove_fieldArrayOfObjectsInArrayOfObjects/todo.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/remove_fieldArrayOfObjectsInArrayOfObjects/todo.txt
index 760ffe30d..5f8aef700 100644
--- a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/remove_fieldArrayOfObjectsInArrayOfObjects/todo.txt
+++ b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/remove_fieldArrayOfObjectsInArrayOfObjects/todo.txt
@@ -1 +1 @@
-See issue #193
+See issue #615
diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/remove_fieldAsteriskInArrayOfObjects/todo.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/remove_fieldAsteriskInArrayOfObjects/todo.txt
index 760ffe30d..5f8aef700 100644
--- a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/remove_fieldAsteriskInArrayOfObjects/todo.txt
+++ b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/remove_fieldAsteriskInArrayOfObjects/todo.txt
@@ -1 +1 @@
-See issue #193
+See issue #615
diff --git a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/set_arrayWithoutValuesAndMove_fieldNewArrayOfStringsIntoArrayOfObjects/todo.txt b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/set_arrayWithoutValuesAndMove_fieldNewArrayOfStringsIntoArrayOfObjects/todo.txt
index 17d1dcd1b..6ed8fc15e 100644
--- a/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/set_arrayWithoutValuesAndMove_fieldNewArrayOfStringsIntoArrayOfObjects/todo.txt
+++ b/metafix/src/test/resources/org/metafacture/metafix/integration/record/fromJson/toJson/set_arrayWithoutValuesAndMove_fieldNewArrayOfStringsIntoArrayOfObjects/todo.txt
@@ -1 +1 @@
-See #195
+See issue #616