More updates to try and get the JMS tests more stable