Fix 3 tests