diff --git a/Core/StandardSamples/FunctionalTestRegistry.cpp b/Core/StandardSamples/FunctionalTestRegistry.cpp
index d8ed2f6e5c46d6ccc713145e045502c0458f9add..e944303e3e8345c667707506f2b1d7131947413b 100644
--- a/Core/StandardSamples/FunctionalTestRegistry.cpp
+++ b/Core/StandardSamples/FunctionalTestRegistry.cpp
@@ -105,6 +105,13 @@ FunctionalTestRegistry::FunctionalTestRegistry()
         "None",
         2e-10);
 
+    add("TwoTypesCylindersDistribution",
+        "Cylinders in BA with size distributions",
+        "MiniGISAS",
+        "TwoTypesCylindersDistributionBuilder",
+        "None",
+        2e-10);
+
     add("BeamDivergence",
         "Cylinders in BA in the presence of beam divergence",
         "MiniGISASBeamDivergence",
diff --git a/Core/StandardSamples/IsGISAXS02Builder.cpp b/Core/StandardSamples/IsGISAXS02Builder.cpp
deleted file mode 100644
index a24938129c09df6bf550912e562871fd2d250166..0000000000000000000000000000000000000000
--- a/Core/StandardSamples/IsGISAXS02Builder.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-// ************************************************************************** //
-//
-//  BornAgain: simulate and fit scattering at grazing incidence
-//
-//! @file      StandardSamples/IsGISAXS02Builder.cpp
-//! @brief     Implements class IsGISAXS02Builder.
-//!
-//! @homepage  http://www.bornagainproject.org
-//! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
-//
-// ************************************************************************** //
-
-#include "IsGISAXS02Builder.h"
-#include "MultiLayer.h"
-#include "ParticleLayout.h"
-#include "Materials.h"
-#include "FormFactorCylinder.h"
-#include "Units.h"
-#include "InterferenceFunctionNone.h"
-#include "ParticleDistribution.h"
-#include "Distributions.h"
-
-
-IsGISAXS02Builder::IsGISAXS02Builder()
-    : m_radius1(5*Units::nanometer)
-    , m_radius2(10*Units::nanometer)
-    , m_height1(5*Units::nanometer)
-    , m_height2(10*Units::nanometer)
-    , m_sigma1_ratio(0.2)
-    , m_sigma2_ratio(0.02)
-{
-    init_parameters();
-}
-
-
-void IsGISAXS02Builder::init_parameters()
-{
-    clearParameterPool();
-    registerParameter("radius1", &m_radius1);
-    registerParameter("radius2", &m_radius2);
-    registerParameter("height1", &m_height1);
-    registerParameter("height2", &m_height2);
-    registerParameter("sigma1_ratio", &m_sigma1_ratio);
-    registerParameter("sigma2_ratio", &m_sigma2_ratio);
-}
-
-
-ISample *IsGISAXS02Builder::buildSample() const
-{
-    MultiLayer *multi_layer = new MultiLayer();
-
-    HomogeneousMaterial air_material("Air", 0.0, 0.0);
-    HomogeneousMaterial particle_material ("Particle", 6e-4, 2e-8);
-
-    Layer air_layer(air_material);
-
-    ParticleLayout particle_layout;
-
-    // preparing nano particles prototypes for seeding layer's particle_layout
-    FormFactorCylinder p_ff_cylinder1(m_radius1, m_height1);
-    Particle cylinder1(particle_material, p_ff_cylinder1 );
-
-    FormFactorCylinder p_ff_cylinder2(m_radius2, m_height2);
-    Particle cylinder2(particle_material, p_ff_cylinder2 );
-
-    // radius of nanoparticles will be sampled with gaussian probability
-    int nbins=150;
-    double sigma1 = m_radius1*m_sigma1_ratio;
-    double sigma2 = m_radius2*m_sigma2_ratio;
-    // to have xmin=average-3*sigma
-    double n_sigma = 3.0;
-    DistributionGaussian gauss1(m_radius1, sigma1);
-    DistributionGaussian gauss2(m_radius2, sigma2);
-
-    // building distribution of nano particles
-    ParameterDistribution par_distr1("*/radius", gauss1, nbins, n_sigma);
-    ParticleDistribution particle_collection1(cylinder1, par_distr1);
-    particle_layout.addParticle(particle_collection1, 0.0, 0.95);
-    ParameterDistribution par_distr2("*/radius", gauss2, nbins, n_sigma);
-    ParticleDistribution particle_collection2(cylinder2, par_distr2);
-    particle_layout.addParticle(particle_collection2, 0.0, 0.05);
-
-    particle_layout.addInterferenceFunction(new InterferenceFunctionNone());
-
-    air_layer.addLayout(particle_layout);
-
-    multi_layer->addLayer(air_layer);
-
-    return multi_layer;
-}
-
diff --git a/Core/StandardSamples/IsGISAXS02Builder.h b/Core/StandardSamples/IsGISAXS02Builder.h
deleted file mode 100644
index 30e0ed839e5aee65bf1312df972a1e82503d3bd7..0000000000000000000000000000000000000000
--- a/Core/StandardSamples/IsGISAXS02Builder.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// ************************************************************************** //
-//
-//  BornAgain: simulate and fit scattering at grazing incidence
-//
-//! @file      StandardSamples/IsGISAXS02Builder.h
-//! @brief     Defines class IsGISAXS02Builder.
-//!
-//! @homepage  http://www.bornagainproject.org
-//! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
-//
-// ************************************************************************** //
-
-#ifndef ISGISAXS02BUILDER_H
-#define ISGISAXS02BUILDER_H
-
-#include "ISampleBuilder.h"
-
-//! @class IsGISAXS02Builder
-//! @ingroup standard_samples
-//! @brief Builds sample: mixture cylinder particles with different size
-//! distribution (IsGISAXS example #2)
-
-class BA_CORE_API_ IsGISAXS02Builder : public ISampleBuilder
-{
-public:
-    IsGISAXS02Builder();
-    ISample *buildSample() const;
-
-protected:
-    void init_parameters();
-
-private:
-    double m_radius1;
-    double m_radius2;
-    double m_height1;
-    double m_height2;
-    double m_sigma1_ratio;
-    double m_sigma2_ratio;
-};
-
-#endif // ISGISAXS02BUILDER_H
diff --git a/Core/StandardSamples/ParticleDistributionsBuilder.cpp b/Core/StandardSamples/ParticleDistributionsBuilder.cpp
index 5ae2d04f4b951b0078358255cd1b90e96614bf46..c53cd5ede61a0e2eedafc8f1b9d089e02e1c8e5f 100644
--- a/Core/StandardSamples/ParticleDistributionsBuilder.cpp
+++ b/Core/StandardSamples/ParticleDistributionsBuilder.cpp
@@ -69,3 +69,77 @@ ISample *CylindersWithSizeDistributionBuilder::buildSample() const
 
     return multi_layer;
 }
