Improved PredictableResponseService and tests