Add customer payment and tests