Rename test variables, change templates