Fix broken tests, too.