+
+// ----------------------------------------------------------------------------
+//
+// ----------------------------------------------------------------------------
+
+TwoTypesCylindersDistributionBuilder::TwoTypesCylindersDistributionBuilder()
+    : m_radius1(5*Units::nanometer)
+    , m_radius2(10*Units::nanometer)
+    , m_height1(5*Units::nanometer)
+    , m_height2(10*Units::nanometer)
+    , m_sigma1_ratio(0.2)
+    , m_sigma2_ratio(0.02)
+{
+    init_parameters();
+}
+
+
+void TwoTypesCylindersDistributionBuilder::init_parameters()
+{
+    clearParameterPool();
+    registerParameter("radius1", &m_radius1);
+    registerParameter("radius2", &m_radius2);
+    registerParameter("height1", &m_height1);
+    registerParameter("height2", &m_height2);
+    registerParameter("sigma1_ratio", &m_sigma1_ratio);
+    registerParameter("sigma2_ratio", &m_sigma2_ratio);
+}
+
+
+ISample *TwoTypesCylindersDistributionBuilder::buildSample() const
+{
+    MultiLayer *multi_layer = new MultiLayer();
+
+    HomogeneousMaterial air_material("Air", 0.0, 0.0);
+    HomogeneousMaterial particle_material ("Particle", 6e-4, 2e-8);
+
+    Layer air_layer(air_material);
+
+    ParticleLayout particle_layout;
+
+    // preparing nano particles prototypes for seeding layer's particle_layout
+    FormFactorCylinder p_ff_cylinder1(m_radius1, m_height1);
+    Particle cylinder1(particle_material, p_ff_cylinder1 );
+
+    FormFactorCylinder p_ff_cylinder2(m_radius2, m_height2);
+    Particle cylinder2(particle_material, p_ff_cylinder2 );
+
+    // radius of nanoparticles will be sampled with gaussian probability
+    int nbins=150;
+    double sigma1 = m_radius1*m_sigma1_ratio;
+    double sigma2 = m_radius2*m_sigma2_ratio;
+    // to have xmin=average-3*sigma
+    double n_sigma = 3.0;
+    DistributionGaussian gauss1(m_radius1, sigma1);
+    DistributionGaussian gauss2(m_radius2, sigma2);
+
+    // building distribution of nano particles
+    ParameterDistribution par_distr1("*/radius", gauss1, nbins, n_sigma);
+    ParticleDistribution particle_collection1(cylinder1, par_distr1);
+    particle_layout.addParticle(particle_collection1, 0.0, 0.95);
+    ParameterDistribution par_distr2("*/radius", gauss2, nbins, n_sigma);
+    ParticleDistribution particle_collection2(cylinder2, par_distr2);
+    particle_layout.addParticle(particle_collection2, 0.0, 0.05);
+
+    particle_layout.addInterferenceFunction(new InterferenceFunctionNone());
+
+    air_layer.addLayout(particle_layout);
+
+    multi_layer->addLayer(air_layer);
+
+    return multi_layer;
+}
+
+
diff --git a/Core/StandardSamples/ParticleDistributionsBuilder.h b/Core/StandardSamples/ParticleDistributionsBuilder.h
index 2c38e9a483ae67542d2b105952cf2c43ccd4b86c..5cc63ca73cff4290659ce1f6f885876c905193d3 100644
--- a/Core/StandardSamples/ParticleDistributionsBuilder.h
+++ b/Core/StandardSamples/ParticleDistributionsBuilder.h
@@ -37,5 +37,28 @@ private:
 };
 
 
