HORNETQ-1254 and a few test fixes