Moved template/test so it can't be accessed

Also fixed survey functionality.  Forgot to add the element names
properly.