Completed some unit tests, added currency support and other minor changes