(LockIntermittentFailure) Fix intermittent test failure in locking