66231886 make session mockable