1) Added Group handling.  This will be simplified in the next revision
(testing it now).
2) Fixed parameter bug in test_set