Add model tests for new constraints, break existing tests into smaller
ones