Updated tests and updated templates for php-code-template 2.x