Also edited numerious tests that were expecting wrong output - they now expect correct output. Note that a few **still fail** because the output before moving to ELementTree wasn't correct either. So I set the expected output to what I think it should be so we don't forget about it later. I should also note that the 'safe-mode' tests are failing. However, I believe the current expected output is correct as it is valid html. Interestingly, these tests passed prior to this fix. We'll need to special case safe-mode here.