Remainig changes for cl-6502 testsuite adapter.