Add StopRun to end of RunHandler and fix tests