Work on rewriting Router tests