remove unnecessary iffing from html
restructure test