Add more tests for stop