Replace usage of then()'s with done()'s