Routes tests, minor route scoping change, cleanup