CB-7160 move to tests dir, add nested plugin.xml

F#ixing up auto tests