Start getting rid of using globals in router spec