Added more Data Model tests