Fixing HTML template and tests.