Passed private api tests

Also refactored currency into its own file