router fix and sinon removed