Fixed self-closing tags, added nicer tests.