Fix term/taxonomy tests