Clean up and fix up tests for configurable currency