Tightening PathService and its tests