* add required comment in the line below cmake.h include header
And fix the test cases that have been failing ,undetected