Updated test case to not fail on new models
Test measures for new operators
Merge branch 'hqmf_r2.1' of github.com:projectcypress/health-data-standards into hqmf_r2.1