Index: Core/Common/test/Core.Common.Gui.Test/Commands/GuiExportHandlerTest.cs
===================================================================
diff -u -rb4cf71536ccc150da7fbbe1de048ee0b8a442edb -rc0bfa19b383466c8bbe228ada239c9f094bb2c9c
--- Core/Common/test/Core.Common.Gui.Test/Commands/GuiExportHandlerTest.cs	(.../GuiExportHandlerTest.cs)	(revision b4cf71536ccc150da7fbbe1de048ee0b8a442edb)
+++ Core/Common/test/Core.Common.Gui.Test/Commands/GuiExportHandlerTest.cs	(.../GuiExportHandlerTest.cs)	(revision c0bfa19b383466c8bbe228ada239c9f094bb2c9c)
@@ -120,7 +120,6 @@
             var mockRepository = new MockRepository();
             var mainWindow = mockRepository.Stub<IMainWindow>();
             var exporterMock = mockRepository.StrictMock<IFileExporter>();
-
             mockRepository.ReplayAll();
 
             ModalFormHandler = (name, wnd, form) =>
@@ -146,11 +145,17 @@
 
         [Test]
         [RequiresSTA]
-        public void ExportFrom_SupportedExporterAvailableSaveClicked_ExportsAndLogsMessages()
+        [TestCase(true)]
+        [TestCase(false)]
+        public void ExportFrom_SupportedExporterAvailableSaveClicked_CallsExportAndLogsMessages(bool exportResult)
         {
             // Setup
             var mockRepository = new MockRepository();
             var mainWindow = mockRepository.Stub<IMainWindow>();
+            var exporterMock = mockRepository.StrictMock<IFileExporter>();
+
+            exporterMock.Stub(e => e.Export()).Return(exportResult);
+
             mockRepository.ReplayAll();
 
             ModalFormHandler = (name, wnd, form) =>
@@ -163,7 +168,7 @@
             {
                 new ExportInfo<int>
                 {
-                    CreateFileExporter = (data, filePath) => new IntegerFileExporter()
+                    CreateFileExporter = (data, filePath) => exporterMock
                 }
             });
 
@@ -174,18 +179,25 @@
             TestHelper.AssertLogMessagesAreGenerated(call, new[]
             {
                 "Exporteren gestart.",
-                "Exporteren afgerond."
+                exportResult ? "Exporteren afgerond." : "Exporteren mislukt."
             });
             mockRepository.VerifyAll();
         }
 
         [Test]
         [RequiresSTA]
-        public void ExportFrom_SupportedAndUnsupportedExporterAvailableSaveClicked_ExportsAndLogsMessages()
+        [TestCase(true)]
+        [TestCase(false)]
+        public void ExportFrom_SupportedAndUnsupportedExporterAvailableSaveClicked_CallsExportAndLogsMessages(bool exportResult)
         {
             // Setup
             var mockRepository = new MockRepository();
             var mainWindow = mockRepository.Stub<IMainWindow>();
+            var exporterMock1 = mockRepository.StrictMock<IFileExporter>();
+            var exporterMock2 = mockRepository.StrictMock<IFileExporter>();
+
+            exporterMock2.Stub(e => e.Export()).Return(exportResult);
+
             mockRepository.ReplayAll();
 
             ModalFormHandler = (name, wnd, form) =>
@@ -196,10 +208,13 @@
 
             var exportHandler = new GuiExportHandler(mainWindow, new List<ExportInfo>
             {
-                new ExportInfo<string>(),
+                new ExportInfo<string>
+                {
+                    CreateFileExporter = (data, filePath) => exporterMock1
+                },
                 new ExportInfo<int>
                 {
-                    CreateFileExporter = (data, filePath) => new IntegerFileExporter()
+                    CreateFileExporter = (data, filePath) => exporterMock2
                 }
             });
 
@@ -210,7 +225,7 @@
             TestHelper.AssertLogMessagesAreGenerated(call, new[]
             {
                 "Exporteren gestart.",
-                "Exporteren afgerond."
+                exportResult ? "Exporteren afgerond." : "Exporteren mislukt."
             });
             mockRepository.VerifyAll();
         }
@@ -275,13 +290,5 @@
             Assert.IsTrue(isExportPossible);
             mocks.VerifyAll();
         }
-
-        private class IntegerFileExporter : IFileExporter
-        {
-            public bool Export()
-            {
-                return true;
-            }
-        }
     }
 }
\ No newline at end of file