code review comments
Switch to use npm sinon