More entity types and tests