Make 3 failing tests pass again.