Fixed test with new data model