diff --git a/core/typechecker/src/test/resources/Type_Check_PP_Classes_TestSuite_External/fulltest/PP/extexplopdef/extexplopdef.vpp.result b/core/typechecker/src/test/resources/Type_Check_PP_Classes_TestSuite_External/fulltest/PP/extexplopdef/extexplopdef.vpp.result
index fd8b63d5e2..6727e995b8 100644
--- a/core/typechecker/src/test/resources/Type_Check_PP_Classes_TestSuite_External/fulltest/PP/extexplopdef/extexplopdef.vpp.result
+++ b/core/typechecker/src/test/resources/Type_Check_PP_Classes_TestSuite_External/fulltest/PP/extexplopdef/extexplopdef.vpp.result
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <testResult type="org.overture.typechecker.tests.external.ExternalClassesPpTypeCheckTest">
 <message column="26" line="14" message="Definition 's' not used" messageType="warning" number="5000" resource="extexplopdef.vpp"/>
-<message column="26" line="20" message="Definition 's' not used" messageType="warning" number="5000" resource="extexplopdef.vpp"/>
 <message column="35" line="20" message="Definition 't' not used" messageType="warning" number="5000" resource="extexplopdef.vpp"/>
+<message column="26" line="20" message="Definition 's' not used" messageType="warning" number="5000" resource="extexplopdef.vpp"/>
 <message column="17" line="27" message="Definition 'r' not used" messageType="warning" number="5000" resource="extexplopdef.vpp"/>
 <message column="7" line="48" message="Duplicate definition: a" messageType="warning" number="5007" resource="extexplopdef.vpp"/>
 <message column="7" line="48" message="a at 3:7 hidden by a" messageType="warning" number="5008" resource="extexplopdef.vpp"/>
diff --git a/core/typechecker/src/test/resources/Type_Check_PP_Classes_TestSuite_External/fulltest/PP/fundefpp/fundefpp.vpp.result b/core/typechecker/src/test/resources/Type_Check_PP_Classes_TestSuite_External/fulltest/PP/fundefpp/fundefpp.vpp.result
index c3d756a4c2..f5db827059 100644
--- a/core/typechecker/src/test/resources/Type_Check_PP_Classes_TestSuite_External/fulltest/PP/fundefpp/fundefpp.vpp.result
+++ b/core/typechecker/src/test/resources/Type_Check_PP_Classes_TestSuite_External/fulltest/PP/fundefpp/fundefpp.vpp.result
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <testResult type="org.overture.typechecker.tests.external.ExternalClassesPpTypeCheckTest">
-<message column="13" line="13" message="Definition 'b' not used" messageType="warning" number="5000" resource="fundefpp.vpp"/>
 <message column="11" line="13" message="Definition 'a' not used" messageType="warning" number="5000" resource="fundefpp.vpp"/>
+<message column="13" line="13" message="Definition 'b' not used" messageType="warning" number="5000" resource="fundefpp.vpp"/>
 <message column="9" line="33" message="Definition 'i' not used" messageType="warning" number="5000" resource="fundefpp.vpp"/>
 <message column="11" line="44" message="Definition 'a' not used" messageType="warning" number="5000" resource="fundefpp.vpp"/>
 <message column="13" line="44" message="Definition 'b' not used" messageType="warning" number="5000" resource="fundefpp.vpp"/>
diff --git a/core/typechecker/src/test/resources/Type_Check_PP_Classes_TestSuite_External/fulltest/PP/stmtpp/casesstmt/casesstmt.vpp.result b/core/typechecker/src/test/resources/Type_Check_PP_Classes_TestSuite_External/fulltest/PP/stmtpp/casesstmt/casesstmt.vpp.result
index 6878dc4ee7..10a2bb6c96 100644
--- a/core/typechecker/src/test/resources/Type_Check_PP_Classes_TestSuite_External/fulltest/PP/stmtpp/casesstmt/casesstmt.vpp.result
+++ b/core/typechecker/src/test/resources/Type_Check_PP_Classes_TestSuite_External/fulltest/PP/stmtpp/casesstmt/casesstmt.vpp.result
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <testResult type="org.overture.typechecker.tests.external.ExternalClassesPpTypeCheckTest">
-<message column="12" line="8" message="Definition 'l2' not used" messageType="warning" number="5000" resource="casesstmt.vpp"/>
 <message column="7" line="8" message="Definition 'l1' not used" messageType="warning" number="5000" resource="casesstmt.vpp"/>
+<message column="12" line="8" message="Definition 'l2' not used" messageType="warning" number="5000" resource="casesstmt.vpp"/>
 <message column="7" line="9" message="Definition 'a' not used" messageType="warning" number="5000" resource="casesstmt.vpp"/>
 <message column="12" line="4" message="Definition 'dummy' not used" messageType="warning" number="5000" resource="casesstmt.vpp"/>
 <message column="7" line="14" message="Definition 'b' not used" messageType="warning" number="5000" resource="casesstmt.vpp"/>
