fix broken system test

Jira Issue: WP-1024
Fix bug in system test
Fixed system test

Jira Issue: WP-1129
Merge pull request #25 from habibvirji/WP-1024-conn-opt

Wp 1024 conn opt