Update based on review

- Call done() as a success and failure callback
- Use this.sinon to avoid restore() calls