[CONTINUUM-2713] ensure tests can be re-run

git-svn-id: https://svn.apache.org/repos/asf/continuum/branches/CONTINUUM-2713@1542936 13f79535-47bb-0310-9956-ffa450edef68
[CONTINUUM-2713] adjust for change to rendering of text in forms

git-svn-id: https://svn.apache.org/repos/asf/continuum/branches/CONTINUUM-2713@1542937 13f79535-47bb-0310-9956-ffa450edef68