improved testing on router and utils