mapping missing fixes from TestCase4