More worldpay updates

Change-Id: I475c2149eeeb6062c67bada3a0e1231e6f30f9ee