Issue #1195254 by trrroy, underq, kid_icarus, tim.plunkett, oriol_e9g, xjm: Taxonomy test cleanup.