fixed Unit test (should now run under Mac and Windows)
move to main