move client session id into a single point
generate client side session id
fix up some tests