Add booleans for conditional groups.

Shuffle tests a bit.