diff --git a/.jshintrc b/.jshintrc
new file mode 100644
index 0000000..3acb72b
--- /dev/null
+++ b/.jshintrc
@@ -0,0 +1,14 @@
+{
+    "curly": true,
+    "eqeqeq": true,
+    "immed": true,
+    "latedef": true,
+    "newcap": true,
+    "noarg": true,
+    "sub": true,
+    "undef": true,
+    "boss": true,
+    "eqnull": true,
+    "node": true,
+    "globals": {}
+}
\ No newline at end of file
diff --git a/Gruntfile.js b/Gruntfile.js
index c04c9bb..f166214 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,35 +1,26 @@
 module.exports = function(grunt) {
 
+  var config = {
+    files: [ "Gruntfile.js", "tasks/**/*.js", "test/**/*.js" ]
+  };
+
   // Project configuration.
   grunt.initConfig({
     nodeunit: {
       all: ["test/**/*.js"]
     },
     watch: {
-      files: "<config:lint.files>",
+      files: config.files,
       tasks: "default"
     },
     jshint: {
-      all: ["grunt.js", "tasks/**/*.js", "test/**/*.js"],
-      options: {
-        curly: true,
-        eqeqeq: true,
-        immed: true,
-        latedef: true,
-        newcap: true,
-        noarg: true,
-        sub: true,
-        undef: true,
-        boss: true,
-        eqnull: true,
-        node: true,
-        globals: {}
-      }
+      all: config.files
     }
   });
 
   grunt.loadNpmTasks("grunt-contrib-jshint");
   grunt.loadNpmTasks("grunt-contrib-nodeunit");
+  grunt.loadNpmTasks("grunt-contrib-watch");
 
   grunt.registerTask("default", ["jshint", "nodeunit"]);
 };
