Waiting for Mr Jingle

Fixing some unit tests to run on non-US systems