Getting tests to pass on windows.