Added variables to test.yml + templates improvements.