Patches to tests which had unexpected behavior with 2.2 implementation.