Fix a test I broke by making groups as large as possible (comment out a couple subtests)