Global iris fixes

Some more fixes that I found I needed - this code is in production now.

As before, there are tests for the new code. There is also a fix to the test suite - it wasn't running on my machine due to WorldPay settings not being configured.

Thanks!