Fix tests broken from HORNETQ-1437