fixed test
added templates