Reference TESTNUM instead of x28 directly
Make CSR test much more robust