Bugfixing

Jira-issue: WP-634
Added jasmine test

Jira-issue: WP-634