Apply new form builder in forms and DRY it
Fix tests after introducing form builder