Improoved tests with more than one template files