Add MC test list
Improve description texts
Applying code review
Merge pull request #491 from andrerod/dev

Add MC UT