Moved test into messages