That's really unfortunate about MAC. I don't wear a lot of makeup but when I do it's usually MAC. I know it's on the other end of the price spectrum but FYI Wet N Wild doesn't test on animals. Here's a searchable list of animal-friendly brands:
http://www.peta.org/living/beauty-and-personal-care/companies/default.aspx
http://www.peta.org/living/beauty-and-personal-care/companies/default.aspx