Hopefully this will prevent the occasional test error I'm seeing when running ConcurrentTests
Fix #1365
Issue #1365: Add a test