Do a better job checking CSR functionality.