Dry coded a port of system test basic MO to class tests
Code review updates
Code review
Uplift from master