The concurrency applied before is in most cases not even needed. With a cap=1 channel, most tests are much cleaner. TestMarathonSDRunAndStop was trickier. It could even have blocked before. This also includes a general refactoring of the whole file.