Revert "WIP: session = nil for test"

This reverts commit e4508c9c71b16f9c366f0859cb34412bac7811fd.