"Fix" PHP tests.
Add support for signatures for sub templates.