diff --git a/core/typechecker/src/test/resources/Type_Check_SL_Modules_TestSuite_External/fulltest/CORE/stmt/casesstmt/casesstmt-01.vdm.result b/core/typechecker/src/test/resources/Type_Check_SL_Modules_TestSuite_External/fulltest/CORE/stmt/casesstmt/casesstmt-01.vdm.result
index 957f9f1cdb..e0da4aeb36 100644
--- a/core/typechecker/src/test/resources/Type_Check_SL_Modules_TestSuite_External/fulltest/CORE/stmt/casesstmt/casesstmt-01.vdm.result
+++ b/core/typechecker/src/test/resources/Type_Check_SL_Modules_TestSuite_External/fulltest/CORE/stmt/casesstmt/casesstmt-01.vdm.result
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <testResult type="org.overture.typechecker.tests.external.ExternalModulesSlTypeCheckTest">
-<message column="13" line="11" message="Definition 'b' not used" messageType="warning" number="5000" resource="casesstmt-01.vdm"/>
 <message column="11" line="11" message="Definition 'a' not used" messageType="warning" number="5000" resource="casesstmt-01.vdm"/>
+<message column="13" line="11" message="Definition 'b' not used" messageType="warning" number="5000" resource="casesstmt-01.vdm"/>
 <message column="12" line="12" message="Definition 'l2' not used" messageType="warning" number="5000" resource="casesstmt-01.vdm"/>
 <message column="7" line="12" message="Definition 'l1' not used" messageType="warning" number="5000" resource="casesstmt-01.vdm"/>
 <message column="7" line="13" message="Definition 'a' not used" messageType="warning" number="5000" resource="casesstmt-01.vdm"/>
diff --git a/core/typechecker/src/test/resources/Type_Check_SL_Modules_TestSuite_External/fulltest/CORE/stmt/letbestmt/letbestmt.vdm.result b/core/typechecker/src/test/resources/Type_Check_SL_Modules_TestSuite_External/fulltest/CORE/stmt/letbestmt/letbestmt.vdm.result
index 7fc21f672f..d504c1ca59 100644
--- a/core/typechecker/src/test/resources/Type_Check_SL_Modules_TestSuite_External/fulltest/CORE/stmt/letbestmt/letbestmt.vdm.result
+++ b/core/typechecker/src/test/resources/Type_Check_SL_Modules_TestSuite_External/fulltest/CORE/stmt/letbestmt/letbestmt.vdm.result
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <testResult type="org.overture.typechecker.tests.external.ExternalModulesSlTypeCheckTest">
 <message column="18" line="19" message="Empty set used in bind" messageType="warning" number="5009" resource="letbestmt.vdm"/>
-<message column="12" line="32" message="Definition 'arg1' not used" messageType="warning" number="5000" resource="letbestmt.vdm"/>
 <message column="18" line="32" message="Definition 'arg2' not used" messageType="warning" number="5000" resource="letbestmt.vdm"/>
+<message column="12" line="32" message="Definition 'arg1' not used" messageType="warning" number="5000" resource="letbestmt.vdm"/>
 <result/>
 </testResult>
diff --git a/core/typechecker/src/test/resources/Type_Check_SL_Modules_TestSuite_External/fulltest/SL/opdef/opdef.vdm.result b/core/typechecker/src/test/resources/Type_Check_SL_Modules_TestSuite_External/fulltest/SL/opdef/opdef.vdm.result
index 870e59d0e9..7d855e0d72 100644
--- a/core/typechecker/src/test/resources/Type_Check_SL_Modules_TestSuite_External/fulltest/SL/opdef/opdef.vdm.result
+++ b/core/typechecker/src/test/resources/Type_Check_SL_Modules_TestSuite_External/fulltest/SL/opdef/opdef.vdm.result
@@ -4,8 +4,8 @@
 <message column="7" line="53" message="a at 5:7 hidden by a" messageType="warning" number="5008" resource="opdef.vdm"/>
 <message column="7" line="5" message="Duplicate definition: a" messageType="warning" number="5007" resource="opdef.vdm"/>
 <message column="8" line="87" message="a at 5:7 hidden by a" messageType="warning" number="5008" resource="opdef.vdm"/>
-<message column="12" line="98" message="a at 5:7 hidden by a" messageType="warning" number="5008" resource="opdef.vdm"/>
 <message column="14" line="98" message="b at 6:7 hidden by b" messageType="warning" number="5008" resource="opdef.vdm"/>
+<message column="12" line="98" message="a at 5:7 hidden by a" messageType="warning" number="5008" resource="opdef.vdm"/>
 <message column="12" line="98" message="Definition 'a' not used" messageType="warning" number="5000" resource="opdef.vdm"/>
 <message column="8" line="103" message="a at 5:7 hidden by a" messageType="warning" number="5008" resource="opdef.vdm"/>
 <message column="3" line="14" message="Definition 'Op1' not used" messageType="warning" number="5000" resource="opdef.vdm"/>