Add more tests for stop
Merge branch 'feature/stop'