Fix AtomJMSIT test failures

Resolve: https://www.pivotaltracker.com/story/show/58726512