Simplify test sample code

Jira Issue: WP-1114