jms 2 fix and test