WIP testing and fixes to Session object