Add enhanced push service tests
Add missing file to Enhanced push
Fix read of isNhEnabled to fix legacy push