Fix issues causing enterprise fee tests to break
Add before_payment method to checkout controller (fixes issues with spree_paypal_express)