Simplify/Refactor tests to remove locale
Merge pull request #119 from sharoonthomas/develop

Simplify/Refactor tests to remove locale