Updated entity-test