* Even more robust handling of extension tree loading * Fix initial loading and add new test for CMS * Fix compile errors * Fix logic * Remove debug log statements