Put the title into the .Doc variables as well. Changed the test template file to use new names.
Changed the tests accordingly.