JSON should also use entity-type, not entity_type
Fix tests for collection entity type inclusion.