y_groups tests passing.
Fixing the non-inclusion of vital y_groups code with MASTER disabled.
Cleanup and y_groups upper-bounding.