Initial work to have delimiter agnostic routes
Fixes broken test code related to path splits into tokens.