Re Aveda, a few years back all the Estee Lauder brands adopted the same, blanket animal testing policy statement, that says they do not test unless required by law. Which means if they sell in China, they are not cruelty free (most of Lauder's brands do sell in China). However, I read that Aveda themselves actually don't sell in China, but the wording of their policy makes me unsure because they could just start selling there any time. For now, they are on PETA's "don't test" list.
Another issue is the parent company; if you're ok with the company being cruelty free but not the parent company, then they are fine. I know some people boycott cruelty free companies with non cruelty free parents, like Urban Decay, Nars, Nyx... etc, whereas others are more relaxed about it.
(If this does bother you by the way, you should know that Fudge are on PETA's list of ok companies (although I can't find their testing policy anywhere) but their parent co is not cruelty free.)
