HORNETQ-1288 - fix tests
Merge pull request #1442 from jbertram/master

HORNETQ-1288 - fix tests