Test server improvements 

A couple of improvements to make it usable on the command line:

* stop the server with CTRL-C
* run the server on a different port from tests