Improve test coverage
Improve test coverage
Refactor currency parsing