Functional Tests updated to work with templates