Landing pull request 433. Fix testswarm test cases. Fixes #9555.