Added additional tests for DataModel