Fixed *some* of the candidate routes and tests.
Merge branch 'c1moore_branch' into dev