Fix failing tests - depreciated data model.