Add tests for taxonomy and terms