diff --git a/Common/Gfx/TextFormatD2D_Test.cpp b/Common/Gfx/TextFormatD2D_Test.cpp
index 78c21538..87a56586 100644
--- a/Common/Gfx/TextFormatD2D_Test.cpp
+++ b/Common/Gfx/TextFormatD2D_Test.cpp
@@ -48,12 +48,12 @@ public:
 		DWRITE_TEXT_METRICS metrics;
 
 		metrics = textFormat->GetMetrics(L"test", 4, true);
-		Assert::AreEqual(26, (int)metrics.width);
-		Assert::AreEqual(16, (int)metrics.height);
+		Assert::AreEqual((int)metrics.width, 26);
+		Assert::AreEqual((int)metrics.height, 16);
 
 		metrics = textFormat->GetMetrics(L"test", 4, false);
-		Assert::AreEqual(21, (int)metrics.width);
-		Assert::AreEqual(14, (int)metrics.height);
+		Assert::AreEqual((int)metrics.width, 21);
+		Assert::AreEqual((int)metrics.height, 14);
 	}
 
 	TEST_METHOD(TestTrailingNewlineGdipCompatibility)
@@ -64,19 +64,19 @@ public:
 		DWRITE_TEXT_METRICS metrics;
 		
 		metrics = textFormat->GetMetrics(L"test\n", 5, false);
-		Assert::AreEqual(15, (int)metrics.height);
+		Assert::AreEqual((int)metrics.height, 15);
 		metrics = textFormat->GetMetrics(L"test\r\n", 6, false);
-		Assert::AreEqual(15, (int)metrics.height);
+		Assert::AreEqual((int)metrics.height, 15);
 
 		metrics = textFormat->GetMetrics(L"test\n ", 6, false);
-		Assert::AreEqual(30, (int)metrics.height);
+		Assert::AreEqual((int)metrics.height, 30);
 		metrics = textFormat->GetMetrics(L"test\r\n ", 7, false);
-		Assert::AreEqual(30, (int)metrics.height);
+		Assert::AreEqual((int)metrics.height, 30);
 
 		metrics = textFormat->GetMetrics(L"test\n\n", 6, false);
-		Assert::AreEqual(30, (int)metrics.height);
+		Assert::AreEqual((int)metrics.height, 30);
 		metrics = textFormat->GetMetrics(L"test\r\n\r\n", 8, false);
-		Assert::AreEqual(30, (int)metrics.height);
+		Assert::AreEqual((int)metrics.height, 30);
 	}
 };
 
