Upgrade to 2.2 complete. All tests passing