Fix 2 tests