Merge "Fix left-over client calls in stress test to receive one value"