+//! @class TwoTypesCylindersDistributionBuilder
+//! @ingroup standard_samples
+//! @brief Builds sample: mixture cylinder particles with different size
+//! distribution (IsGISAXS example #2)
+
+class BA_CORE_API_ TwoTypesCylindersDistributionBuilder : public ISampleBuilder
+{
+public:
+    TwoTypesCylindersDistributionBuilder();
+    ISample *buildSample() const;
+
+protected:
+    void init_parameters();
+
+private:
+    double m_radius1;
+    double m_radius2;
+    double m_height1;
+    double m_height2;
+    double m_sigma1_ratio;
+    double m_sigma2_ratio;
+};
+
 
 #endif // PARTICLEDISTRIBUTIONSBUILDER_H
diff --git a/Core/StandardSamples/SampleBuilderFactory.cpp b/Core/StandardSamples/SampleBuilderFactory.cpp
index 56507905c558af3cc4187a472f68767d6d7f953b..e3883bc570c9227a8ccb3b408ec6cfc88901aa87 100644
--- a/Core/StandardSamples/SampleBuilderFactory.cpp
+++ b/Core/StandardSamples/SampleBuilderFactory.cpp
@@ -15,7 +15,6 @@
 
 #include "SampleBuilderFactory.h"
 #include "CylindersAndPrismsBuilder.h"
-#include "IsGISAXS02Builder.h"
 #include "CylindersBuilder.h"
 #include "ParaCrystalBuilder.h"
 #include "TwoDimLatticeBuilder.h"
