Fixing keystorage test errors

Jira Issue: WP-804