fixing track type - now with tests
fixing tests on windows