Improve start/stop, tests.