Add support for CodeSpan, H2, add extra test.