@@ -44,9 +43,9 @@ SampleBuilderFactory::SampleBuilderFactory()
         "Mixture of cylinders and prisms without interference");
 
     registerItem(
-        "isgisaxs02",
-        IFactoryCreateFunction<IsGISAXS02Builder, ISampleBuilder>,
-        "Mixture cylinder particles with different size distribution ");
+        "TwoTypesCylindersDistributionBuilder",
+        IFactoryCreateFunction<TwoTypesCylindersDistributionBuilder, ISampleBuilder>,
+        "Mixture of cylinder particles with two types size distribution ");
 
     registerItem(
         "CylindersInBABuilder",
diff --git a/Core/StandardSamples/StandardSimulations.cpp b/Core/StandardSamples/StandardSimulations.cpp
index c81e9e38c8c51cac2c48729a48029800159017cd..2ce55612b21834ca618d9b057ec4a78e7dbe2372 100644
--- a/Core/StandardSamples/StandardSimulations.cpp
+++ b/Core/StandardSamples/StandardSimulations.cpp
@@ -43,7 +43,7 @@ GISASSimulation *StandardSimulations::IsGISAXS01()
 GISASSimulation *StandardSimulations::IsGISAXS02()
 {
     SampleBuilderFactory factory;
-    SampleBuilder_t builder = factory.createBuilder("isgisaxs02");
+    SampleBuilder_t builder = factory.createBuilder("TwoTypesCylindersDistributionBuilder");
 
     GISASSimulation *result = new GISASSimulation();
 
diff --git a/GUI/coregui/Models/GUIExamplesFactory.cpp b/GUI/coregui/Models/GUIExamplesFactory.cpp
index 5e5d1d81e1a1dfe2f6baa191d46598a4a6ef1ec3..2e55e7aa9a0dbfa287e2dd41956065ff4252987b 100644
--- a/GUI/coregui/Models/GUIExamplesFactory.cpp
+++ b/GUI/coregui/Models/GUIExamplesFactory.cpp
@@ -40,6 +40,7 @@ QMap<QString, QString > init_NameToRegistry()
 
     // temporary for testing
     //result["example09"] = "MultipleLayoutBuilder";
+    //result["example09"] = "TwoTypesCylindersDistributionBuilder";
 
     return result;
 }
diff --git a/Tests/FunctionalTests/TestCore/BatchSimulation/BatchSimulation.cpp b/Tests/FunctionalTests/TestCore/BatchSimulation/BatchSimulation.cpp
index d5739331a7dcb8fd5c7e0eeb2625fc037ad5e8cf..be5e693be50775aa342e24bac8ab8f437aa0b66c 100644
--- a/Tests/FunctionalTests/TestCore/BatchSimulation/BatchSimulation.cpp
+++ b/Tests/FunctionalTests/TestCore/BatchSimulation/BatchSimulation.cpp
@@ -1,4 +1,4 @@
-#include "FunctionalTestRegistry.h"
+#include "ObsoleteFunctionalTestRegistry.h"
 #include "FileSystem.h"
 #include "SimulationRegistry.h"
 #include "IntensityDataIOFactory.h"
@@ -42,12 +42,12 @@ int TestBatchSimulation()
     std::cout << "BatchSimulation" << " " << "Running simulations in batch mode" << " " << diff
               << " " << (diff>threshold ? "[FAILED]" : "[OK]") << std::endl;
 
-    if( diff > threshold ) return FunctionalTest::FAILED;
+    if( diff > threshold ) return ObsoleteFunctionalTest::FAILED;
 
     delete simulation;
     delete reference;
 
-    return FunctionalTest::SUCCESS;
+    return ObsoleteFunctionalTest::SUCCESS;
 }
 
 
diff --git a/Tests/FunctionalTests/TestCore/CMakeLists.txt b/Tests/FunctionalTests/TestCore/CMakeLists.txt
index 898b4b4bd81b757523d95fd4fc979dadfb364427..bda4a1e6270fbef8d11501ea2ce5ad4b82b8bede 100644
--- a/Tests/FunctionalTests/TestCore/CMakeLists.txt
+++ b/Tests/FunctionalTests/TestCore/CMakeLists.txt
@@ -58,21 +58,22 @@ endforeach()
 # ------------------------------------------------------------------------------------------------
 
 set(list_of_tests
-    "CoreSuite/FormFactors"
-    "CoreSuite/CylindersAndPrisms"
-    "CoreSuite/RadialParaCrystal"
-    "CoreSuite/TwoDimParaCrystal"
-    "CoreSuite/CoreShellParticle"
-    "CoreSuite/MultiLayerWithRoughness"
-    "CoreSuite/SquareLattice"
-    "CoreSuite/CenteredSquareLattice"
-    "CoreSuite/RotatedSquareLattice"
-    "CoreSuite/RotatedPyramids"
-    "CoreSuite/ParticleComposition"
-    "CoreSuite/CylindersWithSizeDistribution"
-    "CoreSuite/BeamDivergence"
-    "CoreSuite/DetectorResolution"
-    "CoreSuite/MultipleLayout"
+#    "CoreSuite/FormFactors"
+#    "CoreSuite/CylindersAndPrisms"
+#    "CoreSuite/RadialParaCrystal"
+#    "CoreSuite/TwoDimParaCrystal"
+#    "CoreSuite/CoreShellParticle"
+#    "CoreSuite/MultiLayerWithRoughness"
+#    "CoreSuite/SquareLattice"
+#    "CoreSuite/CenteredSquareLattice"
+#    "CoreSuite/RotatedSquareLattice"
+#    "CoreSuite/RotatedPyramids"
+#    "CoreSuite/ParticleComposition"
+#    "CoreSuite/CylindersWithSizeDistribution"
+    "CoreSuite/TwoTypesCylindersDistribution"
+#    "CoreSuite/BeamDivergence"
+#    "CoreSuite/DetectorResolution"
+#    "CoreSuite/MultipleLayout"
 )
 
 
