flavors util tests; flavors util doc; flavor include cleanup