adjusted tests to avoid locale for now
Merge branch 'develop' into staging