fixing tests after HORNETQ-1131