The line about using the template files doesn't appear in this diff because you didn't change anything, but I wonder if that is the best recommendation. I haven't look at those files in ages, so they may be great as templates, but what I tend to do, and recommend that other people do, is use an existing test or page object as a template.  What do folks think about that?