Fix: some tests were failing when run on non-windows OS. Tests will now pass on Windows, Linux or OSX.