Fix 9 broken tests