Cleanup tests and make scoping of server socket more explicit
Fixed issue where Kill signal was being swallowed on server, and cleaned up tests to be self-terminating, rather than relying on interrupts