Minor tweaks on entities tests