Tune test
Fix server connection leak