diff --git a/Tests/UnitTests/GUI/TestAxesItems.h b/Tests/UnitTests/GUI/TestAxesItems.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestAxesItems.h
rename to Tests/UnitTests/GUI/TestAxesItems.cpp
diff --git a/Tests/UnitTests/GUI/TestComboProperty.h b/Tests/UnitTests/GUI/TestComboProperty.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestComboProperty.h
rename to Tests/UnitTests/GUI/TestComboProperty.cpp
diff --git a/Tests/UnitTests/GUI/TestComponentProxyModel.h b/Tests/UnitTests/GUI/TestComponentProxyModel.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestComponentProxyModel.h
rename to Tests/UnitTests/GUI/TestComponentProxyModel.cpp
diff --git a/Tests/UnitTests/GUI/TestComponentUtils.h b/Tests/UnitTests/GUI/TestComponentUtils.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestComponentUtils.h
rename to Tests/UnitTests/GUI/TestComponentUtils.cpp
diff --git a/Tests/UnitTests/GUI/TestCsvImportAssistant.h b/Tests/UnitTests/GUI/TestCsvImportAssistant.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestCsvImportAssistant.h
rename to Tests/UnitTests/GUI/TestCsvImportAssistant.cpp
diff --git a/Tests/UnitTests/GUI/TestDataItemViews.h b/Tests/UnitTests/GUI/TestDataItemViews.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestDataItemViews.h
rename to Tests/UnitTests/GUI/TestDataItemViews.cpp
diff --git a/Tests/UnitTests/GUI/TestDataItems.h b/Tests/UnitTests/GUI/TestDataItems.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestDataItems.h
rename to Tests/UnitTests/GUI/TestDataItems.cpp
diff --git a/Tests/UnitTests/GUI/TestDetectorItems.h b/Tests/UnitTests/GUI/TestDetectorItems.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestDetectorItems.h
rename to Tests/UnitTests/GUI/TestDetectorItems.cpp
diff --git a/Tests/UnitTests/GUI/TestExternalProperty.h b/Tests/UnitTests/GUI/TestExternalProperty.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestExternalProperty.h
rename to Tests/UnitTests/GUI/TestExternalProperty.cpp
diff --git a/Tests/UnitTests/GUI/TestFTDistributionItems.h b/Tests/UnitTests/GUI/TestFTDistributionItems.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestFTDistributionItems.h
rename to Tests/UnitTests/GUI/TestFTDistributionItems.cpp
diff --git a/Tests/UnitTests/GUI/TestFitParameterModel.h b/Tests/UnitTests/GUI/TestFitParameterModel.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestFitParameterModel.h
rename to Tests/UnitTests/GUI/TestFitParameterModel.cpp
diff --git a/Tests/UnitTests/GUI/TestFormFactorItems.h b/Tests/UnitTests/GUI/TestFormFactorItems.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestFormFactorItems.h
rename to Tests/UnitTests/GUI/TestFormFactorItems.cpp
diff --git a/Tests/UnitTests/GUI/TestGUI.cpp b/Tests/UnitTests/GUI/TestGUI.cpp
index a7e450a9c6c3d7a619e0cea9a9000135cf31b2ee..50c78e1d6b9210dcb4ab22744e4df10ddd9f454d 100644
--- a/Tests/UnitTests/GUI/TestGUI.cpp
+++ b/Tests/UnitTests/GUI/TestGUI.cpp
@@ -1,61 +1,8 @@
 #include "google_test.h"
-#include <QString>
 #include <QCoreApplication>
 #include <QAbstractItemModel>
 #include "Comparators.h"
 
