fixup! Simplify tests for update-witness