It might make more sense to just have a subsequent patch that converts all our current tests to PhantomJS and blows away the mocha stuff then having this small patch in between that separates them out.