Added tests for Currency; fixed test suite