Small test adjustments for apns
Manually brought in the suggested changes from pr #235
Stop double encoding xml for Windows Phone, as in #277