Refactor witness_unlock() to fix undefined test behavior.

This resolves #396.
2 files changed