freemarker fix
fix test