Change some structures. Add test for <img/>.