Fix broken tests in the new generated world