diff --git a/src/utils/formatCode.spec.ts b/src/utils/formatCode.spec.ts
index df46263b1..49a4665f1 100644
--- a/src/utils/formatCode.spec.ts
+++ b/src/utils/formatCode.spec.ts
@@ -1,3 +1,4 @@
+import {EOL} from 'os';
 import { formatCode } from './formatCode';
 
 const input1 = `{ foo: true }`;
@@ -13,20 +14,14 @@ foo: true,
 bar: 123
 }`;
 
-const output3 = `{
-\tfoo: true,
-\tbar: 123
-}`;
+const output3 = `{${EOL}\tfoo: true,${EOL}\tbar: 123${EOL}}`;
 
 const input4 = `{
 \t\t\t\tfoo: true,
 \t\t\t\tbar: 123
 }`;
 
-const output4 = `{
-\tfoo: true,
-\tbar: 123
-}`;
+const output4 = `{${EOL}\tfoo: true,${EOL}\tbar: 123${EOL}}`;
 
 describe('format', () => {
     it('should produce correct result', () => {
diff --git a/src/utils/formatCode.ts b/src/utils/formatCode.ts
index 42cfd5cf4..9d0e8e69b 100644
--- a/src/utils/formatCode.ts
+++ b/src/utils/formatCode.ts
@@ -2,7 +2,7 @@ import { EOL } from 'os';
 
 export const formatCode = (s: string): string => {
     let indent: number = 0;
-    let lines = s.split(EOL);
+    let lines = s.split(/[\r\n]+/);
     lines = lines.map(line => {
         line = line.trim().replace(/^\*/g, ' *');
         let i = indent;
diff --git a/src/utils/writeClientCore.spec.ts b/src/utils/writeClientCore.spec.ts
index 36990054e..7db71f59b 100644
--- a/src/utils/writeClientCore.spec.ts
+++ b/src/utils/writeClientCore.spec.ts
@@ -1,4 +1,5 @@
 import { EOL } from 'os';
+import { resolve } from 'path';
 
 import type { Client } from '../client/interfaces/Client';
 import { HttpClient } from '../HttpClient';
@@ -40,11 +41,11 @@ describe('writeClientCore', () => {
 
         await writeClientCore(client, templates, '/', HttpClient.FETCH, Indent.SPACE_4);
 
-        expect(writeFile).toBeCalledWith('/OpenAPI.ts', `settings${EOL}`);
-        expect(writeFile).toBeCalledWith('/ApiError.ts', `apiError${EOL}`);
-        expect(writeFile).toBeCalledWith('/ApiRequestOptions.ts', `apiRequestOptions${EOL}`);
-        expect(writeFile).toBeCalledWith('/ApiResult.ts', `apiResult${EOL}`);
-        expect(writeFile).toBeCalledWith('/CancelablePromise.ts', `cancelablePromise${EOL}`);
-        expect(writeFile).toBeCalledWith('/request.ts', `request${EOL}`);
+        expect(writeFile).toBeCalledWith(resolve('/', '/OpenAPI.ts'), `settings${EOL}`);
+        expect(writeFile).toBeCalledWith(resolve('/', '/ApiError.ts'), `apiError${EOL}`);
+        expect(writeFile).toBeCalledWith(resolve('/', '/ApiRequestOptions.ts'), `apiRequestOptions${EOL}`);
+        expect(writeFile).toBeCalledWith(resolve('/', '/ApiResult.ts'), `apiResult${EOL}`);
+        expect(writeFile).toBeCalledWith(resolve('/', '/CancelablePromise.ts'), `cancelablePromise${EOL}`);
+        expect(writeFile).toBeCalledWith(resolve('/', '/request.ts'), `request${EOL}`);
     });
 });
diff --git a/src/utils/writeClientIndex.spec.ts b/src/utils/writeClientIndex.spec.ts
index a74421115..a7d5b610a 100644
--- a/src/utils/writeClientIndex.spec.ts
+++ b/src/utils/writeClientIndex.spec.ts
@@ -1,3 +1,5 @@
+import { resolve } from 'path';
+
 import type { Client } from '../client/interfaces/Client';
 import { writeFile } from './fileSystem';
 import type { Templates } from './registerHandlebarTemplates';
@@ -36,6 +38,6 @@ describe('writeClientIndex', () => {
 
         await writeClientIndex(client, templates, '/', true, true, true, true, true, 'Service', '');
 
-        expect(writeFile).toBeCalledWith('/index.ts', 'index');
+        expect(writeFile).toBeCalledWith(resolve('/', '/index.ts'), 'index');
     });
 });
diff --git a/src/utils/writeClientModels.spec.ts b/src/utils/writeClientModels.spec.ts
index e147c8e73..ee0f2b4f6 100644
--- a/src/utils/writeClientModels.spec.ts
+++ b/src/utils/writeClientModels.spec.ts
@@ -1,4 +1,5 @@
 import { EOL } from 'os';
+import { resolve } from 'path';
 
 import type { Model } from '../client/interfaces/Model';
 import { HttpClient } from '../HttpClient';
@@ -53,6 +54,6 @@ describe('writeClientModels', () => {
 
         await writeClientModels(models, templates, '/', HttpClient.FETCH, false, Indent.SPACE_4);
 
-        expect(writeFile).toBeCalledWith('/User.ts', `model${EOL}`);
+        expect(writeFile).toBeCalledWith(resolve('/', '/User.ts'), `model${EOL}`);
     });
 });
diff --git a/src/utils/writeClientSchemas.spec.ts b/src/utils/writeClientSchemas.spec.ts
index f71286232..e75928b8c 100644
--- a/src/utils/writeClientSchemas.spec.ts
+++ b/src/utils/writeClientSchemas.spec.ts
@@ -1,4 +1,5 @@
 import { EOL } from 'os';
+import { resolve } from 'path';
 
 import type { Model } from '../client/interfaces/Model';
 import { HttpClient } from '../HttpClient';
@@ -53,6 +54,6 @@ describe('writeClientSchemas', () => {
 
         await writeClientSchemas(models, templates, '/', HttpClient.FETCH, false, Indent.SPACE_4);
 
-        expect(writeFile).toBeCalledWith('/$User.ts', `schema${EOL}`);
+        expect(writeFile).toBeCalledWith(resolve('/', '/$User.ts'), `schema${EOL}`);
     });
 });
diff --git a/src/utils/writeClientServices.spec.ts b/src/utils/writeClientServices.spec.ts
index b7ebbfe6c..f936d6609 100644
--- a/src/utils/writeClientServices.spec.ts
+++ b/src/utils/writeClientServices.spec.ts
@@ -1,4 +1,5 @@
 import { EOL } from 'os';
+import { resolve } from 'path';
 
 import type { Service } from '../client/interfaces/Service';
 import { HttpClient } from '../HttpClient';
@@ -41,6 +42,6 @@ describe('writeClientServices', () => {
 
         await writeClientServices(services, templates, '/', HttpClient.FETCH, false, false, Indent.SPACE_4, 'Service');
 
-        expect(writeFile).toBeCalledWith('/UserService.ts', `service${EOL}`);
+        expect(writeFile).toBeCalledWith(resolve('/', '/UserService.ts'), `service${EOL}`);
     });
 });