* cleanup, fix issue involved after remove is_bootstrap parameter * misc * clean * add unittests
* Clean up CMake scripts and related include paths. * Add unittests.