MGC test updates for new features

Zach Marshallrequested to merge
zmarshal_MGC_testUpdate into master

This is a set of test updates to get many of the tests running again.

Merge request reports