Some more bugfixes for revised W3C tests