Comment 2 for bug 1342177

I took a deeper look at how our tests are organized and as much as I'd like to DRY them up, I think we can't. The tests that were copied from v1 to v1_1 have already been modified enough to prevent this *merge into a single package* thing to happen.

Did you have a better plan for this?