REFS #857 - Improved form.html from testsuite