Accidentally commited Junit stuff, will remove

Fixed DataModelTestSuite
syncing