Fix entity_serializer output and add spec