Update tests
Consolidate some more conditions, use symbol not short form in CMS treaty cites