Fix broken tests, because of the models change