Added the ability to pay without a creditcard and tests