A few more MGC test updates

Zach Marshallrequested to merge
zmarshal/athena:21.6_MGC_TestUpdates into 21.6

This should get the next few tests working.

Merge request reports