Modified some tests to work with MSVC.