refactor header_r test for new test suite layout