diff --git a/Tests/FunctionalTests/TestCore/IsGISAXS07/IsGISAXS07.cpp b/Tests/FunctionalTests/TestCore/IsGISAXS07/IsGISAXS07.cpp
index eff2cd2b916b19f8d810d5e7dd4572a3fee85d42..ae16198d021ce2d172fd8a9f7ac2b11909f43fd1 100644
--- a/Tests/FunctionalTests/TestCore/IsGISAXS07/IsGISAXS07.cpp
+++ b/Tests/FunctionalTests/TestCore/IsGISAXS07/IsGISAXS07.cpp
@@ -1,4 +1,4 @@
-#include "FunctionalTestRegistry.h"
+#include "ObsoleteFunctionalTestRegistry.h"
 #include "FileSystem.h"
 
 int main(int argc, char **argv)
diff --git a/Tests/FunctionalTests/TestCore/IsGISAXS08a/IsGISAXS08a.cpp b/Tests/FunctionalTests/TestCore/IsGISAXS08a/IsGISAXS08a.cpp
index ddfad81922c6a0d54e64b8198429f8876e732ce0..971d7fb7b4b73dc547c42d147ba8d555c0c753ba 100644
--- a/Tests/FunctionalTests/TestCore/IsGISAXS08a/IsGISAXS08a.cpp
+++ b/Tests/FunctionalTests/TestCore/IsGISAXS08a/IsGISAXS08a.cpp
@@ -1,4 +1,4 @@
-#include "FunctionalTestRegistry.h"
+#include "ObsoleteFunctionalTestRegistry.h"
 #include "FileSystem.h"
 
 int main(int argc, char **argv)
diff --git a/Tests/FunctionalTests/TestCore/IsGISAXS08b/IsGISAXS08b.cpp b/Tests/FunctionalTests/TestCore/IsGISAXS08b/IsGISAXS08b.cpp
index 0ebbaec0d9ebdea67f8b46b6960e10ba517f6266..d27b9eef5410d2edf0fea79a2340d289b9d486d7 100644
--- a/Tests/FunctionalTests/TestCore/IsGISAXS08b/IsGISAXS08b.cpp
+++ b/Tests/FunctionalTests/TestCore/IsGISAXS08b/IsGISAXS08b.cpp
@@ -1,4 +1,4 @@
-#include "FunctionalTestRegistry.h"
+#include "ObsoleteFunctionalTestRegistry.h"
 #include "FileSystem.h"
 
 int main(int argc, char **argv)
diff --git a/Tests/FunctionalTests/TestCore/IsGISAXS10/IsGISAXS10.cpp b/Tests/FunctionalTests/TestCore/IsGISAXS10/IsGISAXS10.cpp
index 25168ef1d04d5c9eaa9b99e524f99a9595086be6..65e2b50d863a8f4e01f3c34db0957e398fdc9288 100644
--- a/Tests/FunctionalTests/TestCore/IsGISAXS10/IsGISAXS10.cpp
+++ b/Tests/FunctionalTests/TestCore/IsGISAXS10/IsGISAXS10.cpp
@@ -1,4 +1,4 @@
-#include "FunctionalTestRegistry.h"
+#include "ObsoleteFunctionalTestRegistry.h"
 #include "FileSystem.h"
 
 int main(int argc, char **argv)
diff --git a/Tests/FunctionalTests/TestCore/IsGISAXS15/IsGISAXS15.cpp b/Tests/FunctionalTests/TestCore/IsGISAXS15/IsGISAXS15.cpp
index 0a9943137a87798e19503584b59e9d3e1703c8f2..5c57657fbb16eb15b642d7fe08ded72fcea2812a 100644
--- a/Tests/FunctionalTests/TestCore/IsGISAXS15/IsGISAXS15.cpp
+++ b/Tests/FunctionalTests/TestCore/IsGISAXS15/IsGISAXS15.cpp
@@ -1,4 +1,4 @@
-#include "FunctionalTestRegistry.h"
+#include "ObsoleteFunctionalTestRegistry.h"
 #include "FileSystem.h"
 
 int main(int argc, char **argv)
