push message content handled incorrectly previously
refactored to properly handle push message content, method names clearer
finished writing tests