Fix const comparison issue, add new test and fix include path