Change test layout in template and code
Add xrootd support