Improve spec to build proper models always