refactor ccl test for new test suite layout