More test and html escaping
negation
cleanup
cleanup