diff --git a/Gruntfile.js b/Gruntfile.js
index dc052eb..088718b 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -7,16 +7,11 @@ module.exports = function(grunt) {
     grunt.loadNpmTasks("grunt-contrib-jshint");
     grunt.loadNpmTasks("grunt-contrib-uglify");
     grunt.loadNpmTasks("grunt-contrib-clean");
-    grunt.loadNpmTasks("grunt-simple-mocha");
     grunt.loadNpmTasks("grunt-contrib-watch");
     
     grunt.initConfig({
-        simplemocha: {
-            options: { reporter: "dot" },
-            target: "test/*.js"
-        },
         jshint: {
-            all: ["src/core.js", "src/**/*.js"],
+            all: ["src/core.js", "src/modules/*.js", "src/objects/*.js"],
             options: {
                 curly   : true,
                 eqeqeq  : true,
@@ -76,7 +71,6 @@ module.exports = function(grunt) {
 
     grunt.registerTask("gh-pages", ["clean", "uglify", "doc"]);
 
-    grunt.registerTask("default", ["jshint", "simplemocha"]);
-    grunt.registerTask("test", ["simplemocha"]);
+    grunt.registerTask("default", ["jshint"]);
     grunt.registerTask("all", ["default", "build"]);
 };
diff --git a/package.json b/package.json
index 35f4ccd..6ecfcce 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,6 @@
     "grunt-contrib-uglify": "~0.1.1",
     "grunt-contrib-jshint": "~0.2.0",
     "grunt-contrib-clean": "~0.4.0",
-    "grunt-contrib-watch": "~0.2.0",
-    "grunt-simple-mocha": "~0.3.0"
+    "grunt-contrib-watch": "~0.2.0"
   }
 }
diff --git a/src/objects/scope.js b/src/objects/scope.js
index 6195d5e..f2d15c7 100644
--- a/src/objects/scope.js
+++ b/src/objects/scope.js
@@ -69,6 +69,11 @@
             get: function() {
                 return this._.interval;
             }
+        },
+        buffer: {
+            get: function() {
+                return this._.buffer;
+            }
         }
     });
 
diff --git a/timbre.dev.js b/timbre.dev.js
index 3d313c5..c8e2773 100644
--- a/timbre.dev.js
+++ b/timbre.dev.js
@@ -10623,6 +10623,11 @@
             get: function() {
                 return this._.interval;
             }
+        },
+        buffer: {
+            get: function() {
+                return this._.buffer;
+            }
         }
     });