Update Rspec syntax of mocks
Update interface expected of payment form