Add .xml.fr and .html.fr; also make tests not fail.