Entity tests polished.