changes to make the test classes work without interfering with system locale