Fix some tests
Fix rest of tests (for new version of html.js)

Only tested on Chrome.

The "blaze" package is still separate but it shares even more code with "ui" now.