added templates; templates tests