CAAERS-7035 - fixing tests - backward compatability or rules
Merge branch 'develop' of https://github.com/NCIP/caaers into develop