Fixed Functional Test problem and added one last detail to templates