diff --git a/packages/gen-ai-hub/src/client/openai/openai-client.test.ts b/packages/gen-ai-hub/src/client/openai/openai-client.test.ts
index 0db33ae2..c7fdb48c 100644
--- a/packages/gen-ai-hub/src/client/openai/openai-client.test.ts
+++ b/packages/gen-ai-hub/src/client/openai/openai-client.test.ts
@@ -5,12 +5,12 @@ import {
   parseMockResponse
 } from '../../../../../test-util/mock-http.js';
 import {
-  OpenAiChatCompletionOutput,
   OpenAiChatMessage,
   OpenAiEmbeddingOutput,
   OpenAiEmbeddingParameters
 } from './openai-types.js';
 import { OpenAiClient } from './openai-client.js';
+import { OpenAiChatCompletionResponse } from './openai-response.js';
 
 describe('openai client', () => {
   const chatCompletionEndpoint = {
@@ -43,7 +43,7 @@ describe('openai client', () => {
         ] as OpenAiChatMessage[]
       };
 
-      const mockResponse = parseMockResponse<OpenAiChatCompletionOutput>(
+      const mockResponse = parseMockResponse<OpenAiChatCompletionResponse>(
         'openai',
         'openai-chat-completion-success-response.json'
       );
@@ -62,7 +62,7 @@ describe('openai client', () => {
       const response = await client.chatCompletion(prompt, {
         deploymentId: '1234'
       });
-      expect(response).toEqual(mockResponse);
+      expect(response).toEqual(mockResponse.data);
     });
 
     it('throws on bad request', async () => {
diff --git a/packages/gen-ai-hub/src/client/openai/openai-response.ts b/packages/gen-ai-hub/src/client/openai/openai-response.ts
index 3526836e..1125e506 100644
--- a/packages/gen-ai-hub/src/client/openai/openai-response.ts
+++ b/packages/gen-ai-hub/src/client/openai/openai-response.ts
@@ -1,7 +1,9 @@
 import { HttpResponse } from "@sap-cloud-sdk/http-client";
 import { OpenAiChatCompletionOutput } from "./openai-types.js";
 
-// Define a wrapper class to expose utility methods and properties
+/**
+ * Open AI chat completion response.
+ */
 export class OpenAiChatCompletionResponse {
   public data: OpenAiChatCompletionOutput
   constructor(private rawResponse: HttpResponse,) {
diff --git a/packages/gen-ai-hub/src/orchestration/orchestration-response.ts b/packages/gen-ai-hub/src/orchestration/orchestration-response.ts
index 341f014d..2201ba98 100644
--- a/packages/gen-ai-hub/src/orchestration/orchestration-response.ts
+++ b/packages/gen-ai-hub/src/orchestration/orchestration-response.ts
@@ -1,7 +1,9 @@
 import { HttpResponse } from "@sap-cloud-sdk/http-client";
 import { CompletionPostResponse } from "./client/api/schema/index.js";
 
-// Define a wrapper class to expose utility methods and properties
+/**
+ * Respresentation of Orchestration response.
+ */
 export class OrchestrationResponse {
   public data: CompletionPostResponse
   constructor(private rawResponse: HttpResponse,) {