-Fixed tests
-Fixed WinRT build