Fix for issue #58 - 2 unit tests fail on non-US machine