System test fix

Jira Issue: WP-1264