Remove folder_rename_form, fix tests