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

This reverts commit 8981a8886e817783bedb7d433a9a1adff4344998.