Aligned entity type column names to ‘__entityType’ for all uses
Clean up
Corrected test assert descriptions