Fix some false positive unit tests. Note sure I fully understand how mocha-as-promised is supposed to work, changed to using standard mocha-style `done()` callbacks in the interim.