Converting dlg with font. Plus refactorings and improved test stuff.