Fix some more tests

+ PaymentMethod has a bad inheritance scheme
Add todo to README