clean up useless templates
update tests