Fix 2.0 tests.