Re-activate 'TemplatePar' entries in SFs
Fix slight bug in test client code