added data model unit tests

Added unit tests of the data model
Made all unit tests pass for the data model
Made integration tests pass