Refactor and complete MR UTs

No match.