Cleanup from code review; fix test suite

Added test case

Update make payment step

Send users from payment confirmation directly to verify-now instead of using ?skip-first-step