added _count_trig; fixed bug in __trigsimp; added tests