diff --git a/Tests/Succeed/Test017.ML b/Tests/Succeed/Test017.ML
index ef3003fa..96c1ec56 100644
--- a/Tests/Succeed/Test017.ML
+++ b/Tests/Succeed/Test017.ML
@@ -1,122 +1,90 @@
 (* More assorted tests from updating the basis library. *)
 
 fun verify true = ()
 |   verify false = raise Fail "wrong";
 
 structure S = PrimIO(
     structure Vector = CharVector
     and Array = CharArray
     and VectorSlice = CharVectorSlice
     and ArraySlice = CharArraySlice
     val someElem = #" "
     type pos = int
     val compare = Int.compare);
 
 val S.RD r = S.openVector "abcdefghijk";
 verify(valOf(#readVec r) 2 = "ab");
 verify(valOf(#readVec r) 2 = "cd");
 #close r ();
 (valOf(#readVec r) 2; raise Fail "wrong") handle IO.ClosedStream => ();
 val S.RD r = S.openVector "a";
 verify(valOf(#readVec r) 2 = "a");
 verify(valOf(#readVec r) 2 = "");
 
 Timer.checkCPUTimes(Timer.totalCPUTimer());
 
-
-fun ieeeVerify(SOME(iee, subs), ieeMatch, str) =
-    if iee = ieeMatch andalso Substring.string subs = str
-    then ()
-    else raise Fail "wrong"
-|   ieeeVerify _ = raise Fail "wrong";
-
-ieeeVerify(IEEEReal.scan Substring.getc (Substring.full "  1.23X"),
-    {exp = 1, sign = false, class = IEEEReal.NORMAL, digits = [1, 2, 3]}, "X");
-ieeeVerify(IEEEReal.scan Substring.getc (Substring.full "  1.23E3X"),
-    {exp = 4, sign = false, class = IEEEReal.NORMAL, digits = [1, 2, 3]}, "X");
-ieeeVerify(IEEEReal.scan Substring.getc (Substring.full "  1.23E 3X"),
-    {exp = 1, sign = false, class = IEEEReal.NORMAL, digits = [1, 2, 3]}, "E 3X");
-ieeeVerify(IEEEReal.scan Substring.getc (Substring.full "  ~1.23E 3X"),
-    {exp = 1, sign = true, class = IEEEReal.NORMAL, digits = [1, 2, 3]}, "E 3X");
-ieeeVerify(IEEEReal.scan Substring.getc (Substring.full "  .23E 3X"),
-    {exp = 0, sign = false, class = IEEEReal.NORMAL, digits = [2, 3]}, "E 3X"); (* Valid, but E 3X isn't part of the number. *)
-verify(not(isSome(IEEEReal.scan Substring.getc (Substring.full "  . 23E 3X")))); (* Not valid. *)
-ieeeVerify(IEEEReal.scan Substring.getc (Substring.full "  000.000X"),
-    {exp = 0, sign = false, class = IEEEReal.ZERO, digits = []}, "X");
-verify(not(isSome(IEEEReal.scan Substring.getc (Substring.full "  E2 3X")))); (* Not valid. *)
-ieeeVerify(IEEEReal.scan Substring.getc (Substring.full "  0X"),
-    {exp = 0, sign = false, class = IEEEReal.ZERO, digits = []}, "X");
-ieeeVerify(IEEEReal.scan Substring.getc (Substring.full "  1X"),
-    {exp = 1, sign = false, class = IEEEReal.NORMAL, digits = [1]}, "X");
-ieeeVerify(IEEEReal.scan Substring.getc (Substring.full "  12X"),
-    {exp = 2, sign = false, class = IEEEReal.NORMAL, digits = [1, 2]}, "X");
-ieeeVerify(IEEEReal.scan Substring.getc (Substring.full "  0.00X"),
-    {exp = 0, sign = false, class = IEEEReal.ZERO, digits = []}, "X");
-ieeeVerify(IEEEReal.scan Substring.getc (Substring.full "  10.X"),
-    {exp = 2, sign = false, class = IEEEReal.NORMAL, digits = [1, 0]}, ".X"); (* Valid. The decimal point is not part of the number. *)
-
 fun timeVerify(SOME(t, subs), tMatch, str) =
     if t = Time.fromMilliseconds tMatch andalso Substring.string subs = str
     then ()
     else raise Fail "wrong"
 |   timeVerify _ = raise Fail "wrong";
 
 timeVerify(Time.scan Substring.getc (Substring.full "  0.00X"), 0, "X");
 timeVerify(Time.scan Substring.getc (Substring.full "  1.23X"), 1230, "X");
 timeVerify(Time.scan Substring.getc (Substring.full "  0.001X"), 1, "X");
 timeVerify(Time.scan Substring.getc (Substring.full "  10.X"), 10000, ".X"); (* Valid. The decimal point is not part of the number. *)
 timeVerify(Time.scan Substring.getc (Substring.full "  0 .X"), 0, " .X");
 timeVerify(Time.scan Substring.getc (Substring.full "  .12X"), 120, "X");
 verify(let val SOME x = Time.fromString "  0.001X" in Time.toNanoseconds x end = 1000000);
 verify(let val SOME x = Time.fromString "  0.000001X" in Time.toNanoseconds x end = 1000);
 verify(abs(let val SOME x = Time.fromString "  0.000000001X" in Time.toNanoseconds x end) <= 1); (* May be below the resolution. *)
 
 
 verify(List.collate Int.compare ([1,2,3], [1,2,3]) = EQUAL);
 verify(List.collate Int.compare ([1,2], [1,2,3]) = LESS);
 verify(List.collate Int.compare ([2,2], [1,2,3]) = GREATER);
 
 verify(String.concatWith "a" ["X", "Y", "Z"] = "XaYaZ");
 verify(String.concatWith "a" [] = "");
 
 (* These examples are given in G&R 2004. *)
 verify(String.fromString "\\q" = NONE);
 verify(String.fromString "a\^D" = SOME "a");
 verify(String.fromString "a\\ \\\\q" = SOME "a");
 verify(String.fromString "\\ \\" = SOME "");
 verify(String.fromString "" = SOME "");
 verify(String.fromString "\\ \\\^D" = SOME "");
 verify(String.fromString "\\ a" = NONE);
 
 verify(Char.fromString "\\q" = NONE);
 verify(Char.fromString "a\^D" = SOME #"a");
 verify(Char.fromString "a\\ \\\\q" = SOME #"a");
 verify(Char.fromString "\\ \\" = NONE);
 verify(Char.fromString "" = NONE);
 verify(Char.fromString "\\ \\\^D" = NONE);
 verify(Char.fromString "\\ a" = NONE);
 
 verify(String.fromString("a\\    \\bc") = SOME "abc");
 verify(Char.fromString("\\    \\bc") = SOME #"b");
 
 verify(Substring.isPrefix "abc" (Substring.substring("XXXabcdYYY", 3, 4)));
 verify(not(Substring.isPrefix "abcd" (Substring.substring("XXXabcdYYY", 3, 3))));
 verify(Substring.isPrefix "abc" (Substring.substring("XXXabcdYYY", 3, 3)));
 verify(Substring.isPrefix "" (Substring.substring("XXXabcdYYY", 3, 3)));
 verify(Substring.isPrefix "" (Substring.substring("XXXabcdYYY", 3, 0)));
 verify(not(Substring.isPrefix "abc" (Substring.substring("XXXdabcYYY", 3, 4))));
 
 verify(not(Substring.isSuffix "abc" (Substring.substring("XXXabcdYYY", 3, 4))));
 verify(not(Substring.isSuffix "abcd" (Substring.substring("XXXabcdYYY", 3, 3))));
 verify(Substring.isSuffix "abc" (Substring.substring("XXXabcdYYY", 3, 3)));
 verify(Substring.isSuffix "" (Substring.substring("XXXabcdYYY", 3, 3)));
 verify(Substring.isSuffix "" (Substring.substring("XXXabcdYYY", 3, 0)));
 verify(Substring.isSuffix "abc" (Substring.substring("XXXdabcYYY", 3, 4)));
 
 verify(Substring.isSubstring "abc" (Substring.substring("XXXabcdYYY", 3, 4)));
 verify(not(Substring.isSubstring "abcd" (Substring.substring("XXXabcdYYY", 3, 3))));
 verify(Substring.isSubstring "abc" (Substring.substring("XXXabcdYYY", 3, 3)));
 verify(Substring.isSubstring "" (Substring.substring("XXXabcdYYY", 3, 3)));
 verify(Substring.isSubstring "" (Substring.substring("XXXabcdYYY", 3, 0)));
 verify(Substring.isSubstring "abc" (Substring.substring("XXXdabcYYY", 3, 4)));
 verify(Substring.isSubstring "abc" (Substring.full "xyzabcdef"));
diff --git a/Tests/Succeed/Test198.ML b/Tests/Succeed/Test198.ML
index 6f66138c..a1e81bf4 100644
--- a/Tests/Succeed/Test198.ML
+++ b/Tests/Succeed/Test198.ML
@@ -1,8 +1,42 @@
 (* Checks for Real.scan, Real.fromString, IEEEReal.scan and IEEEReal.fromString. *)
 fun check true = () | check false = raise Fail "incorrect";
 
+
+fun ieeeVerify(SOME(iee, subs), ieeMatch, str) =
+    if iee = ieeMatch andalso Substring.string subs = str
+    then ()
+    else raise Fail "wrong"
+|   ieeeVerify _ = raise Fail "wrong";
+
+ieeeVerify(IEEEReal.scan Substring.getc (Substring.full "  1.23X"),
+    {exp = 1, sign = false, class = IEEEReal.NORMAL, digits = [1, 2, 3]}, "X");
+ieeeVerify(IEEEReal.scan Substring.getc (Substring.full "  1.23E3X"),
+    {exp = 4, sign = false, class = IEEEReal.NORMAL, digits = [1, 2, 3]}, "X");
+ieeeVerify(IEEEReal.scan Substring.getc (Substring.full "  1.23E 3X"),
+    {exp = 1, sign = false, class = IEEEReal.NORMAL, digits = [1, 2, 3]}, "E 3X");
+ieeeVerify(IEEEReal.scan Substring.getc (Substring.full "  ~1.23E 3X"),
+    {exp = 1, sign = true, class = IEEEReal.NORMAL, digits = [1, 2, 3]}, "E 3X");
+ieeeVerify(IEEEReal.scan Substring.getc (Substring.full "  .23E 3X"),
+    {exp = 0, sign = false, class = IEEEReal.NORMAL, digits = [2, 3]}, "E 3X"); (* Valid, but E 3X isn't part of the number. *)
+verify(not(isSome(IEEEReal.scan Substring.getc (Substring.full "  . 23E 3X")))); (* Not valid. *)
+ieeeVerify(IEEEReal.scan Substring.getc (Substring.full "  000.000X"),
+    {exp = 0, sign = false, class = IEEEReal.ZERO, digits = []}, "X");
+verify(not(isSome(IEEEReal.scan Substring.getc (Substring.full "  E2 3X")))); (* Not valid. *)
+ieeeVerify(IEEEReal.scan Substring.getc (Substring.full "  0X"),
+    {exp = 0, sign = false, class = IEEEReal.ZERO, digits = []}, "X");
+ieeeVerify(IEEEReal.scan Substring.getc (Substring.full "  1X"),
+    {exp = 1, sign = false, class = IEEEReal.NORMAL, digits = [1]}, "X");
+ieeeVerify(IEEEReal.scan Substring.getc (Substring.full "  12X"),
+    {exp = 2, sign = false, class = IEEEReal.NORMAL, digits = [1, 2]}, "X");
+ieeeVerify(IEEEReal.scan Substring.getc (Substring.full "  0.00X"),
+    {exp = 0, sign = false, class = IEEEReal.ZERO, digits = []}, "X");
+ieeeVerify(IEEEReal.scan Substring.getc (Substring.full "  10.X"),
+    {exp = 2, sign = false, class = IEEEReal.NORMAL, digits = [1]}, ".X"); (* Valid. The decimal point is not part of the number. *)
+
+
+
 check(not(Real.isFinite(valOf(Real.fromString "infinity"))));
 check(not(Real32.isFinite(valOf(Real32.fromString "infinity"))));
 
 check(Real.isNan(valOf(Real.fromString "nan")));
 check(Real32.isNan(valOf(Real32.fromString "nan")));