gaia/fauna_fish_tuna.xml actually ought to be named gaia/fish/tuna.xml since it inherits from template_gaia_fish.xml, not from template_unit_fauna.xml. Just a reminder; it's out of scope of this patch, though.