Upgrade to spree 2.2, fix tests

will need to test integrating into our application once we have our 2.2 fork ready, but this fixes failing tests from the update