Fix for issue #605

This commit contains minor fixes to unit tests that fail due to differences in locales. The changes make the failing unit tests agnostic to locales.