completed draft of data model tests, many TODOs