diff --git a/testsuite/compiler/check/cyclic/abs-types/test1.gfs b/testsuite/compiler/check/cyclic/abs-types/test1.gfs
index a220a2663..d3d2b660d 100644
--- a/testsuite/compiler/check/cyclic/abs-types/test1.gfs
+++ b/testsuite/compiler/check/cyclic/abs-types/test1.gfs
@@ -1 +1 @@
-i testsuite/compiler/check/cyclic/abs-types/Test1Abs.gf
\ No newline at end of file
+i -src testsuite/compiler/check/cyclic/abs-types/Test1Abs.gf
\ No newline at end of file
diff --git a/testsuite/compiler/check/cyclic/abs-types/test2.gfs b/testsuite/compiler/check/cyclic/abs-types/test2.gfs
index 889107319..f6d46be22 100644
--- a/testsuite/compiler/check/cyclic/abs-types/test2.gfs
+++ b/testsuite/compiler/check/cyclic/abs-types/test2.gfs
@@ -1 +1 @@
-i testsuite/compiler/check/cyclic/abs-types/Test2Abs.gf
\ No newline at end of file
+i -src testsuite/compiler/check/cyclic/abs-types/Test2Abs.gf
\ No newline at end of file
diff --git a/testsuite/compiler/check/cyclic/opers/test.gfs b/testsuite/compiler/check/cyclic/opers/test.gfs
index 5c469f036..ca449eee0 100644
--- a/testsuite/compiler/check/cyclic/opers/test.gfs
+++ b/testsuite/compiler/check/cyclic/opers/test.gfs
@@ -1 +1 @@
-i testsuite/compiler/check/cyclic/opers/TestOpers.gf
\ No newline at end of file
+i -src testsuite/compiler/check/cyclic/opers/TestOpers.gf
\ No newline at end of file
diff --git a/testsuite/compiler/check/cyclic/params/test.gfs b/testsuite/compiler/check/cyclic/params/test.gfs
index 120ad77ce..abad8c5d4 100644
--- a/testsuite/compiler/check/cyclic/params/test.gfs
+++ b/testsuite/compiler/check/cyclic/params/test.gfs
@@ -1 +1 @@
-i testsuite/compiler/check/cyclic/params/TestParams.gf
\ No newline at end of file
+i -src testsuite/compiler/check/cyclic/params/TestParams.gf
\ No newline at end of file
diff --git a/testsuite/compiler/check/oper-definition/test.gfs.gold b/testsuite/compiler/check/oper-definition/test.gfs.gold
index 1a7b407f2..cf2f7f5ec 100644
--- a/testsuite/compiler/check/oper-definition/test.gfs.gold
+++ b/testsuite/compiler/check/oper-definition/test.gfs.gold
@@ -1,5 +1,5 @@
 

 

 checking module Res

-   Happened in operation my_oper in Res.gf, line 3 :

+   Happened in operation my_oper in Res.gf, line 3:

       No definition given to the operation

diff --git a/testsuite/compiler/typecheck/concrete/test_A.gfs.gold b/testsuite/compiler/typecheck/concrete/test_A.gfs.gold
index 8ab581f09..f35da4b18 100644
--- a/testsuite/compiler/typecheck/concrete/test_A.gfs.gold
+++ b/testsuite/compiler/typecheck/concrete/test_A.gfs.gold
@@ -1,5 +1,5 @@
 

 

 checking module A

-   Happened in operation silly in A.gf, line 5 :

+   Happened in operation silly in A.gf, line 5:

       A function type is expected for a_Det instead of type Str

diff --git a/testsuite/runtime/typecheck/implicit-arguments.gfs b/testsuite/runtime/typecheck/implicit-arguments.gfs
index 0306a662a..c2be00d21 100644
--- a/testsuite/runtime/typecheck/implicit-arguments.gfs
+++ b/testsuite/runtime/typecheck/implicit-arguments.gfs
@@ -1,4 +1,4 @@
-i testsuite/runtime/typecheck/Graph.gf
+i -src testsuite/runtime/typecheck/Graph.gf
 ai join l12 (link l23)
 ai join {n1} {n2} {n3} l12 (link {n2} {n3} l23)
 ai <? : Label>