Respect TraitFilters

Change 1
I don't think pushing a "Trait" on the end is the right thing to do. Leave it as is and it will match what you see in the TestExplorer.