Changed the "router" config setting to "routing", updated tests