-add currency
-fix part of the tests