diff --git a/Common/MathParser_Test.cpp b/Common/MathParser_Test.cpp
index 3ba60239..0ccfea56 100644
--- a/Common/MathParser_Test.cpp
+++ b/Common/MathParser_Test.cpp
@@ -24,46 +24,47 @@ namespace MathParser {
 TEST_CLASS(Common_MathParser_Test)
 {
 public:
-	void ParseAssert(const WCHAR* formula, double expected)
+	void ParseAssert(double expected, const WCHAR* formula)
 	{
 		double value = 0.0;
 		Assert::IsNull(Parse(formula, &value));
-		Assert::AreEqual(value, expected);
+		Assert::AreEqual(expected, value);
 	}
 
 	TEST_METHOD(TestParse)
 	{
-		ParseAssert(L"5", 5.0);
-		ParseAssert(L"      5      ", 5.0);
-		ParseAssert(L"((((5))))", 5.0);
-		ParseAssert(L"(5 + 5)", 10.0);
-		ParseAssert(L"(-5 - 5)", -10.0);
-		ParseAssert(L"-(-5-5)", 10.0);
-		ParseAssert(L"-(-5+-5)", 10.0);
-		ParseAssert(L"1 && 1", 1.0);
-		ParseAssert(L"1 && 0", 0.0);
-		ParseAssert(L"1 || 1", 1.0);
-		ParseAssert(L"1 || -1", 1.0);
-		ParseAssert(L"1 < 2 && 2 > 1", 0.0);
-		ParseAssert(L"(1 < 2) && (2 > 1)", 1.0);
-		ParseAssert(L"sin(50)", sin(50.0));
-		ParseAssert(L"-sin((25 + 25) * 2)", -sin(100.0));
-		ParseAssert(L"01", 1.0);
-		ParseAssert(L"011", 11.0);
-		ParseAssert(L"0b11", 3.0);
-		ParseAssert(L"0xA", 10.0);
-		ParseAssert(L"0o12", 10.0);
-		ParseAssert(L"1 ? 2 : 3", 2.0);
-		ParseAssert(L"0 ? 2 : 3", 3.0);
-		ParseAssert(L"1 ? (2 + 3) : 3", 5.0);
-		ParseAssert(L"1 ? 2 : 3", 2.0);
-		ParseAssert(L"1 ? 2 : 0 ? 4 : 5", 4.0);
-		ParseAssert(L"1 ? 2 : 1 ? 4 : 5", 4.0);
-		ParseAssert(L"1 ? 2 : (1 ? 4 : 5)", 2.0);
-		ParseAssert(L"0?1:(0?1:(0?1:(0?1:(0?1:(0?1:(0?1:(0?1:(0?1:(0?1:(0?1:(0?1:(0?1:(0?1:(0?1:(0?1:(0?1:(0?1:(0?1:(0?1:(0?1:(0?1:(0?1:(0?1:(0?1:(0?1:(0?1:(0?1:(0?1:(0?1:5)))))))))))))))))))))))))))))", 5.0);
-		ParseAssert(L"trunc(1.5)", 1.0);
-		ParseAssert(L"trunc(-1.5)", -1.0);
-		ParseAssert(L"round(1.555, 2)", 1.56);
+		ParseAssert(5.0, L"5");
+		ParseAssert(5.0, L"      5      ");
+		ParseAssert(5.0, L"((((5))))");
+		ParseAssert(10.0, L"(5 + 5)");
+		ParseAssert(-10.0, L"(-5 - 5)");
+		ParseAssert(10.0, L"-(-5-5)");
+		ParseAssert(10.0, L"-(-5+-5)");
+		ParseAssert(1.0, L"1 && 1");
+		ParseAssert(0.0, L"1 && 0");
+		ParseAssert(1.0, L"1 || 1");
+		ParseAssert(1.0, L"1 || -1");
+		ParseAssert(0.0, L"1 < 2 && 2 > 1");
+		ParseAssert(1.0, L"(1 < 2) && (2 > 1)");
+		ParseAssert(sin(50.0), L"sin(50)");
+		ParseAssert(-sin(100.0), L"-sin((25 + 25) * 2)");
+		ParseAssert(1.0, L"01");
+		ParseAssert(11.0, L"011");
+		ParseAssert(3.0, L"0b11");
+		ParseAssert(10.0, L"0xA");
+		ParseAssert(10.0, L"0o12");
+		ParseAssert(2.0, L"1 ? 2 : 3");
+		ParseAssert(3.0, L"0 ? 2 : 3");
+		ParseAssert(5.0, L"1 ? (2 + 3) : 3");
+		ParseAssert(2.0, L"1 ? 2 : 3");
+		ParseAssert(4.0, L"1 ? 2 : 0 ? 4 : 5");
+		ParseAssert(4.0, L"1 ? 2 : 1 ? 4 : 5");
+		ParseAssert(2.0, L"1 ? 2 : (1 ? 4 : 5)");
+		ParseAssert(5.0, L"0?1:(0?1:(0?1:(0?1:(0?1:(0?1:(0?1:(0?1:(0?1:(0?1:(0?1:(0?1:(0?1:(0?1:(0?1:(0?1:(0?1:(0?1:(0?1:(0?1:(0?1:(0?1:(0?1:(0?1:(0?1:(0?1:(0?1:(0?1:(0?1:(0?1:5)))))))))))))))))))))))))))))");
+		ParseAssert(1.0, L"trunc(1.5)");
+		ParseAssert(-1.0, L"trunc(-1.5)");
+		ParseAssert(2.0, L"round(1.555)");
+		ParseAssert(1.56, L"round(1.555, 2)");
 
 		double value;
 
@@ -75,22 +76,22 @@ public:
 		Assert::IsNotNull(Parse(L"a", &value));
 
 		Assert::IsNull(Parse(L"e", &value));
-		Assert::AreEqual((int)value, 2);
+		Assert::AreEqual(2, (int)value);
 
 		Assert::IsNull(Parse(L"pi", &value));
-		Assert::AreEqual((int)value, 3);
+		Assert::AreEqual(3, (int)value);
 
 		Assert::IsNull(Parse(L"pi", &value, GetValueHelper));
-		Assert::AreEqual((int)value, 3);
+		Assert::AreEqual(3, (int)value);
 
 		Assert::IsNull(Parse(L"a + 5", &value, GetValueHelper));
-		Assert::AreEqual(value, 15.0);
+		Assert::AreEqual(15.0, value);
 
 		Assert::IsNull(Parse(L"bbb", &value, GetValueHelper));
-		Assert::AreEqual(value, 20.0);
+		Assert::AreEqual(20.0, value);
 
 		Assert::IsNull(Parse(L"(ccc_)", &value, GetValueHelper, (void*)1));
-		Assert::AreEqual(value, 30.0);
+		Assert::AreEqual(30.0, value);
 	}
 
 	static bool GetValueHelper(const WCHAR* str, int len, double* value, void* context)
diff --git a/Common/StringUtil_Test.cpp b/Common/StringUtil_Test.cpp
index 37863375..5e7d23e9 100644
--- a/Common/StringUtil_Test.cpp
+++ b/Common/StringUtil_Test.cpp
@@ -26,18 +26,18 @@ TEST_CLASS(Common_StringUtil_Test)
 public:
 	TEST_METHOD(TestWiden)
 	{
-		Assert::AreEqual(Widen("test").c_str(), L"test");
-		Assert::AreEqual(Widen("test", 2).c_str(), L"te");
-		Assert::AreEqual(WidenUTF8("\xd0\xa2\xc4\x94st").c_str(), L"\u0422\u0114st");
-		Assert::AreEqual(WidenUTF8("\xd0\xa2\xc4\x94st", 2).c_str(), L"\u0422");
+		Assert::AreEqual(L"test", Widen("test").c_str());
+		Assert::AreEqual(L"te", Widen("test", 2).c_str());
+		Assert::AreEqual(L"\u0422\u0114st", WidenUTF8("\xd0\xa2\xc4\x94st").c_str());
+		Assert::AreEqual(L"\u0422", WidenUTF8("\xd0\xa2\xc4\x94st", 2).c_str());
 	}
 
 	TEST_METHOD(TestNarrow)
 	{
-		Assert::AreEqual(Narrow(L"test").c_str(), "test");
-		Assert::AreEqual(Narrow(L"test", 2).c_str(), "te");
-		Assert::AreEqual(NarrowUTF8(L"\u0422\u0114st").c_str(), "\xd0\xa2\xc4\x94st");
-		Assert::AreEqual(NarrowUTF8(L"\u0422\u0114st", 1).c_str(), "\xd0\xa2");
+		Assert::AreEqual("test", Narrow(L"test").c_str());
+		Assert::AreEqual("te", Narrow(L"test", 2).c_str());
+		Assert::AreEqual("\xd0\xa2\xc4\x94st", NarrowUTF8(L"\u0422\u0114st").c_str());
+		Assert::AreEqual("\xd0\xa2", NarrowUTF8(L"\u0422\u0114st", 1).c_str());
 	}
 };