diff --git a/makefile b/makefile
index a2a5d9b..18c9729 100644
--- a/makefile
+++ b/makefile
@@ -1,10 +1,11 @@
 build:
 	node ./build/index.js
 
-generator:
-	npm install
-	git init
-	git add -A
-	git remote add origin https://thisandagain@github.com/thisandagain/sentiment
+test:
+	./node_modules/.bin/tap test/governance/*.js
+	./node_modules/.bin/tap test/unit/*.js
 
-.PHONY: build generator
\ No newline at end of file
+benchmark:
+	node test/benchmark/index.js
+
+.PHONY: build test benchmark
\ No newline at end of file
diff --git a/test/benchmark.js b/test/benchmark/index.js
similarity index 96%
rename from test/benchmark.js
rename to test/benchmark/index.js
index 83fcb7f..570bb56 100644
--- a/test/benchmark.js
+++ b/test/benchmark/index.js
@@ -1,5 +1,5 @@
 /**
- * Test suite
+ * Naïve benchmark suite.
  *
  * @package sentiment
  * @author Andrew Sliwinski <andrew@diy.org>
@@ -11,7 +11,7 @@
 var async   = require('async'),
     test    = require('tap').test,
 
-    t1      = require(__dirname + '/../lib/index.js'),
+    t1      = require(__dirname + '/../../lib/index.js'),
     t2      = require('Sentimental');
 
 /**
diff --git a/test/debt.js b/test/debt.js
deleted file mode 100644
index 70f9683..0000000
--- a/test/debt.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * Unit test suite.
- *
- * @package generator
- * @author Andrew Sliwinski <andrew@diy.org>
- */
-
-/**
- * Dependencies
- */
-var async   = require('async'),
-    test    = require('tap').test,
-    bux     = require('codebux');
-
-/**
- * Suite
- */
-async.auto({
-
-    debt:   function (callback) {
-        bux(__dirname + '/../lib', callback);
-    },
-
-    test:       ['debt', function (callback, obj) {
-        test('Debt', function (t) {
-            t.type(obj.debt, 'number', 'Results should be a number');
-            t.ok(obj.debt > 50, 'Total should be greater than 50');
-            t.end();
-        });
-
-        callback();
-    }]
-
-}, function (err, obj) {
-    test('Catch errors', function (t) {
-        t.equal(err, null, 'Errors should be null');
-        t.end();
-    });
-});
\ No newline at end of file
diff --git a/test/governance/lint.js b/test/governance/lint.js
new file mode 100644
index 0000000..22b347e
--- /dev/null
+++ b/test/governance/lint.js
@@ -0,0 +1,5 @@
+var fs      = require('fs'),
+    hint    = require('hint-hint');
+
+var config  = fs.readFileSync(__dirname + '/../../.jshintrc');
+hint(__dirname + '/../../lib/*.js', JSON.parse(config));
\ No newline at end of file
diff --git a/test/index.js b/test/index.js
deleted file mode 100644
index 335d93d..0000000
--- a/test/index.js
+++ /dev/null
@@ -1,129 +0,0 @@
-/**
- * Test suite
- *
- * @package sentiment
- * @author Andrew Sliwinski <andrew@diy.org>
- */
-
-/**
- * Dependencies
- */
-var async   = require('async'),
-    test    = require('tap').test,
-
-    target  = require(__dirname + '/../lib/index.js');
-
-/**
- * Suite
- */
-async.auto({
-
-    negative:  function (callback) {
-        target('Hey you worthless scumbag', callback);
-    },
-
-    positive:  function (callback) {
-        target('This is so cool', callback);
-    },
-
-    n2:         function (callback) {
-        target('Cats are stupid.', callback);
-    },
-
-    p2:         function (callback) {
-        target('Cats are totally amazing!', callback);
-    },
-
-    bb:         function (callback) {
-        var load = [
-            'In America I doubt it could sustain itself without descending into identity politics and ego.',
-            'You are deluding yourself if you think that identity politics and ego are purely American.',
-            'Posting a show that cost $5 and was for charity is pretty low and I thought better of BoingBoing. A clip or two would be great, but just pirating something like this is lame.',
-            'I paid the $5, only got to see the last 30 minutes of the event, and cant download it today, because when I log in, it asks for my credit card information. So the only way it looks like Ill get to watch it is through a pirated copy.',
-            'Thanks for posting it, Cory! What Ive seen of the debate was awesome, but from a technical and customer service standpoint, it was a catastrophe.',
-            'Bill OReillys total inability to shut up while anyone else is speaking makes me either wonder how he ever got his job, or think that you can be inordinately successful just by bullying.'
-        ];
-
-        async.map(load, function (obj, callback) {
-            target(obj, callback);
-        }, callback);
-    },
-
-    fuzz:       function (callback) {
-        function createRandomWord(length) {
-            var consonants = 'bcdfghjklmnpqrstvwxyz',
-                vowels = 'aeiou',
-                rand = function(limit) {
-                    return Math.floor(Math.random()*limit);
-                },
-                i, word='', length = parseInt(length,10),
-                consonants = consonants.split(''),
-                vowels = vowels.split('');
-            for (i=0;i<length/2;i++) {
-                var randConsonant = consonants[rand(consonants.length)],
-                    randVowel = vowels[rand(vowels.length)];
-                word += (i===0) ? randConsonant.toUpperCase() : randConsonant;
-                word += i*2<length-1 ? randVowel : '';
-            }
-            return word;
-        }
-
-        var lines = [];
-        for (var i = 0; i < 100; i++) {
-            var line = '';
-            for (var x = 0; x < Math.round(Math.random() * 20); x++) {
-                line = line + createRandomWord(Math.round(Math.random() * 12)) + ' ';
-            }
-            lines.push(line);
-        }
-
-        async.map(lines, function (obj, callback) {
-            target(obj, callback);
-        }, callback);
-    },
-
-    test:   ['negative', 'positive', 'n2', 'p2', 'bb', 'fuzz', function (callback, obj) {
-        test('Component definition', function (t) {
-            t.type(target, 'function', 'Component should be a function');
-            t.end();
-        });
-
-        test('Negative test case', function (t) {
-            t.type(obj.negative, 'object', 'Results should be an object');
-            t.equal(obj.negative.score, -6, 'Expected score');
-            t.equal(obj.negative.comparative, -1.5, 'Expected comparative score');
-            t.equal(obj.negative.tokens.length, 4, 'Expected tokens length');
-            t.equal(obj.negative.words.length, 2, 'Expected match length');
-            t.end();
-        });
-
-        test('Positive test case', function (t) {
-            t.type(obj.positive, 'object', 'Results should be an object');
-            t.equal(obj.positive.score, 1, 'Expected score');
-            t.equal(obj.positive.comparative, 0.25, 'Expected comparative score');
-            t.equal(obj.positive.tokens.length, 4, 'Expected tokens length');
-            t.equal(obj.positive.words.length, 1, 'Expected match length');
-            t.end();
-        });
-
-        test('BB.net test', function (t) {
-            t.type(obj.bb, 'object', 'Results should be an object');
-            t.equal(obj.bb.length, 6, 'Expected score');
-            t.end();
-        });
-
-        test('Fuzz test', function (t) {
-            t.type(obj.fuzz, 'object', 'Results should be an object');
-            t.equal(obj.fuzz.length, 100, 'Expected score');
-            t.end();
-        });
-
-        callback();
-    }]
-
-}, function (err, obj) {
-    test('Catch errors', function (t) {
-        t.equal(err, null, 'Errors should be null');
-        t.end();
-    });
-});
diff --git a/test/inject.js b/test/inject.js
deleted file mode 100644
index bc9b864..0000000
--- a/test/inject.js
+++ /dev/null
@@ -1,105 +0,0 @@
-/**
- * Test suite
- *
- * @package sentiment
- * @author Andrew Sliwinski <andrew@diy.org>
- */
-
-/**
- * Dependencies
- */
-var async   = require('async'),
-    test    = require('tap').test,
-
-    target  = require(__dirname + '/../lib/index.js');
-
-/**
- * Suite
- */
-async.auto({
-
-    negative:  function (callback) {
-        target('Hey you worthless scumbag', {
-            worthless: -5,
-            scumbag: -5
-        }, callback);
-    },
-
-    positive:  function (callback) {
-        target('This is so cool', {
-            cool: 5
-        }, callback);
-    },
-
-    blacklist: function (callback) {
-        target('I really like your badword cat!', {
-            badword: -100
-        }, callback);
-    },
-
-    mix:        function (callback) {
-        target('I really like your badword cat! It is super cool and amazing.', {
-            badword: -100
-        }, callback);
-    },
-
-    p1:  function (callback) {
-        target('Cats are totally amazing!', {
-            'cats': 5,
-            'amazing': 2  
-        }, callback);
-    },
-
-    test:   ['negative', 'positive', 'blacklist', 'mix', 'p1', function (callback, obj) {
-        console.dir(obj);
-
-        test('Component definition', function (t) {
-            t.type(target, 'function', 'Component should be a function');
-            t.end();
-        });
-
-        test('negative', function (t) {
-            t.type(obj.negative, 'object', 'Results should be an object');
-            t.equal(obj.negative.score, -10, 'Expected score');
-            t.equal(obj.negative.comparative, -2.5, 'Expected comparative score');
-            t.equal(obj.negative.tokens.length, 4, 'Expected tokens length');
-            t.equal(obj.negative.words.length, 2, 'Expected match length');
-            t.end();
-        });
-
-        test('positive', function (t) {
-            t.type(obj.positive, 'object', 'Results should be an object');
-            t.equal(obj.positive.score, 5, 'Expected score');
-            t.equal(obj.positive.comparative, 1.25, 'Expected comparative score');
-            t.equal(obj.positive.tokens.length, 4, 'Expected tokens length');
-            t.equal(obj.positive.words.length, 1, 'Expected match length');
-            t.end();
-        });
-
-        test('blacklist', function (t) {
-            t.type(obj.blacklist, 'object', 'Results should be an object');
-            t.equal(obj.blacklist.score, -98, 'Expected score');
-            t.equal(obj.blacklist.comparative, -16.333333333333332, 'Expected comparative score');
-            t.equal(obj.blacklist.tokens.length, 6, 'Expected tokens length');
-            t.equal(obj.blacklist.words.length, 2, 'Expected match length');
-            t.end();
-        });
-
-        test('mix', function (t) {
-            t.type(obj.mix, 'object', 'Results should be an object');
-            t.equal(obj.mix.score, -86, 'Expected score');
-            t.equal(obj.mix.comparative, -7.166666666666667, 'Expected comparative score');
-            t.equal(obj.mix.tokens.length, 12, 'Expected tokens length');
-            t.equal(obj.mix.words.length, 5, 'Expected match length');
-            t.end();
-        });
-
-        callback();
-    }]
-
-}, function (err, obj) {
-    test('Catch errors', function (t) {
-        t.equal(err, null, 'Errors should be null');
-        t.end();
-    });
-});
diff --git a/test/unit/default_comments.js b/test/unit/default_comments.js
new file mode 100644
index 0000000..9f7b974
--- /dev/null
+++ b/test/unit/default_comments.js
@@ -0,0 +1,32 @@
+var async       = require('async'),
+    test        = require('tap').test,
+    sentiment   = require(__dirname + '/../../lib/index');
+
+var load = [
+    'In America I doubt it could sustain itself without descending into identity politics and ego.',
+    'You are deluding yourself if you think that identity politics and ego are purely American.',
+    'Posting a show that cost $5 and was for charity is pretty low and I thought better of BoingBoing. A clip or two would be great, but just pirating something like this is lame.',
+    'I paid the $5, only got to see the last 30 minutes of the event, and cant download it today, because when I log in, it asks for my credit card information. So the only way it looks like Ill get to watch it is through a pirated copy.',
+    'Thanks for posting it, Cory! What Ive seen of the debate was awesome, but from a technical and customer service standpoint, it was a catastrophe.',
+    'Bill OReillys total inability to shut up while anyone else is speaking makes me either wonder how he ever got his job, or think that you can be inordinately successful just by bullying.'
+];
+
+async.map(load, function (obj, callback) {
+    sentiment(obj, callback);
+}, function (err, obj) {
+    console.dir(err);
+    console.dir(obj);
+
+    test('unit', function (t) {
+        t.equal(err, null, 'error object should be null');
+        t.type(obj, 'object', 'results should be an object');
+        t.equal(obj.length, 6, 'results should be of expected length');
+
+        t.equal(obj[0].score, -1, 'Expected score');
+        t.equal(obj[0].comparative, -0.06666666666666667, 'Expected comparative score');
+        t.equal(obj[0].tokens.length, 15, 'Expected tokens length');
+        t.equal(obj[0].words.length, 1, 'Expected match length');
+        
+        t.end();
+    });
+});
\ No newline at end of file
diff --git a/test/unit/default_fuzz.js b/test/unit/default_fuzz.js
new file mode 100644
index 0000000..72d46ef
--- /dev/null
+++ b/test/unit/default_fuzz.js
@@ -0,0 +1,45 @@
+var async       = require('async'),
+    test        = require('tap').test,
+    sentiment   = require(__dirname + '/../../lib/index');
+
+function createRandomWord(length) {
+    var consonants = 'bcdfghjklmnpqrstvwxyz!@#$%^&*()_+":;\'?><~`',
+        vowels = 'aeiou',
+        rand = function(limit) {
+            return Math.floor(Math.random()*limit);
+        },
+        i, word='', length = parseInt(length,10),
+        consonants = consonants.split(''),
+        vowels = vowels.split('');
+    for (i=0;i<length/2;i++) {
+        var randConsonant = consonants[rand(consonants.length)],
+            randVowel = vowels[rand(vowels.length)];
+        word += (i===0) ? randConsonant.toUpperCase() : randConsonant;
+        word += i*2<length-1 ? randVowel : '';
+    }
+    return word;
+}
+
+var lines = [];
+for (var i = 0; i < 100; i++) {
+    var line = '';
+    for (var x = 0; x < Math.round(Math.random() * 20); x++) {
+        line = line + createRandomWord(Math.round(Math.random() * 12)) + ' ';
+    }
+    lines.push(line);
+}
+
+async.map(lines, function (obj, callback) {
+    sentiment(obj, callback);
+}, function (err, obj) {
+    console.dir(err);
+    console.dir(obj);
+
+    test('unit', function (t) {
+        t.equal(err, null, 'error object should be null');
+        t.type(obj, 'object', 'results should be an object');
+        t.equal(obj.length, 100, 'results should be of expected length');
+        
+        t.end();
+    });
+});
\ No newline at end of file
diff --git a/test/unit/default_negative.js b/test/unit/default_negative.js
new file mode 100644
index 0000000..abba0fb
--- /dev/null
+++ b/test/unit/default_negative.js
@@ -0,0 +1,18 @@
+var test        = require('tap').test,
+    sentiment   = require(__dirname + '/../../lib/index');
+
+sentiment('Hey you worthless scumbag', function (err, obj) {
+    console.dir(err);
+    console.dir(obj);
+
+    test('unit', function (t) {
+        t.equal(err, null, 'error object should be null');
+        t.type(obj, 'object', 'results should be an object');
+        t.equal(obj.score, -6, 'expected score');
+        t.equal(obj.comparative, -1.5, 'expected comparative score');
+        t.equal(obj.tokens.length, 4, 'expected tokens length');
+        t.equal(obj.words.length, 2, 'expected match length');
+
+        t.end();
+    });
+});
\ No newline at end of file
diff --git a/test/unit/default_positive.js b/test/unit/default_positive.js
new file mode 100644
index 0000000..9bb730b
--- /dev/null
+++ b/test/unit/default_positive.js
@@ -0,0 +1,17 @@
+var test        = require('tap').test,
+    sentiment   = require(__dirname + '/../../lib/index');
+
+sentiment('This is so cool', function (err, obj) {
+    console.dir(err);
+    console.dir(obj);
+
+    test('unit', function (t) {
+        t.equal(err, null, 'error object should be null');
+        t.type(obj, 'object', 'results should be an object');
+        t.equal(obj.score, 1, 'expected score');
+        t.equal(obj.comparative, 0.25, 'expected comparative score');
+        t.equal(obj.tokens.length, 4, 'expected tokens length');
+        t.equal(obj.words.length, 1, 'expected match length');
+        t.end();
+    });
+});
\ No newline at end of file
diff --git a/test/unit/inject_blacklist.js b/test/unit/inject_blacklist.js
new file mode 100644
index 0000000..96de82b
--- /dev/null
+++ b/test/unit/inject_blacklist.js
@@ -0,0 +1,20 @@
+var test        = require('tap').test,
+    sentiment   = require(__dirname + '/../../lib/index');
+
+sentiment('I really like your badword cat! It is super cool and amazing.', {
+    badword: -100
+}, function (err, obj) {
+    console.dir(err);
+    console.dir(obj);
+
+    test('unit', function (t) {
+        t.equal(err, null, 'error object should be null');
+        t.type(obj, 'object', 'results should be an object');
+        t.equal(obj.score, -90, 'expected score');
+        t.equal(obj.comparative, -7.5, 'expected comparative score');
+        t.equal(obj.tokens.length, 12, 'expected tokens length');
+        t.equal(obj.words.length, 5, 'expected match length');
+
+        t.end();
+    });
+});
\ No newline at end of file
diff --git a/test/unit/inject_negative.js b/test/unit/inject_negative.js
new file mode 100644
index 0000000..728c86d
--- /dev/null
+++ b/test/unit/inject_negative.js
@@ -0,0 +1,21 @@
+var test        = require('tap').test,
+    sentiment   = require(__dirname + '/../../lib/index');
+
+sentiment('Hey you worthless scumbag', {
+    worthless: -5,
+    scumbag: -5
+}, function (err, obj) {
+    console.dir(err);
+    console.dir(obj);
+
+    test('unit', function (t) {
+        t.equal(err, null, 'error object should be null');
+        t.type(obj, 'object', 'results should be an object');
+        t.equal(obj.score, -10, 'expected score');
+        t.equal(obj.comparative, -2.5, 'expected comparative score');
+        t.equal(obj.tokens.length, 4, 'expected tokens length');
+        t.equal(obj.words.length, 2, 'expected match length');
+
+        t.end();
+    });
+});
\ No newline at end of file
diff --git a/test/unit/inject_positive.js b/test/unit/inject_positive.js
new file mode 100644
index 0000000..4d5e0b3
--- /dev/null
+++ b/test/unit/inject_positive.js
@@ -0,0 +1,20 @@
+var test        = require('tap').test,
+    sentiment   = require(__dirname + '/../../lib/index');
+
+sentiment('This is so cool', {
+    cool: 5
+}, function (err, obj) {
+    console.dir(err);
+    console.dir(obj);
+
+    test('unit', function (t) {
+        t.equal(err, null, 'error object should be null');
+        t.type(obj, 'object', 'results should be an object');
+        t.equal(obj.score, 5, 'expected score');
+        t.equal(obj.comparative, 1.25, 'expected comparative score');
+        t.equal(obj.tokens.length, 4, 'expected tokens length');
+        t.equal(obj.words.length, 1, 'expected match length');
+
+        t.end();
+    });
+});
\ No newline at end of file
diff --git a/test/unit/interface.js b/test/unit/interface.js
new file mode 100644
index 0000000..9e0fcdf
--- /dev/null
+++ b/test/unit/interface.js
@@ -0,0 +1,7 @@
+var test        = require('tap').test,
+    sentiment   = require(__dirname + '/../../lib/index');
+
+test('unit', function (t) {
+    t.type(sentiment, 'function', 'module should be a function');
+    t.end();
+});
\ No newline at end of file