Stop the server started during testing.
Tweaked the remote control stuff.