More routing test updates;