Wp 1024 conn opt

Fixed broken system test

WP-1129