Add flavors, fix groupings, fix tests