refactor cxx_yywrap test for new test suite layout