Fixing tests (hopefully) for VC++