diff --git a/‎.gitignore‎
Lines changed: 5 additions & 3 deletions b/‎.gitignore‎
Lines changed: 5 additions & 3 deletions
diff --git a/‎package.json‎
Lines changed: 0 additions & 1 deletion b/‎package.json‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎test/nodegit.js‎
Lines changed: 27 additions & 32 deletions b/‎test/nodegit.js‎
Lines changed: 27 additions & 32 deletions
diff --git a/‎test/tree.js‎
Lines changed: 3 additions & 2 deletions b/‎test/tree.js‎
Lines changed: 3 additions & 2 deletions
@@ -1,7 +1,9 @@
 /build/*
 !/build/codegen/
-/node_modules/
-/vendor/libgit2/
+
 /doc/*
 !/doc/Theme.css
-/test/.reposCache
+
+/node_modules/
+/vendor/libgit2/
+/test/repos/
@@ -45,7 +45,6 @@
     "nodeunit": "~0.8.6",
     "rimraf": "~2.2.6",
     "ejs": "~1.0.0",
-    "ncp": "~0.5.0",
     "async": "~0.2.10"
   },
   "scripts": {
 
@@ -1,45 +1,40 @@
 var fs = require('fs');
 var rimraf = require('rimraf');
-var ncp = require('ncp').ncp;
 var exec = require('child_process').exec;
 var path = require('path');
 var async = require('async');
 
 var testFiles = ['blob','difflist','oid','repo','tree_entry','commit','reference','revwalk','tree'];
 
 function setupReposCache(cb) {
-	fs.mkdir('.reposCache',function() {
-		async.series([
-			function empty(cb) { exec('git init .reposCache/empty',cb); },
-			function workdir(cb) { exec('git clone https://github.com/nodegit/nodegit.git .reposCache/workdir',cb); },
-			function nonrepo(cb) {
-				fs.mkdir('.reposCache/nonrepo',function() {
-					fs.writeFile('.reposCache/nonrepo/file.txt','This is a bogus file',cb);
-				});
-			}
-		],cb);
-	});
+  fs.mkdir('repos',function() {
+    async.series([
+      function empty(cb) { exec('git init repos/empty',function() { cb(); }); },
+      function workdir(cb) { exec('git clone https://github.com/nodegit/nodegit.git repos/workdir',function() { cb(); }); },
+      function nonrepo(cb) {
+        fs.mkdir('repos/nonrepo',function() {
+          fs.writeFile('repos/nonrepo/file.txt','This is a bogus file',function() {
+            cb();
+          });
+        });
+      }
+    ],function() {
+      cb();
+    });
+  });
 }
 
-module.exports = {
-	setUp: function(cb) {
-		fs.exists('.reposCache',function(exists) {
-			if (exists) {
-				ncp('.reposCache','repos',cb);
-			} else {
-				setupReposCache(function(err) {
-					if (err) { return cb(err); }
-					ncp('.reposCache','repos',cb);
-				});
-			}
-		});
-	},
-	tearDown: function(cb) {
-		rimraf('repos',cb);
-	}
+exports.setUp = function(cb) {
+  fs.exists('.reposCache', function(exists) {
+    if (!exists) {
+      setupReposCache(function(err) {
+        cb();
+      });
+    }
+  });
 };
 
-for(var i in testFiles) {
-	var testFile = testFiles[i];
-	module.exports[testFile] = require('./'+testFile);
-}
+Object.keys(testFiles).forEach(function(fileName) {
+  var testFile = testFiles[fileName]
+  exports[testFile] = require('./' + testFile);
+});
@@ -1,6 +1,7 @@
 var git = require('../'),
     rimraf = require('rimraf'),
-    fs = require('fs');
+    fs = require('fs'),
+    path = require('path');
 
 var sha = '5716e9757886eaf38d51c86b192258c960d9cfea';
 var fileCount = 512; // Number of blob & blob executabless
@@ -36,7 +37,7 @@ exports.insert = function(test) {
             buffer = new Buffer(text);
         repo.createBlobFromBuffer(buffer, function(error, blobId) {
           var builder = tree.builder();
-          builder.insert("lib/baz/bar.txt", blobId, git.TreeEntry.FileMode.Blob);
+          builder.insert(path.join("lib", "baz", "bar.txt"), blobId, git.TreeEntry.FileMode.Blob);
           builder.write(function(error, treeId) {
             repo.getTree(treeId, function(error, tree) {
               var author = git.Signature.create("Scott Chacon", "schacon@gmail.com", 123456789, 60),