THUCYDIDES-173 use either locale to format string or default to US
Refactoring and integrating fix for THUCYDIDES-173
Refactoring some tests