DRY up directory test slightly
Add payment method by default in tests
Payment method selection should be required