Move group and option tests to their appropriate method.