Re: Review Request: conflicts and repoclosure tests minor refactoring