diff --git a/test/app.test.ts b/test/app.test.ts
index a86d813..dcf0492 100644
--- a/test/app.test.ts
+++ b/test/app.test.ts
@@ -1,5 +1,5 @@
 import DiscogsMarketplace, {
-    IOutputError, IOutputSuccess, IDiscogsMarketplace,
+    IOutputSuccess, IDiscogsMarketplace,
     ECurrency,
     EFormat,
     EFormatDescription,
@@ -11,66 +11,58 @@ import DiscogsMarketplace, {
     EStyle,
     EType
 } from "@main/index"
-import nock from 'nock'
-import fs from 'fs'
 import url from 'url'
 
-const html = fs.readFileSync(`${__dirname}/html/index.html`).toString()
-
 describe('Test marketplace.ts', () => {
-    let service: IDiscogsMarketplace
-
-    beforeEach(() => {
-        service = DiscogsMarketplace
-        nock('https://www.discogs.com').get(/error/).reply(404)
-        nock('https://www.discogs.com').get(/.*/).reply(200, html)
-    })
-
-    test('should return success value', async () => {
-        await service.search({ searchType: EType.STRING, searchValue: "" })
-            .then((res: IOutputSuccess) => {
-                expect(res.result).not.toBe(null)
-                expect(res.page).not.toBe(null)
-                expect(res.page?.current).not.toBe(null)
-                expect(res.page?.total).not.toBe(null)
-                expect(res.item).not.toBe(null)
-                expect(res.item?.total).not.toBe(null)
-                expect(res.item?.per_page).not.toBe(null)
-                expect(res.search).not.toBe(null)
-                expect(res.search?.value).not.toBe(null)
-                expect(res.search?.type).not.toBe(null)
-                expect(res.url_generated).not.toBe(null)
-            })
-    })
-
-    test('should return error value', async () => {
-        await service.search({ searchType: EType.STRING, searchValue: "error" })
-            .catch((err: IOutputError) => {
-                expect(err.code).toBe(404)
-                expect(err.message).toBe("An error occured")
-            })
-    })
-
-
-    test('should return success value with artist', async () => {
-        await service.search({ searchType: EType.ARTIST, searchValue: 123456 })
-            .then((res: IOutputSuccess) => {
-                expect(res.result).not.toBe(null)
-                expect(res.page).not.toBe(null)
-                expect(res.page?.current).not.toBe(null)
-                expect(res.page?.total).not.toBe(null)
-                expect(res.item).not.toBe(null)
-                expect(res.item?.total).not.toBe(null)
-                expect(res.item?.per_page).not.toBe(null)
-                expect(res.search).not.toBe(null)
-                expect(res.search?.value).not.toBe(null)
-                expect(res.search?.type).not.toBe(null)
-                expect(res.url_generated).not.toBe(null)
-            })
-    })
-
-    test('should return good params with artist', async () => {
-        await service.search({
+    const service: IDiscogsMarketplace = DiscogsMarketplace
+    const timeout = 10000
+
+    test('should return success value', async (done) => {
+        const res: IOutputSuccess = await service.search({ searchType: EType.STRING, searchValue: "" })
+
+        expect(res.result).not.toBe(null)
+        expect(res.page).not.toBe(null)
+        expect(res.page?.current).not.toBe(null)
+        expect(res.page?.total).not.toBe(null)
+        expect(res.item).not.toBe(null)
+        expect(res.item?.total).not.toBe(null)
+        expect(res.item?.per_page).not.toBe(null)
+        expect(res.search).not.toBe(null)
+        expect(res.search?.value).not.toBe(null)
+        expect(res.search?.type).not.toBe(null)
+        expect(res.url_generated).not.toBe(null)
+        done()
+    }, timeout)
+
+    test('should return error value', async (done) => {
+        try {
+            await service.search({ searchType: EType.STRING, searchValue: "error" })
+        } catch (err) {
+            expect(err.code).toBe(404)
+            expect(err.message).toBe("An error occured")
+        } finally {
+            done()
+        }
+    }, timeout)
+
+    test('should return success value with artist', async (done) => {
+        const res: IOutputSuccess = await service.search({ searchType: EType.ARTIST, searchValue: 123456 })
+        expect(res.result).not.toBe(null)
+        expect(res.page).not.toBe(null)
+        expect(res.page?.current).not.toBe(null)
+        expect(res.page?.total).not.toBe(null)
+        expect(res.item).not.toBe(null)
+        expect(res.item?.total).not.toBe(null)
+        expect(res.item?.per_page).not.toBe(null)
+        expect(res.search).not.toBe(null)
+        expect(res.search?.value).not.toBe(null)
+        expect(res.search?.type).not.toBe(null)
+        expect(res.url_generated).not.toBe(null)
+        done()
+    }, timeout)
+
+    test('should return good params with artist', async (done) => {
+        const res: IOutputSuccess = await service.search({
             searchType: EType.ARTIST,
             searchValue: 123456,
             currency: undefined,
@@ -90,30 +82,30 @@ describe('Test marketplace.ts', () => {
             page: 1,
             lang: ELang.ENGLISH
         })
-            .then((res: IOutputSuccess) => {
-                const params = url.parse(res.url_generated!, true)?.query
-                expect(params).not.toBe(null)
-                expect(params[EType.ARTIST]).toBe("123456")
-                expect(params.currency).toBe(undefined)
-                expect(params.genre).toBe(undefined)
-                expect(params.style).toBe(undefined)
-                expect(params.format).toBe(undefined)
-                expect(params.format_desc).toBe(undefined)
-                expect(params.condition).toBe(undefined)
-                expect(params.year).toBe(undefined)
-                expect(params.year1).toBe(undefined)
-                expect(params.year2).toBe(undefined)
-                expect(params.audio).toBe("0")
-                expect(params.offers).toBe("0")
-                expect(params.ships_from).toBe(undefined)
-                expect(params.limit).toBe("25")
-                expect(params.page).toBe("1")
-                expect(params.sort).toBe(ESort.LISTED_NEWEST)
-            })
-    })
-
-    test('should return good params with complex search', async () => {
-        await service.search({
+
+        const params = url.parse(res.url_generated!, true)?.query
+        expect(params).not.toBe(null)
+        expect(params[EType.ARTIST]).toBe("123456")
+        expect(params.currency).toBe(undefined)
+        expect(params.genre).toBe(undefined)
+        expect(params.style).toBe(undefined)
+        expect(params.format).toBe(undefined)
+        expect(params.format_desc).toBe(undefined)
+        expect(params.condition).toBe(undefined)
+        expect(params.year).toBe(undefined)
+        expect(params.year1).toBe(undefined)
+        expect(params.year2).toBe(undefined)
+        expect(params.audio).toBe("0")
+        expect(params.offers).toBe("0")
+        expect(params.ships_from).toBe(undefined)
+        expect(params.limit).toBe("25")
+        expect(params.page).toBe("1")
+        expect(params.sort).toBe(ESort.LISTED_NEWEST)
+        done()
+    }, timeout)
+
+    test('should return good params with complex search', async (done) => {
+        const res: IOutputSuccess = await service.search({
             searchType: EType.STRING,
             searchValue: "test",
             currency: ECurrency.EUR,
@@ -133,30 +125,30 @@ describe('Test marketplace.ts', () => {
             page: 2,
             lang: ELang.FRENCH
         })
-            .then((res: IOutputSuccess) => {
-                const params = url.parse(res.url_generated!, true)?.query
-                expect(params).not.toBe(null)
-                expect(params[EType.STRING]).toBe("test")
-                expect(params.currency).toBe(ECurrency.EUR)
-                expect(params.genre).toBe(EGenre.ROCK)
-                expect(params.style).toEqual([EStyle.DEATHMETAL, EStyle.HEAVYMETAL])
-                expect(params.format).toBe(EFormat.CD)
-                expect(params.format_desc).toBe(EFormatDescription.PROMO)
-                expect(params.condition).toBe(EMediaCondition.MINT)
-                expect(params.year).toBe("2019")
-                expect(params.year1).toBe(undefined)
-                expect(params.year2).toBe(undefined)
-                expect(params.audio).toBe("1")
-                expect(params.offers).toBe("1")
-                expect(params.ships_from).toBe(EFrom.FRANCE)
-                expect(params.limit).toBe("50")
-                expect(params.page).toBe("2")
-                expect(params.sort).toBe(ESort.LISTED_OLDEST)
-            })
-    })
-
-    test('should return good params with complex search and years interval', async () => {
-        await service.search({
+
+        const params = url.parse(res.url_generated!, true)?.query
+        expect(params).not.toBe(null)
+        expect(params[EType.STRING]).toBe("test")
+        expect(params.currency).toBe(ECurrency.EUR)
+        expect(params.genre).toBe(EGenre.ROCK)
+        expect(params.style).toEqual([EStyle.DEATHMETAL, EStyle.HEAVYMETAL])
+        expect(params.format).toBe(EFormat.CD)
+        expect(params.format_desc).toBe(EFormatDescription.PROMO)
+        expect(params.condition).toBe(EMediaCondition.MINT)
+        expect(params.year).toBe("2019")
+        expect(params.year1).toBe(undefined)
+        expect(params.year2).toBe(undefined)
+        expect(params.audio).toBe("1")
+        expect(params.offers).toBe("1")
+        expect(params.ships_from).toBe(EFrom.FRANCE)
+        expect(params.limit).toBe("50")
+        expect(params.page).toBe("2")
+        expect(params.sort).toBe(ESort.LISTED_OLDEST)
+        done()
+    }, timeout)
+
+    test('should return good params with complex search and years interval', async (done) => {
+        const res: IOutputSuccess = await service.search({
             searchType: EType.STRING,
             searchValue: "test",
             currency: ECurrency.EUR,
@@ -176,68 +168,68 @@ describe('Test marketplace.ts', () => {
             page: 2,
             lang: ELang.FRENCH
         })
-            .then((res: IOutputSuccess) => {
-                const params = url.parse(res.url_generated!, true)?.query
-                expect(params).not.toBe(null)
-                expect(params[EType.STRING]).toBe("test")
-                expect(params.currency).toBe(ECurrency.EUR)
-                expect(params.genre).toBe(EGenre.ROCK)
-                expect(params.style).toEqual([EStyle.DEATHMETAL, EStyle.HEAVYMETAL])
-                expect(params.format).toBe(EFormat.CD)
-                expect(params.format_desc).toBe(EFormatDescription.PROMO)
-                expect(params.condition).toBe(EMediaCondition.MINT)
-                expect(params.year).toBe(undefined)
-                expect(params.year1).toBe("2015")
-                expect(params.year2).toBe("2016")
-                expect(params.audio).toBe("1")
-                expect(params.offers).toBe("1")
-                expect(params.ships_from).toBe(EFrom.FRANCE)
-                expect(params.limit).toBe("50")
-                expect(params.page).toBe("2")
-                expect(params.sort).toBe(ESort.LISTED_OLDEST)
-            })
-    })
-
-    test('should return good params with user\'s wantlist search', async () => {
-        await service.search({
+
+        const params = url.parse(res.url_generated!, true)?.query
+        expect(params).not.toBe(null)
+        expect(params[EType.STRING]).toBe("test")
+        expect(params.currency).toBe(ECurrency.EUR)
+        expect(params.genre).toBe(EGenre.ROCK)
+        expect(params.style).toEqual([EStyle.DEATHMETAL, EStyle.HEAVYMETAL])
+        expect(params.format).toBe(EFormat.CD)
+        expect(params.format_desc).toBe(EFormatDescription.PROMO)
+        expect(params.condition).toBe(EMediaCondition.MINT)
+        expect(params.year).toBe(undefined)
+        expect(params.year1).toBe("2015")
+        expect(params.year2).toBe("2016")
+        expect(params.audio).toBe("1")
+        expect(params.offers).toBe("1")
+        expect(params.ships_from).toBe(EFrom.FRANCE)
+        expect(params.limit).toBe("50")
+        expect(params.page).toBe("2")
+        expect(params.sort).toBe(ESort.LISTED_OLDEST)
+        done()
+    }, timeout)
+
+    test('should return good params with user\'s wantlist search', async (done) => {
+        const res: IOutputSuccess = await service.search({
             searchType: EType.USER,
             searchValue: "TheUser"
         })
-            .then((res: IOutputSuccess) => {
-                const params = url.parse(res.url_generated!, true)?.query
-                expect(res.url_generated!.includes('/mywants')).toBe(true)
-                expect(res.url_generated!.includes('/list')).toBe(false)
-                expect(params.user).toBe("TheUser")
-            })
-    })
-
-    test('should return good params with user\'s selling search', async () => {
-        await service.search({
+
+        const params = url.parse(res.url_generated!, true)?.query
+        expect(res.url_generated!.includes('/mywants')).toBe(true)
+        expect(res.url_generated!.includes('/list')).toBe(false)
+        expect(params.user).toBe("TheUser")
+        done()
+    }, timeout)
+
+    test('should return good params with user\'s selling search', async (done) => {
+        const res: IOutputSuccess = await service.search({
             searchType: EType.STRING,
             searchValue: "",
             seller: "TheSeller"
         })
-            .then((res: IOutputSuccess) => {
-                expect(res.url_generated!.includes('/seller/TheSeller/')).toBe(true)
-                expect(res.url_generated!.includes('/sell/')).toBe(false)
-                expect(res.url_generated!.includes('/mywants')).toBe(false)
-                expect(res.url_generated!.includes('/profile')).toBe(true)
-            })
-    })
-
-    test('should return good params with user\'s wantlist search against user\'s selling items', async () => {
-        await service.search({
+
+        expect(res.url_generated!.includes('/seller/TheSeller/')).toBe(true)
+        expect(res.url_generated!.includes('/sell/')).toBe(false)
+        expect(res.url_generated!.includes('/mywants')).toBe(false)
+        expect(res.url_generated!.includes('/profile')).toBe(true)
+        done()
+    }, timeout)
+
+    test('should return good params with user\'s wantlist search against user\'s selling items', async (done) => {
+        const res: IOutputSuccess = await service.search({
             searchType: EType.USER,
             searchValue: "TheUser",
             seller: "TheSeller"
         })
-            .then((res: IOutputSuccess) => {
-                const params = url.parse(res.url_generated!, true)?.query
-                expect(res.url_generated!.includes('/seller/TheSeller/')).toBe(true)
-                expect(res.url_generated!.includes('/sell/')).toBe(false)
-                expect(res.url_generated!.includes('/mywants')).toBe(true)
-                expect(res.url_generated!.includes('/profile')).toBe(false)
-                expect(params.user).toBe("TheUser")
-            })
-    })
+
+        const params = url.parse(res.url_generated!, true)?.query
+        expect(res.url_generated!.includes('/seller/TheSeller/')).toBe(true)
+        expect(res.url_generated!.includes('/sell/')).toBe(false)
+        expect(res.url_generated!.includes('/mywants')).toBe(true)
+        expect(res.url_generated!.includes('/profile')).toBe(false)
+        expect(params.user).toBe("TheUser")
+        done()
+    }, timeout)
 })
\ No newline at end of file
diff --git a/tsconfig.json b/tsconfig.json
index a0a4aa9..3218989 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -32,7 +32,8 @@
     ]
   },
   "include": [
-    "lib/**/*"
+    "lib/**/*",
+    "test/**/*"
   ],
   "exclude": [
     "node_modules"