diff --git a/Modules/Pharmacokinetics/src/Models/mitkDescriptivePharmacokineticBrixModel.cpp b/Modules/Pharmacokinetics/src/Models/mitkDescriptivePharmacokineticBrixModel.cpp
index 6e43f11d5b..438f0353c3 100644
--- a/Modules/Pharmacokinetics/src/Models/mitkDescriptivePharmacokineticBrixModel.cpp
+++ b/Modules/Pharmacokinetics/src/Models/mitkDescriptivePharmacokineticBrixModel.cpp
@@ -1,257 +1,263 @@
 /*============================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center (DKFZ)
 All rights reserved.
 
 Use of this source code is governed by a 3-clause BSD license that can be
 found in the LICENSE file.
 
 ============================================================================*/
 
 #include "mitkDescriptivePharmacokineticBrixModel.h"
 
 const std::string mitk::DescriptivePharmacokineticBrixModel::MODEL_DISPLAY_NAME =
   "Descriptive Pharmacokinetic Brix Model";
 
 const std::string mitk::DescriptivePharmacokineticBrixModel::NAME_PARAMETER_A = "A";
 const std::string mitk::DescriptivePharmacokineticBrixModel::NAME_PARAMETER_kep = "kep";
 const std::string mitk::DescriptivePharmacokineticBrixModel::NAME_PARAMETER_kel = "kel";
 //tlag in minutes
 const std::string mitk::DescriptivePharmacokineticBrixModel::NAME_PARAMETER_tlag = "tlag";
 
 const std::string mitk::DescriptivePharmacokineticBrixModel::UNIT_PARAMETER_A = "a.u.";
 const std::string mitk::DescriptivePharmacokineticBrixModel::UNIT_PARAMETER_kep = "1/min";
 const std::string mitk::DescriptivePharmacokineticBrixModel::UNIT_PARAMETER_kel = "1/min";
 //tlag in minutes
 const std::string mitk::DescriptivePharmacokineticBrixModel::UNIT_PARAMETER_tlag = "min";
 
 const std::string mitk::DescriptivePharmacokineticBrixModel::NAME_STATIC_PARAMETER_Tau = "Tau";
 const std::string mitk::DescriptivePharmacokineticBrixModel::NAME_STATIC_PARAMETER_S0 = "S0";
 
 const std::string mitk::DescriptivePharmacokineticBrixModel::UNIT_STATIC_PARAMETER_Tau = "min";
 const std::string mitk::DescriptivePharmacokineticBrixModel::UNIT_STATIC_PARAMETER_S0 = "I";
 
 const unsigned int mitk::DescriptivePharmacokineticBrixModel::POSITION_PARAMETER_A = 0;
 const unsigned int mitk::DescriptivePharmacokineticBrixModel::POSITION_PARAMETER_kep = 1;
 const unsigned int mitk::DescriptivePharmacokineticBrixModel::POSITION_PARAMETER_kel = 2;
 const unsigned int mitk::DescriptivePharmacokineticBrixModel::POSITION_PARAMETER_tlag = 3;
 
 const unsigned int mitk::DescriptivePharmacokineticBrixModel::NUMBER_OF_PARAMETERS = 4;
 
 std::string mitk::DescriptivePharmacokineticBrixModel::GetModelDisplayName() const
 {
   return MODEL_DISPLAY_NAME;
 };
 
 std::string mitk::DescriptivePharmacokineticBrixModel::GetModelType() const
 {
   return "Perfusion.MR";
 };
 
 std::string mitk::DescriptivePharmacokineticBrixModel::GetXAxisName() const
 {
   return "Time";
 };
 
 std::string mitk::DescriptivePharmacokineticBrixModel::GetXAxisUnit() const
 {
   return "s";
 }
 
 std::string mitk::DescriptivePharmacokineticBrixModel::GetYAxisName() const
 {
   return "";
 };
 
 std::string mitk::DescriptivePharmacokineticBrixModel::GetYAxisUnit() const
 {
   return "";
 }
 
 mitk::DescriptivePharmacokineticBrixModel::DescriptivePharmacokineticBrixModel(): m_Tau(0), m_S0(1)
 {
 
 }
 
 mitk::DescriptivePharmacokineticBrixModel::~DescriptivePharmacokineticBrixModel()
 {
 
 }
 
 mitk::DescriptivePharmacokineticBrixModel::ParameterNamesType
 mitk::DescriptivePharmacokineticBrixModel::GetParameterNames() const
 {
   ParameterNamesType result;
 
   result.push_back(NAME_PARAMETER_A);
   result.push_back(NAME_PARAMETER_kep);
   result.push_back(NAME_PARAMETER_kel);
   result.push_back(NAME_PARAMETER_tlag);
 
   return result;
 }
 
 mitk::DescriptivePharmacokineticBrixModel::ParametersSizeType
 mitk::DescriptivePharmacokineticBrixModel::GetNumberOfParameters() const
 {
   return NUMBER_OF_PARAMETERS;
 }
 
 mitk::DescriptivePharmacokineticBrixModel::ParamterUnitMapType
 mitk::DescriptivePharmacokineticBrixModel::GetParameterUnits() const
 {
   ParamterUnitMapType result;
 
   result.insert(std::make_pair(NAME_PARAMETER_A, UNIT_PARAMETER_A));
   result.insert(std::make_pair(NAME_PARAMETER_kep, UNIT_PARAMETER_kep));
   result.insert(std::make_pair(NAME_PARAMETER_kel, UNIT_PARAMETER_kel));
   result.insert(std::make_pair(NAME_PARAMETER_tlag, UNIT_PARAMETER_tlag));
 
   return result;
 };
 
 mitk::DescriptivePharmacokineticBrixModel::ParameterNamesType
 mitk::DescriptivePharmacokineticBrixModel::GetStaticParameterNames() const
 {
   ParameterNamesType result;
 
   result.push_back(NAME_STATIC_PARAMETER_Tau);
   result.push_back(NAME_STATIC_PARAMETER_S0);
 
   return result;
 }
 
 mitk::DescriptivePharmacokineticBrixModel::ParamterUnitMapType
 mitk::DescriptivePharmacokineticBrixModel::GetStaticParameterUnits() const
 {
   ParamterUnitMapType result;
 
   result.insert(std::make_pair(NAME_STATIC_PARAMETER_Tau, UNIT_STATIC_PARAMETER_Tau));
   result.insert(std::make_pair(NAME_STATIC_PARAMETER_S0, UNIT_STATIC_PARAMETER_S0));
 
   return result;
 };
 
 mitk::DescriptivePharmacokineticBrixModel::ParametersSizeType
 mitk::DescriptivePharmacokineticBrixModel::GetNumberOfStaticParameters() const
 {
-  return 1;
+  return 2;
 }
 
 
 mitk::DescriptivePharmacokineticBrixModel::ModelResultType
 mitk::DescriptivePharmacokineticBrixModel::ComputeModelfunction(const ParametersType& parameters)
 const
 {
   if (m_TimeGrid.GetSize() == 0)
   {
     itkExceptionMacro("No Time Grid Set! Cannot Calculate Signal");
   }
 
   if (m_Tau == 0)
   {
     itkExceptionMacro("Injection time is 0! Cannot Calculate Signal");
   }
 
+
   ModelResultType signal(m_TimeGrid.GetSize());
 
   double tx        = 0;
   double amplitude = parameters[POSITION_PARAMETER_A];
   double       kel = parameters[POSITION_PARAMETER_kel];
   double       kep = parameters[POSITION_PARAMETER_kep];
   double      tlag = parameters[POSITION_PARAMETER_tlag];
 
+  if (kep == kel)
+  {
+    itkExceptionMacro("(kep-kel) is 0! Cannot Calculate Signal");
+  }
+
   TimeGridType::const_iterator timeGridEnd = m_TimeGrid.end();
   ModelResultType::iterator signalPos = signal.begin();
 
   for (TimeGridType::const_iterator gridPos = m_TimeGrid.begin(); gridPos != timeGridEnd;
        ++gridPos, ++signalPos)
   {
     double t = (*gridPos) / 60.0; //convert from [sec] to [min]
 
 
     if (t <= tlag)
     {
       tx = 0;
     }
     else if ((t > tlag) && (t < (m_Tau + tlag)))
     {
       tx = t - tlag;
     }
     else if (t >= (m_Tau + tlag))
     {
       tx = m_Tau;
     }
 
     double kDiff  = kep - kel;
     double tDiff  = t - tlag;
 
     double expkel   = (kep * exp(-kel * tDiff));
     double expkeltx =        exp(kel * tx);
     double expkep   =        exp(-kep * tDiff);
     double expkeptx =        exp(kep * tx);
 
     double value =  1 + (amplitude / m_Tau) * (((expkel / (kel * kDiff)) * (expkeltx - 1)) - ((
                       expkep / kDiff)  * (expkeptx - 1)));
 
     *signalPos = value * m_S0;
   }
 
   return signal;
 
 }
 
 void mitk::DescriptivePharmacokineticBrixModel::SetStaticParameter(const ParameterNameType& name,
     const StaticParameterValuesType& values)
 {
   if (name == NAME_STATIC_PARAMETER_Tau)
   {
     SetTau(values[0]);
   }
 
   if (name == NAME_STATIC_PARAMETER_S0)
   {
     SetS0(values[0]);
   }
 };
 
 mitk::DescriptivePharmacokineticBrixModel::StaticParameterValuesType
 mitk::DescriptivePharmacokineticBrixModel::GetStaticParameterValue(const ParameterNameType& name)
 const
 {
   StaticParameterValuesType result;
 
   if (name == NAME_STATIC_PARAMETER_Tau)
   {
     result.push_back(GetTau());
   }
 
   if (name == NAME_STATIC_PARAMETER_S0)
   {
     result.push_back(GetS0());
   }
 
   return result;
 };
 
 itk::LightObject::Pointer mitk::DescriptivePharmacokineticBrixModel::InternalClone() const
 {
   DescriptivePharmacokineticBrixModel::Pointer newClone = DescriptivePharmacokineticBrixModel::New();
 
   newClone->SetTimeGrid(this->m_TimeGrid);
   newClone->SetTau(this->m_Tau);
   newClone->SetS0(this->m_S0);
 
   return newClone.GetPointer();
 };
 
 void mitk::DescriptivePharmacokineticBrixModel::PrintSelf(std::ostream& os,
     ::itk::Indent indent) const
 {
   Superclass::PrintSelf(os, indent);
 
   os << indent << "Tau (injection time): " << m_Tau;
   os << indent << "S0 (base value): " << m_S0;
 };
