router fix and sinon remove