Remainig changes for cl-6502 testsuite adapter.
Remainig changes for cl-6502 testsuite adapter.

cl-test-grid/cl-test-grid,cl-test-grid/cl-test-grid,cl-test-grid/cl-test-grid,cl-test-grid/cl-test-grid,cl-test-grid/cl-test-grid