I've added that as part of the sinon server setup function so it automatically adds the tearDown when you use Sinon.