Fix intermittent test failures in push notifications