Added code for testing on windows