We now cleanup and unique values on version conflict; also, added better tests for optimistic and unique verification.