Refactored Taxonomy Field Methods
Updated tests to use refactored methods