Make CSR test much more robust