HORNETQ-1137 and a test fix