diff --git a/Tests/FunctionalTests/TestCore/MesoCrystal1/MesoCrystal1.cpp b/Tests/FunctionalTests/TestCore/MesoCrystal1/MesoCrystal1.cpp
index 483ab27bbd8515cf229688f3a5ee23e5a65fd206..4680ff8d8c6b4407b82f7b9f4e0c214716204771 100644
--- a/Tests/FunctionalTests/TestCore/MesoCrystal1/MesoCrystal1.cpp
+++ b/Tests/FunctionalTests/TestCore/MesoCrystal1/MesoCrystal1.cpp
@@ -1,4 +1,4 @@
-#include "FunctionalTestRegistry.h"
+#include "ObsoleteFunctionalTestRegistry.h"
 #include "FileSystem.h"
 
 int main(int argc, char **argv)
diff --git a/Tests/FunctionalTests/TestCore/PolDWBAMagCylinders1/PolDWBAMagCylinders1.cpp b/Tests/FunctionalTests/TestCore/PolDWBAMagCylinders1/PolDWBAMagCylinders1.cpp
index b25a2ad68c5dde058605d534a03aafd7705db735..434d6fea5485c0a16f9c4e3054fc6900372235fe 100644
--- a/Tests/FunctionalTests/TestCore/PolDWBAMagCylinders1/PolDWBAMagCylinders1.cpp
+++ b/Tests/FunctionalTests/TestCore/PolDWBAMagCylinders1/PolDWBAMagCylinders1.cpp
@@ -1,4 +1,4 @@
-#include "FunctionalTestRegistry.h"
+#include "ObsoleteFunctionalTestRegistry.h"
 #include "FileSystem.h"
 
 int main(int argc, char **argv)
diff --git a/Tests/FunctionalTests/TestCore/PolDWBAMagCylinders2/PolDWBAMagCylinders2.cpp b/Tests/FunctionalTests/TestCore/PolDWBAMagCylinders2/PolDWBAMagCylinders2.cpp
index a6fced6509386a4e1f268512c9fee77ed5361daf..e7aee93566b7c7fb3bdae5c7e0247134089cf70d 100644
--- a/Tests/FunctionalTests/TestCore/PolDWBAMagCylinders2/PolDWBAMagCylinders2.cpp
+++ b/Tests/FunctionalTests/TestCore/PolDWBAMagCylinders2/PolDWBAMagCylinders2.cpp
@@ -1,4 +1,4 @@
-#include "FunctionalTestRegistry.h"
+#include "ObsoleteFunctionalTestRegistry.h"
 #include "FileSystem.h"
 #include "IntensityDataFunctions.h"
 #include "IntensityDataIOFactory.h"
diff --git a/Tests/FunctionalTests/TestCore/Ripple1/ripple1.cpp b/Tests/FunctionalTests/TestCore/Ripple1/ripple1.cpp
index 3d65bbb7e3dde684480c0a550f4ece6470c39ecf..45ffeba65872e43650fb15932e0b30b93a519ea5 100644
--- a/Tests/FunctionalTests/TestCore/Ripple1/ripple1.cpp
+++ b/Tests/FunctionalTests/TestCore/Ripple1/ripple1.cpp
@@ -1,4 +1,4 @@
-#include "FunctionalTestRegistry.h"
+#include "ObsoleteFunctionalTestRegistry.h"
 #include "FileSystem.h"
 
 int main(int argc, char **argv)
diff --git a/Tests/FunctionalTests/TestCore/Ripple2/ripple2.cpp b/Tests/FunctionalTests/TestCore/Ripple2/ripple2.cpp
index 7d55dfa3a2f4f09e62d23951092808954a6553ec..0e2a9d0eba3a37fecbf45e129a9426c74fce00ff 100644
--- a/Tests/FunctionalTests/TestCore/Ripple2/ripple2.cpp
+++ b/Tests/FunctionalTests/TestCore/Ripple2/ripple2.cpp
@@ -1,4 +1,4 @@
-#include "FunctionalTestRegistry.h"
+#include "ObsoleteFunctionalTestRegistry.h"
 #include "FileSystem.h"
 
 int main(int argc, char **argv)
