LH: I have added a test that does both hibernate and timeout and fixed a related issue. I also tweaked the docs and tests.