Fix test hang, more work on SessionDataHandler