Patches to tests for 2.2i4