```release-note:improvement
core: Small changes to ensure goroutines terminate in tests
```