Index: src/libchcore/Tests/TestsTSQLiteStatement.cpp
===================================================================
diff -u -N -rd32a79f0e9220bad2c6eeb5e8a986228b6e832fb -r2408cac34e827fa43ff1622f65251e219f96a4f1
--- src/libchcore/Tests/TestsTSQLiteStatement.cpp	(.../TestsTSQLiteStatement.cpp)	(revision d32a79f0e9220bad2c6eeb5e8a986228b6e832fb)
+++ src/libchcore/Tests/TestsTSQLiteStatement.cpp	(.../TestsTSQLiteStatement.cpp)	(revision 2408cac34e827fa43ff1622f65251e219f96a4f1)
@@ -70,7 +70,7 @@
 	tStatement.Prepare(_T("SELECT col2, col1 FROM test"));
 	EXPECT_EQ(TSQLiteStatement::eStep_HasRow, tStatement.Step());
 	EXPECT_EQ(54, tStatement.GetInt(1));
-	EXPECT_STREQ(_T("Some Value"), tStatement.GetText(0));
+	EXPECT_EQ(TString(_T("Some Value")), tStatement.GetText(0));
 }
 
 TEST(SQLiteStatement, ClearBindings)
@@ -98,12 +98,12 @@
 	EXPECT_EQ(TSQLiteStatement::eStep_HasRow, tStatement.Step());
 
 	EXPECT_EQ(32, tStatement.GetInt(1));
-	EXPECT_STREQ(_T("???"), tStatement.GetText(0));
+	EXPECT_EQ(TString(_T("???")), tStatement.GetText(0));
 
 	EXPECT_EQ(TSQLiteStatement::eStep_HasRow, tStatement.Step());
 
 	EXPECT_EQ(54, tStatement.GetInt(1));
-	EXPECT_STREQ(_T("Some Value"), tStatement.GetText(0));
+	EXPECT_EQ(TString(_T("Some Value")), tStatement.GetText(0));
 
 	EXPECT_EQ(TSQLiteStatement::eStep_Finished, tStatement.Step());
 }
Index: src/libchcore/Tests/TestsTString.cpp
===================================================================
diff -u -N -rb1e03eb232a784d6e2d40f67cbbbb33be0972228 -r2408cac34e827fa43ff1622f65251e219f96a4f1
--- src/libchcore/Tests/TestsTString.cpp	(.../TestsTString.cpp)	(revision b1e03eb232a784d6e2d40f67cbbbb33be0972228)
+++ src/libchcore/Tests/TestsTString.cpp	(.../TestsTString.cpp)	(revision 2408cac34e827fa43ff1622f65251e219f96a4f1)
@@ -236,13 +236,13 @@
 TEST(TStringTests, CastToPtrWcharT)
 {
 	TString strValue(_T("Some string"));
-	EXPECT_STREQ((const wchar_t*)strValue, _T("Some string"));
+	EXPECT_EQ(strValue, _T("Some string"));
 }
 
 TEST(TStringTests, CastEmptyToPtrWcharT)
 {
 	TString strValue;
-	EXPECT_STREQ((const wchar_t*)strValue, _T(""));
+	EXPECT_EQ(strValue, _T(""));
 }
 
 // append