Allow tests to be run as the server

Also decrease the delay a bit