Updated list of templates files, tests passing