Adding multiple clients to configurable test
Merge remote-tracking branch 'origin/master'