Make last failing tests pass