Adding test for the Criteria model upgrade