BLACKTIE-448 update to fix test.includes
Merge pull request #36 from zhfeng/BLACKTIE-448

BLACKTIE-448 can not run cxx tests