refactor fsm test helpers into new class and add more tests for payments