Fixed deprecated behavior per a warning in the tests
Re-instate test cases in broken-html, many of those tests do not work