Isolate trait tests and make them understand simple_trait_id
Isolate trait tests and make them understand simple_trait_id

gnu-lorien/twistedvines,gnu-lorien/yorick,gnu-lorien/yorick,gnu-lorien/yorick,gnu-lorien/twistedvines,gnu-lorien/yorick,gnu-lorien/twistedvines