7 files changed, 27 insertions, 27 deletions
diff --git a/.gitignore b/.gitignore
index f05ca2016..dc63ebb4c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -169,8 +169,8 @@ examples/cross_calculator/android/tags
 /testresults.json
 /tests/caas/idetools_api
 /tests/caas/imported
-/tests/caas/issue_416
-/tests/caas/issue_452
+/tests/caas/issue_416_template_shift
+/tests/caas/issue_452_export_shift
 /tests/caas/main
 /tests/caasdriver
 /tools/nimgrep
diff --git a/tests/caas/issue_416.txt b/tests/caas/issue_416.txt
deleted file mode 100644
index 7f81c2b2c..000000000
--- a/tests/caas/issue_416.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-issue_416.nim
-> c
-SuccessX
-> idetools --track:issue_416.nim,12,28 --def
-def\tskType\tsystem.string\tstring
-> idetools --track:issue_416.nim,12,35 --def
-def\tskLet\tissue_416.failtest.input\tTaintedString
-
-# The following fail because they seem shifted one colum to the right.
-> idetools --track:issue_416.nim,12,16 --def
-def\tskTemplate\tsequtils.toSeq\tproc \(expr\): expr
-> idetools --track:issue_416.nim,12,22 --def
-def\tskIterator\tunicode.runes\titerator \(string\): TRune
-
diff --git a/tests/caas/issue_416.nim b/tests/caas/issue_416_template_shift.nim
index d52f611d6..d52f611d6 100644
--- a/tests/caas/issue_416.nim
+++ b/tests/caas/issue_416_template_shift.nim
diff --git a/tests/caas/issue_416_template_shift.txt b/tests/caas/issue_416_template_shift.txt
new file mode 100644
index 000000000..3a494bd57
--- /dev/null
+++ b/tests/caas/issue_416_template_shift.txt
@@ -0,0 +1,14 @@
+issue_416_template_shift.nim
+> c
+SuccessX
+> idetools --track:issue_416_template_shift.nim,12,28 --def
+def\tskType\tsystem.string\tstring
+> idetools --track:issue_416_template_shift.nim,12,35 --def
+def\tskLet\tissue_416_template_shift.failtest.input\tTaintedString
+
+# The following fail because they seem shifted one colum to the right.
+> idetools --track:issue_416_template_shift.nim,12,16 --def
+def\tskTemplate\tsequtils.toSeq\tproc \(expr\): expr
+> idetools --track:issue_416_template_shift.nim,12,22 --def
+def\tskIterator\tunicode.runes\titerator \(string\): TRune
+
diff --git a/tests/caas/issue_452.txt b/tests/caas/issue_452.txt
deleted file mode 100644
index 5db60516c..000000000
--- a/tests/caas/issue_452.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-issue_452.nim
-> c
-SuccessX
-> idetools --track:issue_452.nim,2,2 --def
-def\tskConst\tissue_452.VERSION_STR1\tstring
-> idetools --track:issue_452.nim,3,2 --def
-def\tskConst\tissue_452.VERSION_STR2\tstring
-> idetools --track:issue_452.nim,7,5 --def
-def\tskProc\tissue_452.forward1\tproc \(\): string\t
-> idetools --track:issue_452.nim,8,5 --def
-def\tskProc\tissue_452.forward2\tproc \(\): string\t
diff --git a/tests/caas/issue_452.nim b/tests/caas/issue_452_export_shift.nim
index 46cff6241..46cff6241 100644
--- a/tests/caas/issue_452.nim
+++ b/tests/caas/issue_452_export_shift.nim
diff --git a/tests/caas/issue_452_export_shift.txt b/tests/caas/issue_452_export_shift.txt
new file mode 100644
index 000000000..02ba053f1
--- /dev/null
+++ b/tests/caas/issue_452_export_shift.txt
@@ -0,0 +1,11 @@
+issue_452_export_shift.nim
+> c
+SuccessX
+> idetools --track:issue_452_export_shift.nim,2,2 --def
+def\tskConst\tissue_452_export_shift.VERSION_STR1\tstring
+> idetools --track:issue_452_export_shift.nim,3,2 --def
+def\tskConst\tissue_452_export_shift.VERSION_STR2\tstring
+> idetools --track:issue_452_export_shift.nim,7,5 --def
+def\tskProc\tissue_452_export_shift.forward1\tproc \(\): string\t
+> idetools --track:issue_452_export_shift.nim,8,5 --def
+def\tskProc\tissue_452_export_shift.forward2\tproc \(\): string\t