C++ case tests and headers are now optional