Fixed a couple of unit tests to run on some Windows machines