code cleanup, and add Christian as @author to all file headers in OTEC
minor test refactorings in BindingTemplateTest