Fixing PayPal tests
(cherry picked from commit dadb19f)
(cherry picked from commit 634fb54)