Port remaining tests to 2.9.2.