Flags adjustments for the file dialog
Fix unit tests