5 files changed, 6 insertions, 7 deletions
diff --git a/tests/borrow/tborrow.nim b/tests/borrow/tborrow.nim
index 8e6aeba74..d4df5f524 100644
--- a/tests/borrow/tborrow.nim
+++ b/tests/borrow/tborrow.nim
@@ -18,4 +18,4 @@ proc `++`(x, y: DF): DF {.borrow.}
 proc `$`(x: DI): string {.borrow.}
 proc `$`(x: DF): string {.borrow.}
 
-echo  4544.DI ++ 343.di, " ", (4.5.df ++ 0.5.df).float == 5.0
+echo  4544.DI ++ 343.DI, " ", (4.5.DF ++ 0.5.DF).float == 5.0
diff --git a/tests/range/tsubrange2.nim b/tests/range/tsubrange2.nim
index d14111bb9..759d16b9c 100644
--- a/tests/range/tsubrange2.nim
+++ b/tests/range/tsubrange2.nim
@@ -1,6 +1,6 @@
 discard """
   file: "tsubrange2.nim"
-  outputsub: "value out of range: 50 [EOutOfRange]"
+  outputsub: "value out of range: 50 [RangeError]"
   exitcode: "1"
 """
 
diff --git a/tests/range/tsubrange3.nim b/tests/range/tsubrange3.nim
index 9afb5018b..600161cfd 100644
--- a/tests/range/tsubrange3.nim
+++ b/tests/range/tsubrange3.nim
@@ -1,6 +1,6 @@
 discard """
   file: "tsubrange.nim"
-  outputsub: "value out of range: 50 [EOutOfRange]"
+  outputsub: "value out of range: 50 [RangeError]"
   exitcode: "1"
 """
 
@@ -16,4 +16,3 @@ var
 r = y
 
 #p y
-  
diff --git a/tests/table/ttables.nim b/tests/table/ttables.nim
index 60446b5a3..de4aaed5e 100644
--- a/tests/table/ttables.nim
+++ b/tests/table/ttables.nim
@@ -84,7 +84,7 @@ block orderedTableTest1:
 block countTableTest1:
   var s = data.toTable
   var t = initCountTable[string]()
-  for k in s.Keys: t.inc(k)
+  for k in s.keys: t.inc(k)
   for k in t.keys: assert t[k] == 1
   t.inc("90", 3)
   t.inc("12", 2)
diff --git a/tests/template/tissue993.nim b/tests/template/tissue993.nim
index d39f43942..dae9df683 100644
--- a/tests/template/tissue993.nim
+++ b/tests/template/tissue993.nim
@@ -1,5 +1,5 @@
 
-type pnode* = ref object of tobject
+type PNode* = ref object of RootObj
 
 template litNode (name, ty): stmt  =
   type name* = ref object of PNode
@@ -8,7 +8,7 @@ litNode PIntNode, int
 
 import json
 
-template withKey*(j: PJsonNode; key: string; varname: expr;
+template withKey*(j: JsonNode; key: string; varname: expr;
                   body:stmt): stmt {.immediate.} =
   if j.hasKey(key):
     let varname{.inject.}= j[key]