Reworked tree tests for searching; Multiple_attributes and Attribute_And_Name