diff --git a/input.csv b/input.csv
deleted file mode 100644
index cee3862..0000000
--- a/input.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-first_name;last_name;email;gender;age
-Constantin;Langsdon;clangsdon0@hc360.com;Male;96
-Norah;Raison;nraison1@wired.com;Female;32
-Noll;Taborre;ntaborre2@twitpic.com;Male;52
-Karlen;Nolot;knolot3@liveinternet.ru;Female;2
-Melva;Trengrouse;mtrengrouse4@examiner.com;Female;64
-Stanislaus;Singers;ssingers5@mozilla.com;Male;17
-Justin;Gerholz;jgerholz6@discuz.net;Male;77
-Brantley;Degue;bdegue7@amazonaws.com;Male;25
-Emery;Lannin;elannin8@google.nl;Male;32
-Krystalle;Hilbourne;khilbourne9@ning.com;Female;67
\ No newline at end of file
diff --git a/output.json b/output.json
deleted file mode 100644
index f51dd6e..0000000
--- a/output.json
+++ /dev/null
@@ -1,72 +0,0 @@
-[
- {
-  "first_name": "Constantin",
-  "last_name": "Langsdon",
-  "email": "clangsdon0@hc360.com",
-  "gender": "Male",
-  "age": 96
- },
- {
-  "first_name": "Norah",
-  "last_name": "Raison",
-  "email": "nraison1@wired.com",
-  "gender": "Female",
-  "age": 32
- },
- {
-  "first_name": "Noll",
-  "last_name": "Taborre",
-  "email": "ntaborre2@twitpic.com",
-  "gender": "Male",
-  "age": 52
- },
- {
-  "first_name": "Karlen",
-  "last_name": "Nolot",
-  "email": "knolot3@liveinternet.ru",
-  "gender": "Female",
-  "age": 2
- },
- {
-  "first_name": "Melva",
-  "last_name": "Trengrouse",
-  "email": "mtrengrouse4@examiner.com",
-  "gender": "Female",
-  "age": 64
- },
- {
-  "first_name": "Stanislaus",
-  "last_name": "Singers",
-  "email": "ssingers5@mozilla.com",
-  "gender": "Male",
-  "age": 17
- },
- {
-  "first_name": "Justin",
-  "last_name": "Gerholz",
-  "email": "jgerholz6@discuz.net",
-  "gender": "Male",
-  "age": 77
- },
- {
-  "first_name": "Brantley",
-  "last_name": "Degue",
-  "email": "bdegue7@amazonaws.com",
-  "gender": "Male",
-  "age": 25
- },
- {
-  "first_name": "Emery",
-  "last_name": "Lannin",
-  "email": "elannin8@google.nl",
-  "gender": "Male",
-  "age": 32
- },
- {
-  "first_name": "Krystalle",
-  "last_name": "Hilbourne",
-  "email": "khilbourne9@ning.com",
-  "gender": "Female",
-  "age": 67
- }
-]
\ No newline at end of file
diff --git a/package.json b/package.json
index 51cc9d1..8480849 100644
--- a/package.json
+++ b/package.json
@@ -35,6 +35,7 @@
   "homepage": "https://github.com/iuccio/CSVtoJSON#readme",
   "devDependencies": {
     "chai": "^4.0.2",
+    "chai-fs": "^1.0.0",
     "gulp": "^3.9.1",
     "gulp-mocha": "^4.3.1",
     "gulp-util": "^3.0.8",
diff --git a/src/csvToJson.js b/src/csvToJson.js
index 840d680..c87c3a0 100644
--- a/src/csvToJson.js
+++ b/src/csvToJson.js
@@ -33,13 +33,15 @@ class CsvToJson {
         let jsonResult = [];
         for (let i = 1; i < lines.length; i++) {
             let currentLine = lines[i].split(fieldDelimiter);
-            let jsonObject = {};
-            for (let j = 0; j < headers.length; j++) {
-                let propertyName = stringUtils.trimPropertyName(headers[j]);
-                let value = stringUtils.getValueFormatByType(currentLine[j]);
-                jsonObject[propertyName] = value;
+            if (stringUtils.hasContent(currentLine)) {
+                let jsonObject = {};
+                for (let j = 0; j < headers.length; j++) {
+                    let propertyName = stringUtils.trimPropertyName(headers[j]);
+                    let value = stringUtils.getValueFormatByType(currentLine[j]);
+                    jsonObject[propertyName] = value;
+                }
+                jsonResult.push(jsonObject);
             }
-            jsonResult.push(jsonObject);
         }
         return jsonResult;
     }
diff --git a/src/util/stringUtils.js b/src/util/stringUtils.js
index aab5a31..95d9347 100644
--- a/src/util/stringUtils.js
+++ b/src/util/stringUtils.js
@@ -13,5 +13,16 @@ class StringUtils {
         }
         return String(value);
     }
+
+    hasContent(values){
+        if(values.length >0){
+            for(let i=0; i<values.length;i++){
+                if(values[i]){
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
 }
 module.exports = new StringUtils();
\ No newline at end of file
diff --git a/test/csvToJson.spec.js b/test/csvToJson.spec.js
new file mode 100644
index 0000000..e9dfc74
--- /dev/null
+++ b/test/csvToJson.spec.js
@@ -0,0 +1,51 @@
+'use strict';
+
+let expect = require('chai').expect;
+let assert = require('chai').assert;
+let csvToJson = require('../src/csvToJson');
+
+let expectedJson = [{
+    firstName: 'Constantin',
+    lastName: 'Langsdon',
+    email: 'clangsdon0@hc360.com',
+    gender: 'Male',
+    age: 96,
+    birth: '10.02.1965'
+}, {
+    firstName: 'Norah',
+    lastName: 'Raison',
+    email: 'nraison1@wired.com',
+    gender: 'Female',
+    age: 32,
+    birth: '10.05.2000'
+}];
+
+let fileInputName = 'test/resource/input.csv';
+
+describe('CsvToJson class testing', function () {
+
+    it('should return json array', function () {
+        //given
+
+        //when
+        let result = csvToJson.getJsonFromCsv(fileInputName);
+
+        //then
+        expect(result.length).to.equal(expectedJson.length);
+        expect(result).to.deep.equal(expectedJson);
+
+    });
+
+    it('should return json array that contains the same property of the csv header', function () {
+        //given
+        let headers = ['firstName', 'lastName', 'email', 'gender', 'age', 'birth'];
+
+        //when
+        let result = csvToJson.getJsonFromCsv(fileInputName);
+
+        //then
+        assert.isDefined(result);
+        assert.hasAllKeys(result[0],headers);
+    });
+
+});
\ No newline at end of file
diff --git a/test/resource/input.csv b/test/resource/input.csv
new file mode 100644
index 0000000..6bf30c0
--- /dev/null
+++ b/test/resource/input.csv
@@ -0,0 +1,3 @@
+firstName;lastName;email;gender;age;birth
+Constantin;Langsdon;clangsdon0@hc360.com;Male;96;10.02.1965
+Norah;Raison;nraison1@wired.com;Female;32;10.05.2000
diff --git a/test/resource/input_example.csv b/test/resource/input_example.csv
new file mode 100644
index 0000000..14a02a6
--- /dev/null
+++ b/test/resource/input_example.csv
@@ -0,0 +1,11 @@
+firstName;lastName;email;gender;age;birth
+Constantin;Langsdon;clangsdon0@hc360.com;Male;96;10.02.1965
+Norah;Raison;nraison1@wired.com;Female;32;10.05.2000
+Noll;Taborre;ntaborre2@twitpic.com;Male;52;05.12.1920
+Karlen;Nolot;knolot3@liveinternet.ru;Female;2;11.07.1986
+Melva;Trengrouse;mtrengrouse4@examiner.com;Female;64;19.11.1978
+Stanislaus;Singers;ssingers5@mozilla.com;Male;17;13.02.1963
+Justin;Gerholz;jgerholz6@discuz.net;Male;77;19.12.1990
+Brantley;Degue;bdegue7@amazonaws.com;Male;25;07.05.1974
+Emery;Lannin;elannin8@google.nl;Male;32;10.02.1985
+Krystalle;Hilbourne;khilbourne9@ning.com;Female;67;10.10.1910