Simplified taxonomy traversal, added tests for incomplete records.