Make HTML conversion basically work again.
Fix test (we get slightly different HTML now).