Fixed borked @cvan tests, added payments base tests