Redo Push reconnect tests.

Change-Id: I75330f67f6a57658e95b9510502bf6a1e38924ad