t5: Added test
t5: modified template