More PayU cleanup - gets the integration into a working state.
Fix failing payu return test.