Simplified Model tests by removing duplication