Wp 1258 fix tests n fallback

Yet another go at this. Looking for somebody else to merge this.

Jira-issue: WP-1258