Made messages more consistent across tests