Fix the failing tests