New start/stop handling broke test app.