refactor c_cxx_nr test for new test suite layout