Comment 1 for bug 235398

The best thing to do in this case is to remove redundant tests, and then modularize the other tests. For instance, the merge queues tests should really be their own set of tests. They may, in fact, require some of the same functionality as branch merge proposals, but that functionality can really be duplicated without having to test its functionality, so it's minimal.

This, in the end, has been what I've decided needs to be done.