fix(tests): remove orphaned test containers in cleanup
Merge pull request #2264 from mboersma/clean-test-orphans

fix(tests): remove orphaned test containers in cleanup