Fix silent merge conflict between new test and payment refactor