diff --git a/.prettierrc.yml b/.prettierrc.yml
index 9b83db6a..31095730 100644
--- a/.prettierrc.yml
+++ b/.prettierrc.yml
@@ -1,3 +1,5 @@
 printWidth: 100
 singleQuote: true
-trailingComma: es6
+trailingComma: all
+tabWidth: 2
+useTabs: false
diff --git a/test/tests/infrastructure/BaseService.ts b/test/tests/infrastructure/BaseService.ts
index 09cef8ff..45ed79b9 100644
--- a/test/tests/infrastructure/BaseService.ts
+++ b/test/tests/infrastructure/BaseService.ts
@@ -7,7 +7,7 @@ describe('Creation of BaseService instance', () => {
     expect(service.url).toBe('https://gitlab.com/api/v4');
   });
 
-  test('Use the Oauth Token when a user supplies both a Private Token and a Oauth Token', async () => {
+  test('Use the Oauth Token when a given both a Private Token and a Oauth Token', async () => {
     const service = new BaseService({ token: 'test', oauthToken: '1234' });
 
     expect(service.headers['private-token']).toBeUndefined();
diff --git a/test/tests/infrastructure/RequestHelper.ts b/test/tests/infrastructure/RequestHelper.ts
index 6f26db79..55bd6cc1 100644
--- a/test/tests/infrastructure/RequestHelper.ts
+++ b/test/tests/infrastructure/RequestHelper.ts
@@ -1,7 +1,7 @@
 import { RequestHelper } from '../../../src/infrastructure';
 import Request from 'got';
 
-const mockedGetBasic = () => {
+const mockedGetBasic = () => ({
   body: {
     prop1: 5,
     prop2: 'test property',
@@ -9,8 +9,8 @@ const mockedGetBasic = () => {
   headers: {
     'X-Page': 1,
     'X-Total-Pages': 1,
-  }
-}
+  },
+});
 
 const mockedGetExtended = () => {
   let u = url;
@@ -29,7 +29,10 @@ const mockedGetExtended = () => {
       },
     ],
     headers: {
-      link: "<'https://www.test.com/api/v3/projects/8?page=2&per_page=2>; rel='next', <'https://www.test.com/api/v3/projects/8?page=1&per_page=2>; rel='first', <'https://www.test.com/api/v3/projects/8?page=2&per_page=2>; rel='last'",
+      link:
+        `<'https://www.test.com/api/v3/projects/8?page=2&per_page=2>; rel='next',
+        <'https://www.test.com/api/v3/projects/8?page=1&per_page=2>; rel='first',
+        <'https://www.test.com/api/v3/projects/8?page=2&per_page=2>; rel='last'`,
       'x-next-page': 2,
       'x-page': 1,
       'x-per-page': 2,
@@ -51,7 +54,9 @@ const mockedGetExtended = () => {
       },
     ],
     headers: {
-      link: "<'https://www.test.com/api/v3/projects/8?page=1&per_page=2>; rel='prev', <'https://www.test.com/api/v3/projects/8?page=1&per_page=2>; rel='first', <'https://www.test.com/api/v3/projects/8?page=2&per_page=2>; rel='last'",
+      link: `<'https://www.test.com/api/v3/projects/8?page=1&per_page=2>; rel='prev',
+        <'https://www.test.com/api/v3/projects/8?page=1&per_page=2>; rel='first',
+        <'https://www.test.com/api/v3/projects/8?page=2&per_page=2>; rel='last'`,
       'x-next-page': '',
       'x-page': 2,
       'x-per-page': 2,
@@ -68,7 +73,7 @@ const mockedGetExtended = () => {
 
 describe('RequestHelper.get()', () => {
   it('Should respond with an object', async () => {
-    Request.get = jest.fn(() =>  mockedGetBasic());
+    Request.get = jest.fn(() => mockedGetBasic());
 
     const response = await RequestHelper.get(
       { url: 'testing', token: 'token' },
@@ -80,7 +85,7 @@ describe('RequestHelper.get()', () => {
   });
 
   it('Should be paginated when links are present', async () => {
-    Request.get = jest.fn(() =>  mockedGetExtended());
+    Request.get = jest.fn(() => mockedGetExtended());
 
     const response = await RequestHelper.get(
       { url: 'testing', token: 'token' },
@@ -94,7 +99,7 @@ describe('RequestHelper.get()', () => {
   });
 
   it('Should be paginated but limited by the maxPages option', async () => {
-    Request.get = jest.fn(() =>  mockedGetExtended());
+    Request.get = jest.fn(() => mockedGetExtended());
 
     const response = await RequestHelper.get(
       { url: 'testing', token: 'token' },
diff --git a/test/tests/services/Snippets.ts b/test/tests/services/Snippets.ts
index 2847d461..0cf9fc34 100644
--- a/test/tests/services/Snippets.ts
+++ b/test/tests/services/Snippets.ts
@@ -7,7 +7,13 @@ describe('Snippets', () => {
       token: process.env.PERSONAL_ACCESS_TOKEN,
     });
 
-    const result = await service.create('This is a snippet', 'test.txt', 'Hello world', 'internal', { 'description': 'Hello World snippet' });
+    const result = await service.create(
+      'This is a snippet',
+      'test.txt',
+      'Hello world',
+      'internal',
+      { description: 'Hello World snippet' },
+    );
 
     expect(result).toBeInstanceOf(Object);
     expect(result.title).toEqual('This is a snippet');