master: update test/model.js and test/router.js