Fix 2.3/develop tests.