Switching the to terminology used in the APNS documentation.
Cleaning up the tests a bit.