XTEND (template and test classes) revised