fix and tests with zebra session