Model tests

updated model tests for current schema