diff --git a/test/__line.js b/test/__line.js
index 5f3f83b..2d0056f 100644
--- a/test/__line.js
+++ b/test/__line.js
@@ -3,10 +3,15 @@
  * Module dependencies.
  */
 
-require('../');
+var stack = require('../');
 
-describe('__line', function(){
+var call = stack()[1]
+    , file = call.getFileName()
+    , lineno = call.getLineNumber()
+
+describe('__line', function(site){
   it('should return the current lineno', function(){
-    __line.should.equal(10);
+    var nextline = 15;
+    lineno.should.equal.nextline;
   })
-})
\ No newline at end of file
+})
diff --git a/test/__stack.js b/test/__stack.js
index fb3fa5d..c47394f 100644
--- a/test/__stack.js
+++ b/test/__stack.js
@@ -3,7 +3,7 @@
  * Module dependencies.
  */
 
-require('../');
+var stack = require('../');
 
 describe('__stack', function(){
   it('should return an array of CallSites', function(){
@@ -18,14 +18,14 @@ describe('__stack', function(){
     }
 
     function baz() {
-      __stack[0].fun.should.equal(baz);
-      __stack[1].fun.should.equal(bar);
-      __stack[2].fun.should.equal(foo);
+      stack()[0].getFunctionName().should.deepEqual("baz");
+      stack()[1].getFunctionName().should.deepEqual("bar");
+      stack()[2].getFunctionName().should.deepEqual("foo");
     }
   })
 
   it('should restore stack preparation', function(){
-    __stack;
-    new Error().stack.should.be.a('string');
+    var __stack = stack();
+    new Error().stack.should.be.a.String();
   })
-})
\ No newline at end of file
+})