PZH system test fixes

PZH system test fix

Jira Issue: WP-1069