Fix message loss and reenable test