[milestone-06] Added variables to test template wrappers