Fixing PayPal tests
(cherry picked from commit 4404fc4)