Neater implementation of contextual service runner with updated tests