functional tests added
templates are now used instead of constant html
More required items added in html for functional tests to pass