diff --git a/api/src/nlp/controllers/nlp-entity.controller.spec.ts b/api/src/nlp/controllers/nlp-entity.controller.spec.ts
index 426b25fc..c33f8955 100644
--- a/api/src/nlp/controllers/nlp-entity.controller.spec.ts
+++ b/api/src/nlp/controllers/nlp-entity.controller.spec.ts
@@ -111,6 +111,8 @@ describe('NlpEntityController', () => {
             values: nlpValueFixtures.filter(
               ({ entity }) => parseInt(entity) === index,
             ) as NlpEntityFull['values'],
+            lookups: curr.lookups!,
+            builtin: curr.builtin!,
           });
           return acc;
         },
@@ -214,6 +216,8 @@ describe('NlpEntityController', () => {
         id: firstNameEntity!.id,
         createdAt: firstNameEntity!.createdAt,
         updatedAt: firstNameEntity!.updatedAt,
+        lookups: firstNameEntity!.lookups,
+        builtin: firstNameEntity!.builtin,
       };
       const result = await nlpEntityController.findOne(firstNameEntity!.id, [
         'values',
diff --git a/api/src/nlp/controllers/nlp-sample.controller.ts b/api/src/nlp/controllers/nlp-sample.controller.ts
index 27ed1f60..cc49d41a 100644
--- a/api/src/nlp/controllers/nlp-sample.controller.ts
+++ b/api/src/nlp/controllers/nlp-sample.controller.ts
@@ -42,7 +42,7 @@ import { PopulatePipe } from '@/utils/pipes/populate.pipe';
 import { SearchFilterPipe } from '@/utils/pipes/search-filter.pipe';
 import { TFilterQuery } from '@/utils/types/filter.types';
 
-import { NlpSampleDto } from '../dto/nlp-sample.dto';
+import { NlpSampleDto, TNlpSampleDto } from '../dto/nlp-sample.dto';
 import {
   NlpSample,
   NlpSampleFull,
@@ -60,7 +60,8 @@ export class NlpSampleController extends BaseController<
   NlpSample,
   NlpSampleStub,
   NlpSamplePopulate,
-  NlpSampleFull
+  NlpSampleFull,
+  TNlpSampleDto
 > {
   constructor(
     private readonly nlpSampleService: NlpSampleService,
diff --git a/api/src/nlp/controllers/nlp-value.controller.spec.ts b/api/src/nlp/controllers/nlp-value.controller.spec.ts
index 6bc5cae9..58be7aa8 100644
--- a/api/src/nlp/controllers/nlp-value.controller.spec.ts
+++ b/api/src/nlp/controllers/nlp-value.controller.spec.ts
@@ -100,6 +100,9 @@ describe('NlpValueController', () => {
             entity: nlpEntityFixtures[
               parseInt(curr.entity)
             ] as NlpValueFull['entity'],
+            builtin: curr.builtin!,
+            expressions: curr.expressions!,
+            metadata: curr.metadata!,
           });
           return acc;
         },
@@ -123,6 +126,9 @@ describe('NlpValueController', () => {
           const ValueWithEntities = {
             ...curr,
             entity: nlpEntities[parseInt(curr.entity)].id,
+            expressions: curr.expressions!,
+            metadata: curr.metadata!,
+            builtin: curr.builtin!,
           };
           acc.push(ValueWithEntities);
           return acc;
diff --git a/api/src/nlp/repositories/nlp-sample-entity.repository.spec.ts b/api/src/nlp/repositories/nlp-sample-entity.repository.spec.ts
index abab2875..50494a7b 100644
--- a/api/src/nlp/repositories/nlp-sample-entity.repository.spec.ts
+++ b/api/src/nlp/repositories/nlp-sample-entity.repository.spec.ts
@@ -113,6 +113,9 @@ describe('NlpSampleEntityRepository', () => {
           const ValueWithEntities = {
             ...curr,
             entity: nlpEntities[0].id,
+            expressions: curr.expressions!,
+            builtin: curr.builtin!,
+            metadata: curr.metadata!,
           };
           acc.push(ValueWithEntities);
           return acc;
diff --git a/api/src/nlp/repositories/nlp-value.repository.spec.ts b/api/src/nlp/repositories/nlp-value.repository.spec.ts
index b738c1cd..3186cc26 100644
--- a/api/src/nlp/repositories/nlp-value.repository.spec.ts
+++ b/api/src/nlp/repositories/nlp-value.repository.spec.ts
@@ -89,6 +89,9 @@ describe('NlpValueRepository', () => {
             entity: nlpEntityFixtures[
               parseInt(curr.entity)
             ] as NlpValueFull['entity'],
+            builtin: curr.builtin!,
+            expressions: curr.expressions!,
+            metadata: curr.metadata!,
           };
           acc.push(ValueWithEntities);
           return acc;
diff --git a/api/src/nlp/services/nlp-sample-entity.service.spec.ts b/api/src/nlp/services/nlp-sample-entity.service.spec.ts
index 381124df..94707a0a 100644
--- a/api/src/nlp/services/nlp-sample-entity.service.spec.ts
+++ b/api/src/nlp/services/nlp-sample-entity.service.spec.ts
@@ -133,6 +133,9 @@ describe('NlpSampleEntityService', () => {
           const ValueWithEntities = {
             ...curr,
             entity: nlpEntities[0].id,
+            expressions: curr.expressions!,
+            builtin: curr.builtin!,
+            metadata: curr.metadata!,
           };
           acc.push(ValueWithEntities);
           return acc;
diff --git a/api/src/nlp/services/nlp-value.service.spec.ts b/api/src/nlp/services/nlp-value.service.spec.ts
index 22349f8d..35202015 100644
--- a/api/src/nlp/services/nlp-value.service.spec.ts
+++ b/api/src/nlp/services/nlp-value.service.spec.ts
@@ -97,6 +97,9 @@ describe('NlpValueService', () => {
             entity: nlpEntityFixtures[
               parseInt(curr.entity)
             ] as NlpValueFull['entity'],
+            expressions: curr.expressions!,
+            metadata: curr.metadata!,
+            builtin: curr.builtin!,
           };
           acc.push(ValueWithEntities);
           return acc;