Minor changes to CSR driver test code