Minor changes to remove debug output and close extra test case sockets.