Corrected tests.
Adjusted codetemplates.xml