Use ResourceGroup instead of testN* templates
Move regex test template to separate folder
Add basic server-on-neutron template