Cleanup the unit tests on Windows
Fix up the Unix unit test
Merge pull request #935 from mozilla-services/window_cleanup

Cleanup the unit tests on Windows