Add unit tests for payments, and refactor