Simplify/Refactor tests to remove locale