System test fixes

Jira Issue: WP-1264