Adding more tests to the data model validation