Fix several tests which both called a `done` callback *and* returned a
Promise due to CoffeeScript's implicit returns.

Returning a Promise is preferred to using a `done` callback where
possible, so just do that.