Fix CppTemplateTest failing after removing test/cpp11.cpp.tmpl template.

Some tester fixes.