critical bugfix
More tests

Test template defined