chore(cleanup): minor cleanup and added more Router.listen tests