Fix the sopped/stopping problem in the tests