Fixes for JMS tests