Cleanup of webpush based on code review

Clean up the mock object and test cases for getting full coverage on
webpush