Cleaned up DataModelTestSuite and DiffUtil