Fix tests for 2.9.2.