beef up session handling
fix unit test problem