Cleanup from code review; fix test suite

Added test case

Update make payment step