Dialogs improvements. Test fix and fix error with spec_helper (cannot load file)