Add session support
Add a session test, back to 100% coverage