Editing test sets to work with new data model