givenClientTypeWhenCreateSessionThenClientTypeIsPopulatedToTheSession
misc changes