changed model to handle currencies correctly and fixed tests