Moved Dialog to FileDialog, added more tests