WIP: session tests
WIP: session tests
tests cleanup