Upgrade to spree 2.2, fix tests