Fix tests

Jira issue: WP-773