- set up server correctly when running the second test pass - reset stats counters before the second pass - clean up test output (cherry picked from commit 6d05ec7d)