Rename volumes+servers test template
Add more volume test templates