More data model work, more tests.