diff --git a/Modules/Pharmacokinetics/test/mitkDescriptivePharmacokineticBrixModelTest.cpp b/Modules/Pharmacokinetics/test/mitkDescriptivePharmacokineticBrixModelTest.cpp
index e6035ab22b..acb5b64ca1 100644
--- a/Modules/Pharmacokinetics/test/mitkDescriptivePharmacokineticBrixModelTest.cpp
+++ b/Modules/Pharmacokinetics/test/mitkDescriptivePharmacokineticBrixModelTest.cpp
@@ -1,60 +1,165 @@
 /*============================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center (DKFZ)
 All rights reserved.
 
 Use of this source code is governed by a 3-clause BSD license that can be
 found in the LICENSE file.
 
 ============================================================================*/
 
+// Testing
 #include "mitkTestingMacros.h"
-#include "mitkVector.h"
+#include "mitkTestFixture.h"
 
+//MITK includes
+#include "mitkVector.h"
 #include "mitkDescriptivePharmacokineticBrixModel.h"
 
+class mitkDescriptivePharmacokineticBrixModelTestSuite : public mitk::TestFixture
+{
+  CPPUNIT_TEST_SUITE(mitkDescriptivePharmacokineticBrixModelTestSuite);
+  MITK_TEST(GetModelDisplayNameTest);
+  MITK_TEST(GetModelTypeTest);
+  MITK_TEST(GetXAxisNameTest);
+  MITK_TEST(GetXAxisUnitTest);
+  MITK_TEST(GetYAxisNameTest);
+  MITK_TEST(GetYAxisUnitTest);
+  MITK_TEST(GetParameterNamesTest);
+  MITK_TEST(GetNumberOfParametersTest);
+  MITK_TEST(GetParameterUnitsTest);
+  MITK_TEST(GetStaticParameterNamesTest);
+  MITK_TEST(GetNumberOfStaticParametersTest);
+  MITK_TEST(GetStaticParameterUnitsTest);
+  MITK_TEST(ComputeModelfunctionTest);
+  CPPUNIT_TEST_SUITE_END();
+
+  private:
+    mitk::DescriptivePharmacokineticBrixModel::Pointer m_testmodel;
+    std::string NAME_PARAMETER_A, POSITION_PARAMETER_kep, POSITION_PARAMETER_kel, POSITION_PARAMETER_tlag;
+    mitk::ModelBase::ModelResultType m_output;
+
+  public:
+    void setUp() override
+    {
+      mitk::ModelBase::TimeGridType m_grid(22);
+      mitk::ModelBase::ParametersType m_testparameters(4);
+
+      m_testparameters[mitk::DescriptivePharmacokineticBrixModel::POSITION_PARAMETER_A] = 1.25;
+      m_testparameters(mitk::DescriptivePharmacokineticBrixModel::POSITION_PARAMETER_kep) = 3.89;
+      m_testparameters(mitk::DescriptivePharmacokineticBrixModel::POSITION_PARAMETER_kel) = 0.12;
+      m_testparameters(mitk::DescriptivePharmacokineticBrixModel::POSITION_PARAMETER_tlag) = 1.14;
+
+      for (int i = 0; i < 22; ++i)
+      {
+        // time grid in seconds, 14s between frames
+        m_grid[i] = (double)14 * i;
+      }
+      //injection time in minutes --> 30s
+      double m_injectiontime = 0.5;
+      m_testmodel = mitk::DescriptivePharmacokineticBrixModel::New();
+      m_testmodel->SetTimeGrid(m_grid);
+      m_testmodel->SetTau(m_injectiontime);
+
+      //ComputeModelfunction is called within GetSignal(), therefore no explicit testing of ComputeModelFunction()
+      m_output = m_testmodel->GetSignal(m_testparameters);
+    }
 
+    void tearDown() override
+    {
+      m_testmodel = nullptr;
+      NAME_PARAMETER_A = "";
+      POSITION_PARAMETER_kep = "";
+      POSITION_PARAMETER_kel = "";
+      POSITION_PARAMETER_tlag = "";
+      m_output.clear();
+    }
+
+    void GetModelDisplayNameTest()
+    {
+      m_testmodel->GetModelDisplayName();
+      CPPUNIT_ASSERT_MESSAGE("Checking model display name.", m_testmodel->GetModelDisplayName() == "Descriptive Pharmacokinetic Brix Model");
+    }
+
+    void GetModelTypeTest()
+    {
+      CPPUNIT_ASSERT_MESSAGE("Checking model type.", m_testmodel->GetModelType() == "Perfusion.MR");
+    }
+
+    void GetXAxisNameTest()
+    {
+      CPPUNIT_ASSERT_MESSAGE("Checking x-axis name.", m_testmodel->GetXAxisName() == "Time");
+    }
+
+    void GetXAxisUnitTest()
+    {
+      CPPUNIT_ASSERT_MESSAGE("Checking x-axis unit", m_testmodel->GetXAxisUnit() == "s");
+    }
 
-int mitkDescriptivePharmacokineticBrixModelTest(int  /*argc*/ , char*[] /*argv[]*/){
+    void GetYAxisNameTest()
+    {
+      CPPUNIT_ASSERT_MESSAGE("Checking y-axis name.", m_testmodel->GetYAxisName() == "");
+    }
 
-    MITK_TEST_BEGIN("DescriptivePharmacokineticBrixModel")
+    void GetYAxisUnitTest()
+    {
+      CPPUNIT_ASSERT_MESSAGE("Checking y-axis unit", m_testmodel->GetYAxisUnit() == "");
+    }
 
-    mitk::ModelBase::TimeGridType grid(22);
-    mitk::ModelBase::ModelResultType output;
-    mitk::ModelBase::ParametersType testparameters(4);
+    void GetParameterNamesTest()
+    {
+      mitk::DescriptivePharmacokineticBrixModel::ParameterNamesType parameterNames;
+      parameterNames.push_back("A");
+      parameterNames.push_back("kep");
+      parameterNames.push_back("kel");
+      parameterNames.push_back("tlag");
+      CPPUNIT_ASSERT_MESSAGE("Checking parameter names.", m_testmodel->GetParameterNames() == parameterNames);
+    }
 
-    testparameters[mitk::DescriptivePharmacokineticBrixModel::POSITION_PARAMETER_A] = 1.25;
-    testparameters(mitk::DescriptivePharmacokineticBrixModel::POSITION_PARAMETER_kep) = 3.89;
-    testparameters(mitk::DescriptivePharmacokineticBrixModel::POSITION_PARAMETER_kel) = 0.12;
-    testparameters(mitk::DescriptivePharmacokineticBrixModel::POSITION_PARAMETER_tlag) = 1.14;
+    void GetNumberOfParametersTest()
+    {
+      CPPUNIT_ASSERT_MESSAGE("Checking number of parameters in model.", m_testmodel->GetNumberOfParameters() == 4);
+    }
 
+    void GetParameterUnitsTest()
+    {
+      mitk::DescriptivePharmacokineticBrixModel::ParamterUnitMapType parameterUnitMap;
+      parameterUnitMap.insert(std::make_pair("A", "a.u."));
+      parameterUnitMap.insert(std::make_pair("kep", "1/min"));
+      parameterUnitMap.insert(std::make_pair("kel", "1/min"));
+      parameterUnitMap.insert(std::make_pair("tlag", "min"));
+      CPPUNIT_ASSERT_MESSAGE("Checking parameter unit map.", m_testmodel->GetParameterUnits() == parameterUnitMap);
+    }
 
+    void GetStaticParameterNamesTest()
+    {
+      mitk::DescriptivePharmacokineticBrixModel::ParameterNamesType staticParameterNames;
+      staticParameterNames.push_back("Tau");
+      staticParameterNames.push_back("S0");
+      CPPUNIT_ASSERT_MESSAGE("Checking static parameter names.", m_testmodel->GetStaticParameterNames() == staticParameterNames);
+    }
 
-    for (int i = 0; i<22; ++i)
+    void GetNumberOfStaticParametersTest()
     {
-   // time grid in seconds, 14s between frames
-      grid[i]=(double) 14*i;
+      CPPUNIT_ASSERT_MESSAGE("Checking number of static parameters.", m_testmodel->GetNumberOfStaticParameters() == 2);
     }
-    //injection time in minutes --> 60s
-    double injectiontime = 0.5;
-    mitk::DescriptivePharmacokineticBrixModel::Pointer testmodel = mitk::DescriptivePharmacokineticBrixModel::New();
-    testmodel->SetTimeGrid(grid);
-    testmodel->SetTau(injectiontime);
 
-    CPPUNIT_ASSERT_MESSAGE("Check number of parameters in Model.", 4 == testmodel->GetNumberOfParameters());
-    output = testmodel->GetSignal(testparameters);
-    //precision of output ?
-    MITK_TEST_CONDITION_REQUIRED(mitk::Equal(1,output[0], 1e-6, true)==true,"Check Output signal values - 0");
-    MITK_TEST_CONDITION_REQUIRED(mitk::Equal(1,output[4], 1e-6, true)==true,"Check Output signal values - 4");
-    MITK_TEST_CONDITION_REQUIRED(mitk::Equal(1.003338,output[5], 1e-6, true)==true,"Check Output signal values - 5");
-    MITK_TEST_CONDITION_REQUIRED(mitk::Equal(1.238392,output[6], 1e-6, true)==true,"Check Output signal values - 6");
-    MITK_TEST_CONDITION_REQUIRED(mitk::Equal(1.669835,output[7], 1e-6, true)==true,"Check Output signal values - 7");
-    MITK_TEST_CONDITION_REQUIRED(mitk::Equal(1.982948,output[8], 1e-6, true)==true,"Check Output signal values - 8");
-    MITK_TEST_CONDITION_REQUIRED(mitk::Equal(2.089685,output[9], 1e-6, true)==true,"Check Output signal values - 9");
-    MITK_TEST_CONDITION_REQUIRED(mitk::Equal(2.113611,output[10], 1e-6, true)==true,"Check Output signal values - 10");
+    void GetStaticParameterUnitsTest()
+    {
+      mitk::DescriptivePharmacokineticBrixModel::ParamterUnitMapType staticParameterUnitMap;
+      staticParameterUnitMap.insert(std::make_pair("Tau", "min"));
+      staticParameterUnitMap.insert(std::make_pair("S0", "I"));
+      CPPUNIT_ASSERT_MESSAGE("Checking static parameters units.", m_testmodel->GetStaticParameterUnits() == staticParameterUnitMap);
+    }
 
-    MITK_TEST_END()
+    void ComputeModelfunctionTest()
+    {
+      CPPUNIT_ASSERT_MESSAGE("Checking signal of parameter set 1 at time frame 0.", mitk::Equal(1, m_output[0], 1e-6, true) == true);
+      CPPUNIT_ASSERT_MESSAGE("Checking signal of parameter set 1 at time frame 10.",mitk::Equal(2.113611, m_output[10], 1e-6, true) == true);
+      CPPUNIT_ASSERT_MESSAGE("Checking signal of parameter set 1 at time frame 20.", mitk::Equal(1.870596, m_output[20], 1e-6, true) == true);
+    }
+};
 
-}
+MITK_TEST_SUITE_REGISTRATION(mitkDescriptivePharmacokineticBrixModel)
diff --git a/Plugins/org.mitk.gui.qt.fit.inspector/src/internal/org_mitk_gui_qt_fit_inspector_Activator.h b/Plugins/org.mitk.gui.qt.fit.inspector/src/internal/org_mitk_gui_qt_fit_inspector_Activator.h
index a2e404a0a4..3b0a0fe8d2 100644
--- a/Plugins/org.mitk.gui.qt.fit.inspector/src/internal/org_mitk_gui_qt_fit_inspector_Activator.h
+++ b/Plugins/org.mitk.gui.qt.fit.inspector/src/internal/org_mitk_gui_qt_fit_inspector_Activator.h
@@ -1,32 +1,32 @@
 /*============================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center (DKFZ)
 All rights reserved.
 
 Use of this source code is governed by a 3-clause BSD license that can be
 found in the LICENSE file.
 
 ============================================================================*/
 
 
 #ifndef org_mitk_gui_qt_fit_inspector_Activator_h
 #define org_mitk_gui_qt_fit_inspector_Activator_h
 
 #include <ctkPluginActivator.h>
 
 
     class org_mitk_gui_qt_fit_inspector_Activator : public QObject, public ctkPluginActivator
     {
     Q_OBJECT
-      Q_PLUGIN_METADATA(IID "org_mitk_guit_qt_fit_inspector")
+      Q_PLUGIN_METADATA(IID "org_mitk_gui_qt_fit_inspector")
       Q_INTERFACES(ctkPluginActivator)
     public:
 
         void start(ctkPluginContext* context) override;
         void stop(ctkPluginContext* context) override;
 
     }; // org_mitk_modelfit_visualization_Activator
 
 #endif // org_mitk_modelfit_visualization_Activator_h