refactor c_cxx_r test for new test suite layout