Implement tests
Fix currency issue