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

Small bit of cleanup for automated tests