More fixes to the entity message test