Add messages to some unit tests.
Codecleanup and new and fixed unit tests.
Merge branch 'develop' of https://github.com/NCIP/caaers into develop