https://issues.apache.org/jira/browse/AMQ-4286 Cleans up test case and adds logging to help figure out what's failing.