diff --git a/src/SourceMapCorrector.ts b/src/SourceMapCorrector.ts
index f2ed091c..ec9f33d9 100644
--- a/src/SourceMapCorrector.ts
+++ b/src/SourceMapCorrector.ts
@@ -1,4 +1,5 @@
 import { IObfuscationResult } from "./interfaces/IObfuscationResult";
+import { ISourceMapCorrector } from "./interfaces/ISourceMapCorrector";
 
 import { TSourceMapMode } from "./types/TSourceMapMode";
 
@@ -7,7 +8,7 @@ import { SourceMapMode } from "./enums/SourceMapMode";
 import { ObfuscationResult } from "./ObfuscationResult";
 import { Utils } from "./Utils";
 
-export class SourceMapCorrector {
+export class SourceMapCorrector implements ISourceMapCorrector {
     /**
      * @type {string}
      */
diff --git a/src/interfaces/ISourceMapCorrector.d.ts b/src/interfaces/ISourceMapCorrector.d.ts
new file mode 100644
index 00000000..02360615
--- /dev/null
+++ b/src/interfaces/ISourceMapCorrector.d.ts
@@ -0,0 +1,5 @@
+import { IObfuscationResult } from "./IObfuscationResult";
+
+export interface ISourceMapCorrector {
+    correct (): IObfuscationResult;
+}
diff --git a/test/index.spec.ts b/test/index.spec.ts
index a2fec126..e8a5febd 100644
--- a/test/index.spec.ts
+++ b/test/index.spec.ts
@@ -10,6 +10,7 @@ BabelPolyfill.append();
 import './unit-tests/NodeUtils.spec';
 import './unit-tests/ObfuscationResult.spec';
 import './unit-tests/OptionsNormalizer.spec';
+import './unit-tests/SourceMapCorrector.spec';
 import './unit-tests/Utils.spec';
 import './unit-tests/cli/CLIUtils.spec';
 import './unit-tests/node-obfuscators/CatchClauseObfuscator.spec';
diff --git a/test/unit-tests/SourceMapCorrector.spec.ts b/test/unit-tests/SourceMapCorrector.spec.ts
new file mode 100644
index 00000000..7fee8dd0
--- /dev/null
+++ b/test/unit-tests/SourceMapCorrector.spec.ts
@@ -0,0 +1,88 @@
+import { IObfuscationResult } from "../../src/interfaces/IObfuscationResult";
+import { ISourceMapCorrector } from "../../src/interfaces/ISourceMapCorrector";
+
+import { TSourceMapMode } from "../../src/types/TSourceMapMode";
+
+import { SourceMapMode } from "../../src/enums/SourceMapMode";
+
+import { ObfuscationResult } from "../../src/ObfuscationResult";
+import { SourceMapCorrector } from "../../src/SourceMapCorrector";
+
+const assert: Chai.AssertStatic = require('chai').assert;
+
+/**
+ * @param obfuscatedCode
+ * @param sourceMap
+ * @param sourceMapUrl
+ * @param sourceMapMode
+ */
+function getCorrectedObfuscationResult (
+    obfuscatedCode: string,
+    sourceMap: string,
+    sourceMapUrl: string,
+    sourceMapMode: TSourceMapMode
+): IObfuscationResult {
+    let obfuscationResult: IObfuscationResult = new ObfuscationResult(obfuscatedCode, sourceMap),
+        sourceMapCorrector: ISourceMapCorrector = new SourceMapCorrector(
+            obfuscationResult,
+            sourceMapUrl,
+            sourceMapMode
+        );
+
+    return sourceMapCorrector.correct();
+}
+
+describe('SourceMapCorrector', () => {
+    describe('correct (): IObfuscationResult', () => {
+        let expectedObfuscationResult: IObfuscationResult,
+            obfuscatedCode: string = 'var test = 1;',
+            sourceMap: string = 'test';
+
+        it('should return untouched obfuscated code if source map does not exist', () => {
+            expectedObfuscationResult = getCorrectedObfuscationResult(obfuscatedCode, '', '', SourceMapMode.Separate);
+
+            assert.equal(expectedObfuscationResult.getObfuscatedCode(), obfuscatedCode);
+        });
+
+        describe('if source map is set and source map mode is `inline`', () => {
+            before (() => {
+                expectedObfuscationResult = getCorrectedObfuscationResult(
+                    obfuscatedCode,
+                    sourceMap,
+                    '',
+                    SourceMapMode.Inline
+                );
+            });
+
+            it('should add source map to obfuscated code as base64 encoded string', () => {
+                assert.match(expectedObfuscationResult.getObfuscatedCode(), /data:application\/json;base64/);
+            });
+
+            it('should clear original source map', () => {
+                assert.equal(expectedObfuscationResult.getSourceMap(), '');
+            });
+        });
+
+        it('should add source map import to obfuscated code if source map mode is `separate`', () => {
+            expectedObfuscationResult = getCorrectedObfuscationResult(
+                obfuscatedCode,
+                sourceMap,
+                'output.js.map',
+                SourceMapMode.Separate
+            );
+
+            assert.match(expectedObfuscationResult.getObfuscatedCode(), /sourceMappingURL=output\.js\.map/);
+        });
+
+        it('should not touch obfuscated code if source map mode is `separate` and `sourceMapUrl` is not set', () => {
+            expectedObfuscationResult = getCorrectedObfuscationResult(
+                obfuscatedCode,
+                sourceMap,
+                '',
+                SourceMapMode.Separate
+            );
+
+            assert.equal(expectedObfuscationResult.getObfuscatedCode(), obfuscatedCode);
+        });
+    });
+});