Old tests fixed
Doctype tests added