Reset route options before each spec

So they do not bleed over to other specs
Refactor some specs
Spec refactors