Adding payment step.
Simplifying certain test routines.
Renaming and refactoring.