Integration tests should now work on windows
WIP integration test normalization