Test fixes for this branch

Jira issue: WP-959