Upgrade to Spree 2.2, fix failing tests