Some updates to try and make sure the jms tests are a bit more reliable when run in parallel