Added boolean to stop server, to allow test to kill instead of user