Fixed a unit test
Fixed another unit test
Commented out a test case because the locale is platform dependent which makes this bit of test fail