Fixes test issues preventing it from passing

Ensure push is enabled correctly without a fallback and made test more stable

Change-Id: I6c653a96375e05c6ad18e1f5b697c6a584c6c53f