6 files changed, 17 insertions, 104 deletions
diff --git a/tests/misc/tatomic.nim b/tests/misc/tatomic.nim
deleted file mode 100644
index f3c56ffe3..000000000
--- a/tests/misc/tatomic.nim
+++ /dev/null
@@ -1,12 +0,0 @@
-discard """
-  file: "tatomic.nim"
-  line: 7
-  errormsg: "identifier expected, but found 'keyword atomic'"
-"""
-var
-  atomic: int
-
-echo atomic
-
-
-
diff --git a/tests/misc/tevents.nim b/tests/misc/tevents.nim
index 5f2169f29..caf674084 100644
--- a/tests/misc/tevents.nim
+++ b/tests/misc/tevents.nim
@@ -8,19 +8,19 @@ HandlePrintEvent2: Output -> printing for ME'''
 import events
 
 type
-  TPrintEventArgs = object of TEventArgs
+  PrintEventArgs = object of EventArgs
     user*: string
 
-proc handleprintevent*(e: TEventArgs) =
+proc handleprintevent*(e: EventArgs) =
     write(stdout, "HandlePrintEvent: Output -> Handled print event\n")
 
-proc handleprintevent2*(e: TEventArgs) =
-    var args: TPrintEventArgs = TPrintEventArgs(e)
+proc handleprintevent2*(e: EventArgs) =
+    var args: PrintEventArgs = PrintEventArgs(e)
     write(stdout, "HandlePrintEvent2: Output -> printing for " & args.user)
 
 var ee = initEventEmitter()
 
-var eventargs: TPrintEventArgs
+var eventargs: PrintEventArgs
 eventargs.user = "ME\n"
 
 ##method one test
@@ -33,16 +33,16 @@ ee.emit("print", eventargs)
 ##method two test
 
 type
-  TSomeObject = object of TObject
-    PrintEvent: TEventHandler
+  SomeObject = object of RootObj
+    printEvent: EventHandler
 
-var obj: TSomeObject
-obj.PrintEvent = initEventHandler("print")
-obj.PrintEvent.addHandler(handleprintevent2)
+var obj: SomeObject
+obj.printEvent = initEventHandler("print")
+obj.printEvent.addHandler(handleprintevent2)
 
-ee.emit(obj.PrintEvent, eventargs)
+ee.emit(obj.printEvent, eventargs)
 
-obj.PrintEvent.removeHandler(handleprintevent2)
+obj.printEvent.removeHandler(handleprintevent2)
 
-ee.emit(obj.PrintEvent, eventargs)
+ee.emit(obj.printEvent, eventargs)
 
diff --git a/tests/misc/tlocals.nim b/tests/misc/tlocals.nim
index 3e240d3c8..09b7432f5 100644
--- a/tests/misc/tlocals.nim
+++ b/tests/misc/tlocals.nim
@@ -1,5 +1,5 @@
 discard """
-  output: "(x: string here, a: 1)"
+  output: '''(x: "string here", a: 1)'''
 """
 
 proc simple[T](a: T) =
diff --git a/tests/misc/tromans.nim b/tests/misc/tromans.nim
deleted file mode 100644
index 132c73ddd..000000000
--- a/tests/misc/tromans.nim
+++ /dev/null
@@ -1,71 +0,0 @@
-discard """
-  file: "tromans.nim"
-  output: "success"
-"""
-import
-  strutils
-
-## Convert an integer to a Roman numeral
-# See http://en.wikipedia.org/wiki/Roman_numerals for reference
-
-proc raiseInvalidValue(msg: string) {.noreturn.} =
-  # Yes, we really need a shorthand for this code...
-  var e: ref EInvalidValue
-  new(e)
-  e.msg = msg
-  raise e
-
-# I should use a class, perhaps.
-# --> No. Why introduce additional state into such a simple and nice
-# interface? State is evil. :D
-
-proc RomanToDecimal(romanVal: string): int =
-  result = 0
-  var prevVal = 0
-  for i in countdown(romanVal.len - 1, 0):
-    var val = 0
-    case romanVal[i]
-    of 'I', 'i': val = 1
-    of 'V', 'v': val = 5
-    of 'X', 'x': val = 10
-    of 'L', 'l': val = 50
-    of 'C', 'c': val = 100
-    of 'D', 'd': val = 500
-    of 'M', 'm': val = 1000
-    else: raiseInvalidValue("Incorrect character in roman numeral! (" &
-                            $romanVal[i] & ")")
-    if val >= prevVal:
-      inc(result, val)
-    else:
-      dec(result, val)
-    prevVal = val
-
-proc DecimalToRoman(decValParam: int): string =
-  # Apparently numbers cannot be above 4000
-  # Well, they can be (using overbar or parenthesis notation)
-  # but I see little interest (beside coding challenge) in coding them as
-  # we rarely use huge Roman numeral.
-  const romanComposites = [
-    ("M", 1000), ("CM", 900),
-    ("D", 500), ("CD", 400), ("C", 100),
-    ("XC", 90), ("L", 50), ("XL", 40), ("X", 10), ("IX", 9),
-    ("V", 5), ("IV", 4), ("I", 1)]
-  if decValParam < 1 or decValParam > 3999:
-    raiseInvalidValue("number not representable")
-  result = ""
-  var decVal = decValParam
-  for key, val in items(romanComposites):
-    while decVal >= val:
-      dec(decVal, val)
-      result.add(key)
-
-for i in 1..100:
-  if RomanToDecimal(DecimalToRoman(i)) != i: quit "BUG"
-
-for i in items([1238, 1777, 3830, 2401, 379, 33, 940, 3973]):
-  if RomanToDecimal(DecimalToRoman(i)) != i: quit "BUG"
-
-echo "success" #OUT success
-
-
-
diff --git a/tests/misc/tupcomingfeatures.nim b/tests/misc/tupcomingfeatures.nim
index cf07b06df..d37ce85cf 100644
--- a/tests/misc/tupcomingfeatures.nim
+++ b/tests/misc/tupcomingfeatures.nim
@@ -6,12 +6,8 @@ discard """
 {.this: self.}
 
 type
-  Foo {.partial.} = object
-    a, b: int
-
-type
-  tupcomingfeatures.Foo = object
-    x: int
+  Foo = object
+    a, b, x: int
 
 proc yay(self: Foo) =
   echo a, " ", b, " ", x
diff --git a/tests/misc/tvarnums.nim b/tests/misc/tvarnums.nim
index a5c30c7eb..5daa2c4b8 100644
--- a/tests/misc/tvarnums.nim
+++ b/tests/misc/tvarnums.nim
@@ -67,7 +67,7 @@ proc toNum64(b: TBuffer): int64 =
 
 proc toNum(b: TBuffer): int32 =
   # treat first byte different:
-  result = ze(b[0]) and 63
+  result = int32 ze(b[0]) and 63
   var
     i = 0
     Shift = 6'i32