route stop service / test fixes