System test corrections

Jira Issue:WP-1221