Fixing PayPal tests
(cherry picked from commit dadb19f)