Fixing Payments Controller and tests