C++ header + one more test check

This makes Oleg work with C++ projects