cleaning up 'controlled' tests and re-using the socket server controller to do so