FIX: roll back MaxAmount change.
This broke lots of tests
FIX: Set type of discount in testShippingAndItems test