Code cleanup
Test that keep-alive connections doesn't spill over