Added more constructor tests
Added data model tests