Merge pull request #783 from nulltoken/topic/reinit-coverage Repo reinit fix + enhanced test coverage