Lots of work on session, looking at serialization in tests.