Fixing start/stop/restart tests