simplify flavor sample + according test

+review REVIEW-5076