[Issue 9632] Tweak tests to allow running multiple instances concurrently