Revert "Further test fixes"

This reverts commit 61922e68414d4e7bd375ce108d83082be2f123ab.
Revert "Second part of the temporary fix to test"

This reverts commit b31ac3cecf986069f03a3695e0c6752a1c819cb8.
Revert "Test simple fix on windows."

This reverts commit 97b240ed9c82991233efdf0af0c2ad76d736845d.