diff --git a/Tests/FunctionalTests/TestGUI/CMakeLists.txt b/Tests/FunctionalTests/TestGUI/CMakeLists.txt
index c8a6fe008bbc424d7e2c578dcd425d741836f550..dc721c4f712af33696a9a5c27ad13a215fe237cd 100644
--- a/Tests/FunctionalTests/TestGUI/CMakeLists.txt
+++ b/Tests/FunctionalTests/TestGUI/CMakeLists.txt
@@ -23,20 +23,21 @@ include_directories(
 )
 
 set(list_of_tests
-    "GUISuite/FormFactors"
-    "GUISuite/CylindersAndPrisms"
-    "GUISuite/RadialParaCrystal"
-    "GUISuite/TwoDimParaCrystal"
-    "GUISuite/CoreShellParticle"
-    "GUISuite/MultiLayerWithRoughness"
-    "GUISuite/SquareLattice"
-    "GUISuite/CenteredSquareLattice"
-    "GUISuite/RotatedSquareLattice"
-    "GUISuite/RotatedPyramids"
-    "GUISuite/ParticleComposition"
-    "GUISuite/CylindersWithSizeDistribution"
-    "GUISuite/BeamDivergence"
-    "GUISuite/DetectorResolution"
+#    "GUISuite/FormFactors"
+#    "GUISuite/CylindersAndPrisms"
+#    "GUISuite/RadialParaCrystal"
+#    "GUISuite/TwoDimParaCrystal"
+#    "GUISuite/CoreShellParticle"
+#    "GUISuite/MultiLayerWithRoughness"
+#    "GUISuite/SquareLattice"
+#    "GUISuite/CenteredSquareLattice"
+#    "GUISuite/RotatedSquareLattice"
+#    "GUISuite/RotatedPyramids"
+#    "GUISuite/ParticleComposition"
+#    "GUISuite/CylindersWithSizeDistribution"
+##    "GUISuite/TwoTypesCylindersDistribution" # broken
+#    "GUISuite/BeamDivergence"
+#    "GUISuite/DetectorResolution"
     "GUISuite/MultipleLayout"
 )
 
diff --git a/Tests/FunctionalTests/TestPyCore/CMakeLists.txt b/Tests/FunctionalTests/TestPyCore/CMakeLists.txt
index c4cc9ff0c6b2048b532a09c5486d9c354ddeaaff..b8b29a28f62bfd5d0c9620ee3e87f847e9b691a0 100644
--- a/Tests/FunctionalTests/TestPyCore/CMakeLists.txt
+++ b/Tests/FunctionalTests/TestPyCore/CMakeLists.txt
@@ -57,21 +57,22 @@ include_directories(
 # ------------------------------------------------------------------------------------------------
 
 set(list_of_tests
-    "PySuite/CylindersAndPrisms"
-    "PySuite/FormFactors"
-    "PySuite/RadialParaCrystal"
-    "PySuite/TwoDimParaCrystal"
-    "PySuite/CoreShellParticle"
-    "PySuite/MultiLayerWithRoughness"
-    "PySuite/SquareLattice"
-    "PySuite/CenteredSquareLattice"
-    "PySuite/RotatedSquareLattice"
-    "PySuite/RotatedPyramids"
-    "PySuite/ParticleComposition"
+#    "PySuite/CylindersAndPrisms"
+#    "PySuite/FormFactors"
+#    "PySuite/RadialParaCrystal"
+#    "PySuite/TwoDimParaCrystal"
+#    "PySuite/CoreShellParticle"
+#    "PySuite/MultiLayerWithRoughness"
+#    "PySuite/SquareLattice"
+#    "PySuite/CenteredSquareLattice"
+#    "PySuite/RotatedSquareLattice"
+#    "PySuite/RotatedPyramids"
+#    "PySuite/ParticleComposition"
     "PySuite/CylindersWithSizeDistribution"
-    "PySuite/BeamDivergence"
-#    "PySuite/DetectorResolution" # not yet implemented
-    "PySuite/MultipleLayout"
+    "PySuite/TwoTypesCylindersDistribution"
+#    "PySuite/BeamDivergence"
+##    "PySuite/DetectorResolution" # not yet implemented
+#    "PySuite/MultipleLayout"
 )