Add markupsafe and tornado tests (commented out)