Roll back merge from PR #16. Add ability to supply functions for locale and currency.
Add locale and currency functions to tests where they are needed.