additional fix for https://issues.apache.org/activemq/browse/AMQ-1807 - fixing test case and making it work