Updated to using the test client instead so that we do calc-only in IRS/IDEAS.