Entity Annotation changes, Tests