@@ -196,33 +196,27 @@ Repository.prototype.createCommit = function(
   // FIXME
   updateRef, author, committer, message, tree, parents, callback) {
   if (tree instanceof Tree) {
-    Commit.createCommit.call(
+    return Commit.createCommit.call(
       this,
       updateRef,
       author,
       committer,
       null /* use default message encoding */,
       message,
       tree,
-      parents.length, parents,
-      callback);
+      parents.length, parents);
   } else {
     var self = this;
-    this.getTree(tree, function(error, tree) {
-      if (error) {
-        return callback(error);
-      }
-
-      Commit.createCommit.call(
+    return this.getTree(tree).then(function(tree) {
+      return Commit.createCommit.call(
         self,
         updateRef,
         author,
         committer,
         null /* use default message encoding */,
         message,
         tree,
-        parents.length, parents,
-        callback);
+        parents.length, parents);
     });
   }
 };
@@ -234,8 +228,8 @@ Repository.prototype.createCommit = function(
  * @param {Function} callback
  * @return {Blob}
  */
-Repository.prototype.createBlobFromBuffer = function(buffer, callback) {
-  Blob.createFrombuffer.call(this, buffer, buffer.length, callback);
+Repository.prototype.createBlobFromBuffer = function(buffer) {
+  return Blob.createFrombuffer.call(this, buffer, buffer.length);
 };
 
 /**
 
@@ -6,8 +6,6 @@ var events = require("events");
 
 var oldBuilder = TreeBuilder.create;
 var oldEntryByIndex = Tree.prototype.entryByindex;
-var oldEntryByName = Tree.prototype.entryByname;
-var oldGetEntry = Tree.prototype.entryBypath;
 
 // Backwards compatibility.
 Object.defineProperties(Tree.prototype, {
@@ -46,7 +44,7 @@ Tree.prototype.entryByIndex = function(i) {
  * @return {TreeEntry}
  */
 Tree.prototype.entryByName = function(name) {
-  var entry = oldEntryByName.call(this, name);
+  var entry = this.entryByname(name);
   entry.parent = this;
   return entry;
 };
@@ -58,18 +56,15 @@ Tree.prototype.entryByName = function(name) {
  * @param {String} path
  * @return {TreeEntry}
  */
-Tree.prototype.getEntry = function(path, callback) {
+Tree.prototype.getEntry = function(path) {
   // FIXME: this method ought to implement the recursion directly, rather than
   // rely on oldGetEntry, in order to ensure that `parent` pointers are direct.
   var self = this;
-  oldGetEntry.call(this, path, function(error, entry) {
-    if (error) {
-      return callback(error);
-    }
 
+  return this.entryBypath(path).then(function(entry) {
     entry.parent = self;
     entry.path = function() { return path; };
-    callback(null, entry);
+    return entry;
   });
 };
 
 
@@ -81,8 +81,8 @@ TreeEntry.prototype.getTree = function(callback) {
  * Retrieve the tree for this entry. Make sure to call `isTree` first!
  * @return {Blob}
  */
-TreeEntry.prototype.getBlob = function(callback) {
-  this.parent.repo.getBlob(this.oid(), callback);
+TreeEntry.prototype.getBlob = function() {
+  return this.parent.repo.getBlob(this.oid());
 };
 
 /**
 
@@ -68,7 +68,7 @@
   },
   "scripts": {
     "lint": "jshint lib test/tests",
-    "mocha": "istanbul cover _mocha -- test/runner test/tests --report=lcov",
+    "mocha": "istanbul cover node_modules/mocha/bin/_mocha -- test/runner test/tests --report=lcov",
     "test": "npm run lint && npm run mocha",
     "publish": "node-pre-gyp package && node-pre-gyp publish",
     "generate": "node generate/setup && node generate",
 
@@ -3,6 +3,7 @@ var path = require("path");
 
 describe("Repository", function() {
   var reposPath = path.resolve("test/repos/workdir/.git");
+  var newRepo = path.resolve("test/repos/newrepo");
 
   var Repository = require("../../lib/repository");
 
@@ -33,8 +34,8 @@ describe("Repository", function() {
   });
 
   it("can initialize a repository into a folder", function() {
-    return Repository.init("repos/newrepo", 1).then(function(path, isBare) {
-      return Repository.open("repos/newrepo");
+    return Repository.init(newRepo, 1).then(function(path, isBare) {
+      return Repository.open(newRepo);
     });
   });
 });