Slight improvements to @group in tests.