Remove currency method, fix src and tests