Handle unicode correctly; fix test cases
Use .parent() instead of wrapping the HTML with <li>