Remove dependency on sinon