-Fixed WinRT build
-Fixed unit tests