patches for tests to support building on windows - cleanup