update ExtractFlavors function and unit tests
3 files changed