CRM-13372 - (closes) fix over-long paypal string

Also a couple of unrelated code formatting fixes in the test class from a commit retrieved from an abandoned PR