Fix more of the SMB2-LOCK tests. Correctly unlock locks on error.