diff --git a/package.json b/package.json
index d6ae8b7..ebd47e0 100644
--- a/package.json
+++ b/package.json
@@ -1,39 +1,45 @@
 {
-  "name" : "grunt-remove-logging",
-  "description" : "Grunt task to remove console logging statements",
-  "version" : "0.2.0",
-  "homepage" : "",
-  "author" : {
-    "name" : "Eric Hynds",
-    "email" : "ehynds@gmail.com",
-    "url" : "http://erichynds.com"
+  "name": "grunt-remove-logging",
+  "description": "Grunt task to remove console logging statements",
+  "version": "0.2.0",
+  "homepage": "",
+  "author": {
+    "name": "Eric Hynds",
+    "email": "ehynds@gmail.com",
+    "url": "http://erichynds.com"
   },
   "contributors": {
     "name": "Thomas Welton",
     "email": "thomaswelton@me.com",
     "url": "https://github.com/thomaswelton"
   },
-  "repository" : {
-    "type" : "git",
-    "url" : "git://github.com/ehynds/grunt-remove-logging.git"
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/ehynds/grunt-remove-logging.git"
   },
-  "bugs" : {
-    "url" : "https://github.com/ehynds/grunt-remove-logging/issues"
+  "bugs": {
+    "url": "https://github.com/ehynds/grunt-remove-logging/issues"
   },
-  "main" : "grunt.js",
-  "bin" : "bin/grunt-remove-logging",
-  "engines" : {
-    "node" : "*"
+  "main": "grunt.js",
+  "bin": "bin/grunt-remove-logging",
+  "engines": {
+    "node": "*"
   },
-  "scripts" : {
-    "test" : "grunt test"
+  "scripts": {
+    "test": "grunt test"
   },
-  "devDependencies" : {
-    "grunt" : "~0.4.2",
+  "devDependencies": {
+    "grunt": "~0.4.2",
     "grunt-contrib-jshint": "~0.7.2",
-    "grunt-contrib-nodeunit": "~0.2.2"
+    "grunt-contrib-nodeunit": "~0.2.2",
+    "grunt-contrib-watch": "~0.5.3"
   },
-  "keywords" : [
-    "gruntplugin", "console", "log", "debugging", "remove", "statements"
+  "keywords": [
+    "gruntplugin",
+    "console",
+    "log",
+    "debugging",
+    "remove",
+    "statements"
   ]
 }
diff --git a/test/test.js b/test/test.js
index 7810891..1258edb 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1,226 +1,163 @@
-"use strict";
-
-var grunt = require("grunt");
-var task = require("../tasks/lib/removelogging").init(grunt);
-var async = grunt.util.async;
-
-// each item in the array is a test.
-// the convention is:
-// [
-//    string to test,
-//    options to pass to the remove_logging helper
-//    expected result
-// ]
-var tests = [
-  [
-    'console.log(foo); bar; console.warn("bar")',
-    {},
-    " bar; "
-  ],
-  [
-    'console.dir({ complex: "objects" }, [ "array" ])',
-    {},
-    ""
-  ],
-  [
-    'console.log("foo (inner parens)")',
-    {},
-    ""
-  ],
-  [
-    'console.log("foo (inner parens)");foo;console.warn("(lol)")',
-    {},
-    "foo;"
-  ],
-  [
-    ';if(true){functionCall(function namedFun(){console.log("test", args);})};for(var x=1;x<foo.length;x++){fun(){console.warn("foo")}};',
-    {},
-    ';if(true){functionCall(function namedFun(){})};for(var x=1;x<foo.length;x++){fun(){}};',
-  ],
-
-  // remove logging directive tests
-  
-  [
-    'console.log("foo");/*RemoveLogging:skip*/',
-    {},
-    'console.log("foo");/*RemoveLogging:skip*/',
-  ],
-  [
-    'console.log("foo")/*RemoveLogging:skip*/',
-    {},
-    'console.log("foo")/*RemoveLogging:skip*/',
-  ],
-  [
-    'bar;console.log("foo")/*RemoveLogging:skip*/',
-    {},
-    'bar;console.log("foo")/*RemoveLogging:skip*/',
-  ],
-  [
-    'bar;console.log("foo")/*RemoveLogging:skip*/bar;',
-    {},
-    'bar;console.log("foo")/*RemoveLogging:skip*/bar;',
-  ],
-  [
-    'bar;console.log("foo")/*RemoveLogging:skip*/;console.log("bar");',
-    {},
-    'bar;console.log("foo")/*RemoveLogging:skip*/;',
-  ],
-  [
-    'bar;console.log("foo")/*RemoveLogging:skip*/;',
-    {},
-    'bar;console.log("foo")/*RemoveLogging:skip*/;',
-  ],
-  [
-    'bar;console.log("foo") /*RemoveLogging:skip*/;foo;console.log("bar");',
-    {},
-    'bar;console.log("foo") /*RemoveLogging:skip*/;foo;',
-  ],
-  [
-    'bar;console.log("foo") /* RemoveLogging:skip */;foo;console.log("bar");',
-    {},
-    'bar;console.log("foo") /* RemoveLogging:skip */;foo;',
-  ],
-  [
-    'console.log("foo");/*RemoveLogging:skip*/console.log("bar");',
-    {},
-    'console.log("foo");/*RemoveLogging:skip*/',
-  ],
-  [
-    'bar;console.log("foo")/*RemoveLogging:skip*/;console.log("bar");function(){console.warn("baz");}',
-    {},
-    'bar;console.log("foo")/*RemoveLogging:skip*/;function(){}',
-  ],
-  [
-    'bar;console.log("foo")/*RemoveLogging:skip*/;console.log("bar");function(){console.warn("baz");/*RemoveLogging:skip*/}',
-    {},
-    'bar;console.log("foo")/*RemoveLogging:skip*/;function(){console.warn("baz");/*RemoveLogging:skip*/}',
-  ],
-
-  // namespace option tests
-
-  [
-    'logger.log("foo");that.log("foo");this.log("foo")',
-    { namespace: ['logger', 'that', 'this'] },
-    '',
-  ],
-
-  // methods option tests
-
-  [
-    'console.log("foo");console.error("bar");console.warn("baz");',
-    { methods: [ 'log', 'warn' ]},
-    'console.error("bar");',
-  ],
-
-  // replaceWidth option tests
-
-  [
-    'console.log(foo);',
-    { replaceWith: "" },
-    ""
-  ],
-  [
-    'console.log(foo)',
-    { replaceWith: "0;" },
-    "0;"
-  ],
-  [
-    'console.warn("foo")',
-    { replaceWith: "" },
-    ""
-  ],
-  [
-    ' console.group("foo")',
-    { replaceWith: "" },
-    " "
-  ],
-  [
-    'console.groupEnd(\'foo\')',
-    { replaceWith: "" },
-    ""
-  ],
-  [
-    'console.error()',
-    { replaceWith: "" },
-    ""
-  ],
-  [
-    'console.log(arg1, arg2, "foo", arg4)',
-    { replaceWith: "" },
-    ""
-  ],
-  [
-    'console.warn(foo)',
-    { replaceWith: "" },
-    ""
-  ],
-  [
-    'pre console.warn(foo); post',
-    { replaceWith: "" },
-    "pre  post"
-  ],
-  [
-    'pre console.warn(foo) post',
-    { replaceWith: "" },
-    "pre post"
-  ],
-  [
-    'pre console.log(foo + bar) post',
-    { replaceWith: "" },
-    "pre post"
-  ],
-  [
-    'console.dir("Testing " + foo, bar);foo;',
-    { replaceWith: "bar;" },
-    "bar;foo;"
-  ],
-  [
-    'console && console.log("hi")',
-    { replaceWith: "0;" },
-    "console && 0;"
-  ],
-  [
-    'console.log ("foo");',
-    { replaceWith: "" },
-    ""
-  ],
-  [
-    'pre;console.log    ("foo");post;',
-    { replaceWith: "" },
-    "pre;post;"
-  ],
-  [
-    'console.log ( "foo" );post',
-    { replaceWith: "" },
-    "post"
-  ],
-
-  // Issue #14 - space between ) and ;
-  [
-    'console.log("foo") ;',
-    { replaceWith: "" },
-    ""
-  ],
-  [
-    'pre;console.log("foo") ;post;',
-    { replaceWith: "" },
-    "pre;post;"
-  ]
-];
-
-exports.tests = {
-  setUp: function(done) {
-    done();
-  },
-
-  remove_logging: function(test) {
-    test.expect(tests.length);
-
-    tests.forEach(function(t) {
+(function(require) {
+
+  "use strict";
+
+  var grunt = require("grunt");
+  var util = require("util");
+  var task = require("../tasks/lib/removelogging").init(grunt);
+  var async = grunt.util.async;
+
+  function formatExpected(formatter, expected) {
+    var args = [ formatter ];
+    var numParams = (formatter.match(/%(s|d|j)/g) || []).length;
+
+    for (var i = 0; i < numParams; i++) {
+      args.push(expected);
+    }
+
+    return util.format.apply(global, args);
+  }
+
+  function iterateTests(arr, test) {
+    arr.forEach(function(t) {
       var result = task(t[0], t[1]);
       test.equal(result.src, t[2]);
     });
+  }
+
+  ////////////////////////////////////////////////////////////////////////////////////////
+  ///
+  ///   Test Templates
+  ///   
+  ///   Each of these should have 2 values.
+  ///   The first is the input to test; the second
+  ///   is the expected output.
+  ///     
+  ///     [ (str)INPUT_TO_TEST, (str)EXPECTED_OUTPUT ]
+  ///     
+  ///   Note: You can use %s for use with the replaceWith option.
+  ///   
+  ///
+  ////////////////////////////////////////////////////////////////////////////////////////
 
-    test.done();
+  var skipRemovalTests = [
+    ['console.log("foo")/*RemoveLogging:skip*/', 'console.log("foo")/*RemoveLogging:skip*/'],
+    ['console.log("foo");/*RemoveLogging:skip*/', 'console.log("foo");/*RemoveLogging:skip*/'],
+    ['bar;console.log("foo")/*RemoveLogging:skip*/', 'bar;console.log("foo")/*RemoveLogging:skip*/'],
+    ['bar;console.log("foo")/*RemoveLogging:skip*/;', 'bar;console.log("foo")/*RemoveLogging:skip*/;'],
+    ['bar;console.log("foo")/*RemoveLogging:skip*/bar;', 'bar;console.log("foo")/*RemoveLogging:skip*/bar;'],
+    ['console.log("foo");/*RemoveLogging:skip*/console.log("bar");', 'console.log("foo");/*RemoveLogging:skip*/'],
+    ['bar;console.log("foo")/*RemoveLogging:skip*/;console.log("bar");', 'bar;console.log("foo")/*RemoveLogging:skip*/;%s'],
+    ['bar;console.log("foo") /*RemoveLogging:skip*/;foo;console.log("bar");', 'bar;console.log("foo") /*RemoveLogging:skip*/;foo;'],
+    ['bar;console.log("foo") /* RemoveLogging:skip */;foo;console.log("bar");', 'bar;console.log("foo") /* RemoveLogging:skip */;foo;'],
+    ['bar;console.log("foo")/*RemoveLogging:skip*/;console.log("bar");function(){console.warn("baz");}', 'bar;console.log("foo")/*RemoveLogging:skip*/;function(){}'],
+    ['bar;console.log("foo")/*RemoveLogging:skip*/;console.log("bar");function(){console.warn("baz");/*RemoveLogging:skip*/}', 'bar;console.log("foo")/*RemoveLogging:skip*/;function(){console.warn("baz");/*RemoveLogging:skip*/}'],
+  ];
+
+  var namespaceTests = [
+    ['console.log("foo");logger.log("foo");that.log("foo");this.log("foo")', 'console.log("foo");']
+  ];
+
+  var methodTests = [
+    ['console.log("foo");console.error("bar");console.warn("baz");', '%sconsole.error("bar");%s']
+  ];
+
+  var generalTests = [
+    ['console.error()', '%s'],
+    ['console.log(foo)', '%s'],
+    ['console.warn(foo)', '%s'],
+    ['console.log(foo);', '%s'],
+    ['console.warn("foo")', '%s'],
+    ['console.log("foo") ;', '%s'], // #14 - space between ) and ;
+    ['console.log ("foo");', '%s'],
+    [' console.group("foo")', ' %s'],
+    ['console.groupEnd(\'foo\')', '%s'],
+    ['pre console.warn(foo) post', 'pre %spost'],
+    ['console.log ( "foo" );post', '%spost'],
+    ['pre console.warn(foo); post', 'pre %s post'],
+    ['console && console.log("hi")', 'console && %s'],
+    ['pre;console.log("foo") ;post;', 'pre;%spost;'], // #14 - space between ) and ;
+    ['pre console.log(foo + bar) post', 'pre %spost'],
+    ['pre;console.log    ("foo");post;', 'pre;%spost;'],
+    ['console.log("foo (inner parens)")', '%s'],
+    ['console.log(arg1, arg2, "foo", arg4)', '%s'],
+    ['console.dir("Testing " + foo, bar);foo;', '%sfoo;'],
+    ['console.log(foo); bar; console.warn("bar")', '%s bar; %s'],
+    ['console.dir({ complex: "objects" }, [ "array" ])', '%s'],
+    ['console.log("foo (inner parens)");foo;console.warn("(lol)")', '%sfoo;%s'],
+    [';if(true){functionCall(function namedFun(){console.log("test", args);})};for(var x=1;x<foo.length;x++){fun(){console.warn("foo")}};', ';if(true){functionCall(function namedFun(){%s})};for(var x=1;x<foo.length;x++){fun(){%s}};']
+  ];
+
+  /**
+   * Outputs an array of test configurations
+   * @param  {array}  tests      An array of tests templates
+   * @param  {object} options    The options to apply
+   * @return {array}             The array of tests configurations
+   */
+  function generateTestSet(tests, options) {
+    var expected = (options && options.replaceWith) || ''; // default is ""
+    return tests.map(function(test) {
+      return [
+        test[0], // string to test
+        options,
+        formatExpected(test[1], expected) // expected output
+      ];
+    });
   }
-};
+
+  exports.remove_logging = {
+    setUp: function(done) {
+      done();
+    },
+
+    'mapper-function': function(test) {
+      test.expect(1);
+
+      test.equal(generateTestSet(generalTests).length, generalTests.length);
+
+      test.done();
+    },
+
+    general: function(test) {
+      test.expect(generalTests.length);
+
+      iterateTests(generateTestSet(generalTests, {}), test);
+
+      test.done();
+    },
+
+    'skip-removal': function(test) {
+      test.expect(skipRemovalTests.length);
+
+      iterateTests(generateTestSet(skipRemovalTests, {}), test);
+
+      test.done();
+    },
+
+    'namespace': function(test) {
+      test.expect(namespaceTests.length);
+
+      iterateTests(generateTestSet(namespaceTests, { namespace: ['logger', 'that', 'this'] }), test);
+
+      test.done();
+    },
+
+    'methods': function(test) {
+      test.expect(methodTests.length);
+
+      iterateTests(generateTestSet(methodTests, { methods: [ 'log', 'warn' ]}), test);
+
+      test.done();
+    },
+
+    'replaceWith': function(test) {
+      test.expect(generalTests.length * 2);
+
+      iterateTests(generateTestSet(generalTests, { replaceWith: '' }), test);
+      iterateTests(generateTestSet(generalTests, { replaceWith: '0;' }), test);
+
+      test.done();
+    }
+  };
+
+})(require);
\ No newline at end of file