Patches to 2.2i2 tests