Refactor routing specs