diff --git a/Core/MIPS/MIPSInt.cpp b/Core/MIPS/MIPSInt.cpp
index 950805f35..10fe2a916 100644
--- a/Core/MIPS/MIPSInt.cpp
+++ b/Core/MIPS/MIPSInt.cpp
@@ -736,15 +736,15 @@ namespace MIPSInt
 		PC += 4;
 	}
 
-#ifdef _MSC_VER
-static float roundf(float num)
-{
-    float integer = ceilf(num);
-    if (num > 0)
-        return integer - num > 0.5f ? integer - 1.0f : integer;
-    return integer - num >= 0.5f ? integer - 1.0f : integer;
-}
-#endif
+	#ifdef _MSC_VER
+	static float roundf(float num)
+	{
+		float integer = ceilf(num);
+		if (num > 0)
+			return integer - num > 0.5f ? integer - 1.0f : integer;
+		return integer - num >= 0.5f ? integer - 1.0f : integer;
+	}
+	#endif
 
 	void Int_FPU2op(u32 op)
 	{
@@ -766,7 +766,7 @@ static float roundf(float num)
 		case 36:
 			switch (currentMIPS->fcr31 & 3)
 			{
-			case 0: FsI(fd) = roundf(F(fs)); break;  // RINT_0
+			case 0: FsI(fd) = roundf(F(fs)); break;  // RINT_0    // TODO: rintf or roundf?
 			case 1: FsI(fd) = (int)F(fs); break;  // CAST_1
 			case 2: FsI(fd) = ceilf(F(fs)); break;  // CEIL_2
 			case 3: FsI(fd) = floorf(F(fs)); break;  // FLOOR_3
diff --git a/test.py b/test.py
index bc7e09cd9..2a58679f2 100644
--- a/test.py
+++ b/test.py
@@ -17,15 +17,53 @@ tests_good = [
   "cpu/icache/icache",
   "cpu/lsu/lsu",
   "cpu/fpu/fpu",
+
+  "display/display",
+  "dmac/dmactest",
+  "intr/intr",
+  "intr/vblank/vblank",
+  "misc/testgp",
+  "string/string",
 ]
 
 # These are the next tests up for fixing.
 tests_next = [
+  "cpu/vfpu/vfpu",
+  "ctrl/ctrl",
+  "io/cwd/cwd",
+  "io/directory/directory",
+  "io/io/io",
+  "io/iodrv/iodrv",
+  "malloc/malloc",
+  "mstick/mstick",
+  "modules/loadexec/loader",
+  "power/power",
+  "rtc/rtc",
+  "sysmem/sysmem",
+  "threads/events/events",
+  "threads/fpl/fpl",
+  "threads/mbx/mbx",
+  "threads/msgpipe/msgpipe",
+  "threads/mutex/mutex",
+  "threads/scheduling/scheduling",
+  "threads/semaphores/semaphores",
+  "threads/threads/threads",
+  "threads/vpl/vpl",
+  "threads/vtimers/vtimers",
+  "threads/wakeup/wakeup",
+  "umd/umd",
+  "umd/callbacks/umd",
+  "umd/io/umd_io",
+  "umd/raw_access/raw_access",
+  "utility/systemparam",
+  "video/pmf",
+  "video/pmf_simple",
 ]
 
 # These are the tests we ignore (not important, or impossible to run)
 tests_ignored = [
-
+  "kirk/kirk",
+  "me/me",
 ]