Added nicer tests, fixed self-closing tags