diff --git a/test/diff2html-tests.js b/test/diff2html-tests.js
index 49108b2..765df8a 100644
--- a/test/diff2html-tests.js
+++ b/test/diff2html-tests.js
@@ -2,6 +2,182 @@ var assert = require('assert');
 
 var Diff2Html = require('../src/diff2html.js').Diff2Html;
 
+var diffExample1 =
+  'diff --git a/sample b/sample\n' +
+  'index 0000001..0ddf2ba\n' +
+  '--- a/sample\n' +
+  '+++ b/sample\n' +
+  '@@ -1 +1 @@\n' +
+  '-test\n' +
+  '+test1\n';
+
+var jsonExample1 =
+  [{
+    blocks: [{
+      lines: [{
+        content: '-test',
+        type: 'd2h-del',
+        oldNumber: 1,
+        newNumber: null
+      },
+        {
+          content: '+test1',
+          type: 'd2h-ins',
+          oldNumber: null,
+          newNumber: 1
+        }],
+      oldStartLine: '1',
+      oldStartLine2: null,
+      newStartLine: '1',
+      header: '@@ -1 +1 @@'
+    }],
+    deletedLines: 1,
+    addedLines: 1,
+    checksumBefore: '0000001',
+    checksumAfter: '0ddf2ba',
+    oldName: 'sample',
+    language: undefined,
+    newName: 'sample',
+    isCombined: false
+  }];
+
+var filesExample1 =
+  '<div class="d2h-file-list-wrapper">\n' +
+  '     <div class="d2h-file-list-header">\n' +
+  '         <span class="d2h-file-list-title">Files changed (1)&nbsp&nbsp</span>\n' +
+  '         <a class="d2h-file-switch d2h-hide">hide</a>\n' +
+  '         <a class="d2h-file-switch d2h-show">show</a>\n' +
+  '     </div>\n' +
+  '     <table class="d2h-file-list">\n' +
+  '     <tr class="d2h-file-list-line">\n' +
+  '       <td class="d2h-lines-added">\n' +
+  '         <span>+1</span>\n' +
+  '       </td>\n' +
+  '       <td class="d2h-lines-deleted">\n' +
+  '         <span>-1</span>\n' +
+  '       </td>\n' +
+  '       <td class="d2h-file-name-wrapper">\n' +
+  '         <a href="#d2h-675094" class="d2h-file-name">&nbsp;sample         </a>\n' +
+  '       </td>\n' +
+  '     </tr>\n' +
+  '</table></div>\n';
+
+var htmlLineExample1 =
+  '<div class="d2h-wrapper">\n' +
+  '    <div id="d2h-675094" class="d2h-file-wrapper" data-lang="">\n' +
+  '    <div class="d2h-file-header">\n' +
+  '    <span class="d2h-file-stats">\n' +
+  '      <span class="d2h-lines-added">\n' +
+  '        <span>+1</span>\n' +
+  '      </span>\n' +
+  '      <span class="d2h-lines-deleted">\n' +
+  '        <span>-1</span>\n' +
+  '      </span>\n' +
+  '    </span>\n' +
+  '    <span class="d2h-file-name-wrapper">\n' +
+  '        <span class="d2h-file-name">&nbsp;sample</span>\n' +
+  '    </span>\n' +
+  '    </div>\n' +
+  '    <div class="d2h-file-diff">\n' +
+  '        <div class="d2h-code-wrapper">\n' +
+  '            <table class="d2h-diff-table">\n' +
+  '                <tbody class="d2h-diff-tbody">\n' +
+  '                <tr>\n' +
+  '    <td class="d2h-code-linenumber d2h-info"></td>\n' +
+  '    <td class="d2h-info">\n' +
+  '        <div class="d2h-code-line d2h-info"></div>\n' +
+  '    </td>\n' +
+  '</tr><tr>\n' +
+  '    <td class="d2h-code-linenumber d2h-del">\n' +
+  '        <div class="line-num1">1</div>\n' +
+  '        <div class="line-num2"></div>\n' +
+  '    </td>\n' +
+  '    <td class="d2h-del">\n' +
+  '        <div class="d2h-code-line d2h-del">\n' +
+  '            <span class="d2h-code-line-prefix">-</span>\n' +
+  '            <span class="d2h-code-line-ctn"><del>test</del></span>\n' +
+  '        </div>\n' +
+  '    </td>\n' +
+  '</tr><tr>\n' +
+  '    <td class="d2h-code-linenumber d2h-ins">\n' +
+  '        <div class="line-num1"></div>\n' +
+  '        <div class="line-num2">1</div>\n' +
+  '    </td>\n' +
+  '    <td class="d2h-ins">\n' +
+  '        <div class="d2h-code-line d2h-ins">\n' +
+  '            <span class="d2h-code-line-prefix">+</span>\n' +
+  '            <span class="d2h-code-line-ctn"><ins>test1</ins></span>\n' +
+  '        </div>\n' +
+  '    </td>\n' +
+  '</tr>\n' +
+  '                </tbody>\n' +
+  '            </table>\n' +
+  '        </div>\n' +
+  '    </div>\n' +
+  '</div>\n' +
+  '</div>';
+
+var htmlLineExample1WithFilesSummary = filesExample1 + htmlLineExample1;
+
+var htmlSideExample1 =
+  '<div class="d2h-wrapper">\n' +
+  '<div id="d2h-675094" class="d2h-file-wrapper" data-lang="undefined">\n' +
+  '     <div class="d2h-file-header">\n' +
+  '       <span class="d2h-file-stats">\n' +
+  '         <span class="d2h-lines-added">\n' +
+  '           <span>+1</span>\n' +
+  '         </span>\n' +
+  '         <span class="d2h-lines-deleted">\n' +
+  '           <span>-1</span>\n' +
+  '         </span>\n' +
+  '       </span>\n' +
+  '       <span class="d2h-file-name-wrapper">\n' +
+  '         <span class="d2h-file-name">sample</span>\n' +
+  '       </span>\n' +
+  '     </div>\n' +
+  '     <div class="d2h-files-diff">\n' +
+  '       <div class="d2h-file-side-diff">\n' +
+  '         <div class="d2h-code-wrapper">\n' +
+  '           <table class="d2h-diff-table">\n' +
+  '             <tbody class="d2h-diff-tbody">\n' +
+  '           <tr>\n' +
+  '  <td class="d2h-code-side-linenumber d2h-info"></td>\n' +
+  '  <td class="d2h-info">\n' +
+  '    <div class="d2h-code-side-line d2h-info">@@ -1 +1 @@</div>\n' +
+  '  </td>\n' +
+  '</tr>\n' +
+  '<tr>\n' +
+  '    <td class="d2h-code-side-linenumber d2h-del">1</td>\n' +
+  '    <td class="d2h-del">      <div class="d2h-code-side-line d2h-del"><span class="d2h-code-line-prefix">-</span><span class="d2h-code-line-ctn"><del>test</del></span></div>    </td>\n' +
+  '  </tr>\n' +
+  '             </tbody>\n' +
+  '           </table>\n' +
+  '         </div>\n' +
+  '       </div>\n' +
+  '       <div class="d2h-file-side-diff">\n' +
+  '         <div class="d2h-code-wrapper">\n' +
+  '           <table class="d2h-diff-table">\n' +
+  '             <tbody class="d2h-diff-tbody">\n' +
+  '           <tr>\n' +
+  '  <td class="d2h-code-side-linenumber d2h-info"></td>\n' +
+  '  <td class="d2h-info">\n' +
+  '    <div class="d2h-code-side-line d2h-info"></div>\n' +
+  '  </td>\n' +
+  '</tr>\n' +
+  '<tr>\n' +
+  '    <td class="d2h-code-side-linenumber d2h-ins">1</td>\n' +
+  '    <td class="d2h-ins">      <div class="d2h-code-side-line d2h-ins"><span class="d2h-code-line-prefix">+</span><span class="d2h-code-line-ctn"><ins>test1</ins></span></div>    </td>\n' +
+  '  </tr>\n' +
+  '             </tbody>\n' +
+  '           </table>\n' +
+  '         </div>\n' +
+  '       </div>\n' +
+  '     </div>\n' +
+  '   </div>\n' +
+  '</div>\n';
+
+var htmlSideExample1WithFilesSummary = filesExample1 + htmlSideExample1;
+
 describe('Diff2Html', function() {
   describe('getJsonFromDiff', function() {
     it('should parse simple diff to json', function() {
@@ -14,6 +190,8 @@ describe('Diff2Html', function() {
         '-test\n' +
         '+test1\n';
       var result = Diff2Html.getJsonFromDiff(diff);
+
+      console.log(result);
       var file1 = result[0];
       assert.equal(1, result.length);
       assert.equal(1, file1.addedLines);
@@ -71,5 +249,35 @@ describe('Diff2Html', function() {
       assert.equal(null, result[0].blocks[0].lines[8].oldNumber);
       assert.equal(56, result[0].blocks[0].lines[8].newNumber);
     });
+
+    it('should generate pretty line by line html from diff', function() {
+      var result = Diff2Html.getPrettyHtmlFromDiff(diffExample1);
+      assert.equal(htmlLineExample1, result);
+    });
+
+    it('should generate pretty line by line html from json', function() {
+      var result = Diff2Html.getPrettyHtmlFromJson(jsonExample1);
+      assert.equal(htmlLineExample1, result);
+    });
+
+    it('should generate pretty diff with files summary', function() {
+      var result = Diff2Html.getPrettyHtmlFromDiff(diffExample1, {showFiles: true});
+      assert.equal(htmlLineExample1WithFilesSummary, result);
+    });
+
+    it('should generate pretty side by side html from diff', function() {
+      var result = Diff2Html.getPrettySideBySideHtmlFromDiff(diffExample1);
+      assert.equal(htmlSideExample1, result);
+    });
+
+    it('should generate pretty side by side html from json', function() {
+      var result = Diff2Html.getPrettySideBySideHtmlFromJson(jsonExample1);
+      assert.equal(htmlSideExample1, result);
+    });
+
+    it('should generate pretty side by side html from diff', function() {
+      var result = Diff2Html.getPrettySideBySideHtmlFromDiff(diffExample1, {showFiles: true});
+      assert.equal(htmlSideExample1WithFilesSummary, result);
+    });
   });
 });
diff --git a/test/side-by-side-printer-tests.js b/test/side-by-side-printer-tests.js
index d4b9837..c0d71cb 100644
--- a/test/side-by-side-printer-tests.js
+++ b/test/side-by-side-printer-tests.js
@@ -153,4 +153,98 @@ describe('SideBySidePrinter', function() {
       assert.equal(expected, fileHtml);
     });
   });
+
+  describe('generateSideBySideJsonHtml', function() {
+    it('should work for list of files', function() {
+      var exampleJson = [{
+        blocks: [{
+          lines: [{
+            content: '-test',
+            type: 'd2h-del',
+            oldNumber: 1,
+            newNumber: null
+          },
+            {
+              content: '+test1r',
+              type: 'd2h-ins',
+              oldNumber: null,
+              newNumber: 1
+            }],
+          oldStartLine: '1',
+          oldStartLine2: null,
+          newStartLine: '1',
+          header: '@@ -1 +1 @@'
+        }],
+        deletedLines: 1,
+        addedLines: 1,
+        checksumBefore: '0000001',
+        checksumAfter: '0ddf2ba',
+        oldName: 'sample',
+        language: undefined,
+        newName: 'sample',
+        isCombined: false
+      }];
+
+      var sideBySidePrinter = new SideBySidePrinter({matching: 'lines'});
+      var html = sideBySidePrinter.generateSideBySideJsonHtml(exampleJson);
+      var expected =
+        '<div class="d2h-wrapper">\n' +
+        '<div id="d2h-675094" class="d2h-file-wrapper" data-lang="undefined">\n' +
+        '     <div class="d2h-file-header">\n' +
+        '       <span class="d2h-file-stats">\n' +
+        '         <span class="d2h-lines-added">\n' +
+        '           <span>+1</span>\n' +
+        '         </span>\n' +
+        '         <span class="d2h-lines-deleted">\n' +
+        '           <span>-1</span>\n' +
+        '         </span>\n' +
+        '       </span>\n' +
+        '       <span class="d2h-file-name-wrapper">\n' +
+        '         <span class="d2h-file-name">sample</span>\n' +
+        '       </span>\n' +
+        '     </div>\n' +
+        '     <div class="d2h-files-diff">\n' +
+        '       <div class="d2h-file-side-diff">\n' +
+        '         <div class="d2h-code-wrapper">\n' +
+        '           <table class="d2h-diff-table">\n' +
+        '             <tbody class="d2h-diff-tbody">\n' +
+        '           <tr>\n' +
+        '  <td class="d2h-code-side-linenumber d2h-info"></td>\n' +
+        '  <td class="d2h-info">\n' +
+        '    <div class="d2h-code-side-line d2h-info">@@ -1 +1 @@</div>\n' +
+        '  </td>\n' +
+        '</tr>\n' +
+        '<tr>\n' +
+        '    <td class="d2h-code-side-linenumber d2h-del d2h-change">1</td>\n' +
+        '    <td class="d2h-del d2h-change">      <div class="d2h-code-side-line d2h-del d2h-change"><span class="d2h-code-line-prefix">-</span><span class="d2h-code-line-ctn"><del>test</del></span></div>    </td>\n' +
+        '  </tr>\n' +
+        '             </tbody>\n' +
+        '           </table>\n' +
+        '         </div>\n' +
+        '       </div>\n' +
+        '       <div class="d2h-file-side-diff">\n' +
+        '         <div class="d2h-code-wrapper">\n' +
+        '           <table class="d2h-diff-table">\n' +
+        '             <tbody class="d2h-diff-tbody">\n' +
+        '           <tr>\n' +
+        '  <td class="d2h-code-side-linenumber d2h-info"></td>\n' +
+        '  <td class="d2h-info">\n' +
+        '    <div class="d2h-code-side-line d2h-info"></div>\n' +
+        '  </td>\n' +
+        '</tr>\n' +
+        '<tr>\n' +
+        '    <td class="d2h-code-side-linenumber d2h-ins d2h-change">1</td>\n' +
+        '    <td class="d2h-ins d2h-change">      <div class="d2h-code-side-line d2h-ins d2h-change"><span class="d2h-code-line-prefix">+</span><span class="d2h-code-line-ctn"><ins>test1r</ins></span></div>    </td>\n' +
+        '  </tr>\n' +
+        '             </tbody>\n' +
+        '           </table>\n' +
+        '         </div>\n' +
+        '       </div>\n' +
+        '     </div>\n' +
+        '   </div>\n' +
+        '</div>\n';
+
+      assert.equal(expected, html);
+    });
+  });
 });