Payu test code cleanup.