-#include "TestAxesItems.h"
-#include "TestComboProperty.h"
-#include "TestComponentProxyModel.h"
-#include "TestComponentUtils.h"
-#include "TestCsvImportAssistant.h"
-#include "TestDataItems.h"
-#include "TestDataItemViews.h"
-#include "TestDetectorItems.h"
-#include "TestExternalProperty.h"
-#include "TestFitParameterModel.h"
-#include "TestFormFactorItems.h"
-#include "TestFTDistributionItems.h"
-#include "TestGroupItem.h"
-#include "TestGUICoreObjectCorrespondence.h"
-#include "TestGUIHelpers.h"
-#include "TestLayerItems.h"
-#include "TestLayerRoughnessItems.h"
-#include "TestLinkInstrument.h"
-#include "TestMapperCases.h"
-#include "TestMapperForItem.h"
-#include "TestMaterialModel.h"
-#include "TestMaterialPropertyController.h"
-#include "TestMessageService.h"
-#include "TestModelUtils.h"
-#include "TestMultiLayerItem.h"
-#include "TestOutputDataIOService.h"
-#include "TestParaCrystalItems.h"
-#include "TestParameterTreeUtils.h"
-#include "TestParticleCoreShell.h"
-#include "TestParticleDistributionItem.h"
-#include "TestParticleItem.h"
-#include "TestParticleLayoutItem.h"
-#include "TestProjectDocument.h"
-#include "TestProjectUtils.h"
-#include "TestPropertyRepeater.h"
-#include "TestProxyModelStrategy.h"
-#include "TestSaveService.h"
-#include "TestSavingSpecularData.h"
-#include "TestSessionItemController.h"
-#include "TestSessionItem.h"
-#include "TestSessionItemData.h"
-#include "TestSessionItemTags.h"
-#include "TestSessionItemUtils.h"
-#include "TestSessionModel.h"
-#include "TestSessionXML.h"
-#include "TestTranslations.h"
-#include "TestUpdateTimer.h"
-
-#ifdef BORNAGAIN_OPENGL
-#include "TestRealSpaceBuilderUtils.h"
-#endif
-
 int main(int argc, char** argv) {
     QCoreApplication app(argc, argv);
     Q_UNUSED(app);
diff --git a/Tests/UnitTests/GUI/TestGUICoreObjectCorrespondence.h b/Tests/UnitTests/GUI/TestGUICoreObjectCorrespondence.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestGUICoreObjectCorrespondence.h
rename to Tests/UnitTests/GUI/TestGUICoreObjectCorrespondence.cpp
diff --git a/Tests/UnitTests/GUI/TestGUIHelpers.h b/Tests/UnitTests/GUI/TestGUIHelpers.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestGUIHelpers.h
rename to Tests/UnitTests/GUI/TestGUIHelpers.cpp
diff --git a/Tests/UnitTests/GUI/TestGroupItem.h b/Tests/UnitTests/GUI/TestGroupItem.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestGroupItem.h
rename to Tests/UnitTests/GUI/TestGroupItem.cpp
diff --git a/Tests/UnitTests/GUI/TestLayerItems.h b/Tests/UnitTests/GUI/TestLayerItems.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestLayerItems.h
rename to Tests/UnitTests/GUI/TestLayerItems.cpp
diff --git a/Tests/UnitTests/GUI/TestLayerRoughnessItems.h b/Tests/UnitTests/GUI/TestLayerRoughnessItems.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestLayerRoughnessItems.h
rename to Tests/UnitTests/GUI/TestLayerRoughnessItems.cpp
diff --git a/Tests/UnitTests/GUI/TestLinkInstrument.h b/Tests/UnitTests/GUI/TestLinkInstrument.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestLinkInstrument.h
rename to Tests/UnitTests/GUI/TestLinkInstrument.cpp
diff --git a/Tests/UnitTests/GUI/TestMapperCases.h b/Tests/UnitTests/GUI/TestMapperCases.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestMapperCases.h
rename to Tests/UnitTests/GUI/TestMapperCases.cpp
diff --git a/Tests/UnitTests/GUI/TestMapperForItem.h b/Tests/UnitTests/GUI/TestMapperForItem.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestMapperForItem.h
rename to Tests/UnitTests/GUI/TestMapperForItem.cpp
diff --git a/Tests/UnitTests/GUI/TestMaterialModel.h b/Tests/UnitTests/GUI/TestMaterialModel.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestMaterialModel.h
rename to Tests/UnitTests/GUI/TestMaterialModel.cpp
diff --git a/Tests/UnitTests/GUI/TestMaterialPropertyController.h b/Tests/UnitTests/GUI/TestMaterialPropertyController.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestMaterialPropertyController.h
rename to Tests/UnitTests/GUI/TestMaterialPropertyController.cpp
diff --git a/Tests/UnitTests/GUI/TestMessageService.h b/Tests/UnitTests/GUI/TestMessageService.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestMessageService.h
rename to Tests/UnitTests/GUI/TestMessageService.cpp
diff --git a/Tests/UnitTests/GUI/TestModelUtils.h b/Tests/UnitTests/GUI/TestModelUtils.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestModelUtils.h
rename to Tests/UnitTests/GUI/TestModelUtils.cpp
diff --git a/Tests/UnitTests/GUI/TestMultiLayerItem.h b/Tests/UnitTests/GUI/TestMultiLayerItem.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestMultiLayerItem.h
rename to Tests/UnitTests/GUI/TestMultiLayerItem.cpp
diff --git a/Tests/UnitTests/GUI/TestOutputDataIOService.h b/Tests/UnitTests/GUI/TestOutputDataIOService.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestOutputDataIOService.h
rename to Tests/UnitTests/GUI/TestOutputDataIOService.cpp
diff --git a/Tests/UnitTests/GUI/TestParaCrystalItems.h b/Tests/UnitTests/GUI/TestParaCrystalItems.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestParaCrystalItems.h
rename to Tests/UnitTests/GUI/TestParaCrystalItems.cpp
diff --git a/Tests/UnitTests/GUI/TestParameterTreeUtils.h b/Tests/UnitTests/GUI/TestParameterTreeUtils.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestParameterTreeUtils.h
rename to Tests/UnitTests/GUI/TestParameterTreeUtils.cpp
diff --git a/Tests/UnitTests/GUI/TestParticleCoreShell.h b/Tests/UnitTests/GUI/TestParticleCoreShell.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestParticleCoreShell.h
rename to Tests/UnitTests/GUI/TestParticleCoreShell.cpp
diff --git a/Tests/UnitTests/GUI/TestParticleDistributionItem.h b/Tests/UnitTests/GUI/TestParticleDistributionItem.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestParticleDistributionItem.h
rename to Tests/UnitTests/GUI/TestParticleDistributionItem.cpp
diff --git a/Tests/UnitTests/GUI/TestParticleItem.h b/Tests/UnitTests/GUI/TestParticleItem.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestParticleItem.h
rename to Tests/UnitTests/GUI/TestParticleItem.cpp
diff --git a/Tests/UnitTests/GUI/TestProjectDocument.h b/Tests/UnitTests/GUI/TestProjectDocument.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestProjectDocument.h
rename to Tests/UnitTests/GUI/TestProjectDocument.cpp
diff --git a/Tests/UnitTests/GUI/TestProjectUtils.h b/Tests/UnitTests/GUI/TestProjectUtils.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestProjectUtils.h
rename to Tests/UnitTests/GUI/TestProjectUtils.cpp
diff --git a/Tests/UnitTests/GUI/TestPropertyRepeater.h b/Tests/UnitTests/GUI/TestPropertyRepeater.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestPropertyRepeater.h
rename to Tests/UnitTests/GUI/TestPropertyRepeater.cpp
diff --git a/Tests/UnitTests/GUI/TestProxyModelStrategy.h b/Tests/UnitTests/GUI/TestProxyModelStrategy.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestProxyModelStrategy.h
rename to Tests/UnitTests/GUI/TestProxyModelStrategy.cpp
diff --git a/Tests/UnitTests/GUI/TestRealSpaceBuilderUtils.h b/Tests/UnitTests/GUI/TestRealSpaceBuilderUtils.cpp
similarity index 99%
rename from Tests/UnitTests/GUI/TestRealSpaceBuilderUtils.h
rename to Tests/UnitTests/GUI/TestRealSpaceBuilderUtils.cpp
index 66585f61eb78489bfe00bc8d1ce1096bf5090d8f..187d88e520220b0dd8a03a24fa375013090634d2 100644
--- a/Tests/UnitTests/GUI/TestRealSpaceBuilderUtils.h
+++ b/Tests/UnitTests/GUI/TestRealSpaceBuilderUtils.cpp
@@ -1,6 +1,8 @@
 #ifndef TESTREALSPACEBUILDERUTILS_H
 #define TESTREALSPACEBUILDERUTILS_H
 
+#ifdef BORNAGAIN_OPENGL
+
 #include "ApplicationModels.h"
 #include "IFormFactor.h"
 #include "IFormFactorDecorator.h"
@@ -246,4 +248,6 @@ TEST_F(TestRealSpaceBuilderUtils, test_particle3DContainerVector)
     EXPECT_EQ(particle3DContainer_vector.at(2).particleType(), Constants::ParticleType);
 }
 
