fixes and ran win32 tests