General cleanup on CMS tree unit tests
Merge branch 'master' into extHelperMove