[Matahari] [PATCH] Fixes for unittest to compile on mingw32