+#endif // BORNAGAIN_OPENGL
+
 #endif // TESTREALSPACEBUILDERUTILS_H
diff --git a/Tests/UnitTests/GUI/TestSaveService.h b/Tests/UnitTests/GUI/TestSaveService.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestSaveService.h
rename to Tests/UnitTests/GUI/TestSaveService.cpp
diff --git a/Tests/UnitTests/GUI/TestSavingSpecularData.h b/Tests/UnitTests/GUI/TestSavingSpecularData.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestSavingSpecularData.h
rename to Tests/UnitTests/GUI/TestSavingSpecularData.cpp
diff --git a/Tests/UnitTests/GUI/TestSessionItem.h b/Tests/UnitTests/GUI/TestSessionItem.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestSessionItem.h
rename to Tests/UnitTests/GUI/TestSessionItem.cpp
diff --git a/Tests/UnitTests/GUI/TestSessionItemController.h b/Tests/UnitTests/GUI/TestSessionItemController.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestSessionItemController.h
rename to Tests/UnitTests/GUI/TestSessionItemController.cpp
diff --git a/Tests/UnitTests/GUI/TestSessionItemData.h b/Tests/UnitTests/GUI/TestSessionItemData.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestSessionItemData.h
rename to Tests/UnitTests/GUI/TestSessionItemData.cpp
diff --git a/Tests/UnitTests/GUI/TestSessionItemTags.h b/Tests/UnitTests/GUI/TestSessionItemTags.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestSessionItemTags.h
rename to Tests/UnitTests/GUI/TestSessionItemTags.cpp
diff --git a/Tests/UnitTests/GUI/TestSessionItemUtils.h b/Tests/UnitTests/GUI/TestSessionItemUtils.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestSessionItemUtils.h
rename to Tests/UnitTests/GUI/TestSessionItemUtils.cpp
diff --git a/Tests/UnitTests/GUI/TestSessionModel.h b/Tests/UnitTests/GUI/TestSessionModel.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestSessionModel.h
rename to Tests/UnitTests/GUI/TestSessionModel.cpp
diff --git a/Tests/UnitTests/GUI/TestSessionXML.h b/Tests/UnitTests/GUI/TestSessionXML.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestSessionXML.h
rename to Tests/UnitTests/GUI/TestSessionXML.cpp
diff --git a/Tests/UnitTests/GUI/TestTranslations.h b/Tests/UnitTests/GUI/TestTranslations.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestTranslations.h
rename to Tests/UnitTests/GUI/TestTranslations.cpp
diff --git a/Tests/UnitTests/GUI/TestUpdateTimer.h b/Tests/UnitTests/GUI/TestUpdateTimer.cpp
similarity index 100%
rename from Tests/UnitTests/GUI/TestUpdateTimer.h
rename to Tests/UnitTests/GUI/TestUpdateTimer.cpp