Wp 414 fix tests

Jira-issue: http://jira.webinos.org/browse/WP-414