Changes to html and tests