Lots of 2.2 fixes and test improvements