refactor c_cxx_nr test for new test suite layout
refactor c_cxx_r test for new test suite layout