mgca: Re-merge split out tests

Now that we avoid a fatal error, they can all be one test.