General cleanup on CMS tree unit tests