diff --git a/Fit/PythonAPI/src/FitSuite.pypp.cpp b/Fit/PythonAPI/src/FitSuite.pypp.cpp
index f86f464964860fa333d3f279cd2e33ee5905f7c2..6497d3b74abf81e84ca9fb7a316ea5621b3f9de8 100644
--- a/Fit/PythonAPI/src/FitSuite.pypp.cpp
+++ b/Fit/PythonAPI/src/FitSuite.pypp.cpp
@@ -62,6 +62,9 @@ void register_FitSuite_class(){
             "getMinimizer"
             , (::IMinimizer * ( ::FitSuite::* )(  ) )( &::FitSuite::getMinimizer )
             , bp::return_value_policy< bp::reference_existing_object >() )    
+        .def( 
+            "getNCalls"
+            , (::size_t ( ::FitSuite::* )(  ) const)( &::FitSuite::getNCalls ) )    
         .def( 
             "printResults"
             , (void ( ::FitSuite::* )(  ) const)( &::FitSuite::printResults ) )    
diff --git a/Macros/BoostPythonGenerator/MakePyFit.py b/Macros/BoostPythonGenerator/MakePyFit.py
index 1abc994f2a04cdad772f095713134e98a3cafe65..5188e9032651228e35e7f09533c75cbb2cf6dc26 100644
--- a/Macros/BoostPythonGenerator/MakePyFit.py
+++ b/Macros/BoostPythonGenerator/MakePyFit.py
@@ -72,6 +72,7 @@ def AdditionalRules(mb):
     cl.member_function("addSimulationAndRealData").include()
     cl.member_function("runFit").include()
     cl.member_function("printResults").include()
+    cl.member_function("getNCalls").include()
 
   if "MinimizerFactory.h" in myFiles:
     cl = mb.class_("MinimizerFactory")
diff --git a/Tests/FunctionalTests/TestCore/test_all.py b/Tests/FunctionalTests/TestCore/test_all.py
index f9df588fc08456a6c6a7fa8110d26d6f39c69272..415cbe856cf455bfe539f5025c9939abbeb8487c 100755
--- a/Tests/FunctionalTests/TestCore/test_all.py
+++ b/Tests/FunctionalTests/TestCore/test_all.py
@@ -1,9 +1,11 @@
-#
+# Run C++ core tests for libBornAgainCore library
+# Usage: python test_all.py
 import sys
 import os
 import subprocess
 import time
 
+
 Tests = [
     "IsGISAXS01",
     "IsGISAXS02",
@@ -61,7 +63,9 @@ def runTests():
 
 # print test results
 def printResults():
-    print "========================================"
+    print "-------------------------------------------------------------------------------"
+    print "TestCore Summary                                                                "
+    print "-------------------------------------------------------------------------------"
     n=1
     for x in test_info:
         print '{0:2d}. {1} {2}  {3:.3f}sec  [{4}] '.format(n, x[0],x[1],x[2],x[3])
diff --git a/Tests/FunctionalTests/TestPyCore/isgisaxs01.py b/Tests/FunctionalTests/TestPyCore/isgisaxs01.py
index d7165c0cc61874b0cc72ad3a6653c80b788674c6..8dc4c61bd37a9c38da75c5e7a93895ca0d783322 100644
--- a/Tests/FunctionalTests/TestPyCore/isgisaxs01.py
+++ b/Tests/FunctionalTests/TestPyCore/isgisaxs01.py
@@ -82,7 +82,7 @@ def GetDifference(data, reference):
 # --------------------------------------------------------------
 # run test and analyse test results
 # --------------------------------------------------------------
-def RunTest():
+def runTest():
     result = RunSimulation()
     reference = GetReferenceData()
 
@@ -96,7 +96,7 @@ def RunTest():
 # main()
 #-------------------------------------------------------------
 if __name__ == '__main__':
-  name,description,status = RunTest()
+  name,description,status = runTest()
   print name,description,status
 
 
diff --git a/Tests/FunctionalTests/TestPyCore/isgisaxs02.py b/Tests/FunctionalTests/TestPyCore/isgisaxs02.py
index 2926f8a0f87fc05d99cc242add9f1db88e3fd513..175ec16461d5bb99590d1af55971382fc6686c4f 100644
--- a/Tests/FunctionalTests/TestPyCore/isgisaxs02.py
+++ b/Tests/FunctionalTests/TestPyCore/isgisaxs02.py
@@ -102,7 +102,7 @@ def GetDifference(data, reference):
 # --------------------------------------------------------------
 # run test and analyse test results
 # --------------------------------------------------------------
-def RunTest():
+def runTest():
     result = RunSimulation()
     reference = GetReferenceData()
 
@@ -116,7 +116,7 @@ def RunTest():
 # main()
 #-------------------------------------------------------------
 if __name__ == '__main__':
-  name,description,status = RunTest()
+  name,description,status = runTest()
   print name,description,status
 
 
diff --git a/Tests/FunctionalTests/TestPyCore/isgisaxs03.py b/Tests/FunctionalTests/TestPyCore/isgisaxs03.py
index 24b29a51651d41b1becf8eb2a191c114161e4572..3cafac643fbe88992b7640a7de5763a503cb6ab9 100644
--- a/Tests/FunctionalTests/TestPyCore/isgisaxs03.py
+++ b/Tests/FunctionalTests/TestPyCore/isgisaxs03.py
@@ -161,7 +161,7 @@ def GetDifference(data, reference):
 # --------------------------------------------------------------
 # run test and analyse test results
 # --------------------------------------------------------------
-def RunTest():
+def runTest():
     resultBA = RunSimulationBA()
     resultDWBA = RunSimulationDWBA()
     resultBA_Size = RunSimulationBA_Size()
@@ -178,7 +178,7 @@ def RunTest():
 # main()
 #-------------------------------------------------------------
 if __name__ == '__main__':
-  name,description,status = RunTest()
+  name,description,status = runTest()
   print name,description,status
 
 
diff --git a/Tests/FunctionalTests/TestPyCore/isgisaxs04.py b/Tests/FunctionalTests/TestPyCore/isgisaxs04.py
index 4b7a38087505b4d88cbab70c94b16355cfb3a463..2c042224b6631a40243750e1634fe63c34afd2c8 100644
--- a/Tests/FunctionalTests/TestPyCore/isgisaxs04.py
+++ b/Tests/FunctionalTests/TestPyCore/isgisaxs04.py
@@ -121,7 +121,7 @@ def GetDifference(data, reference):
 # --------------------------------------------------------------
 # run test and analyse test results
 # --------------------------------------------------------------
-def RunTest():
+def runTest():
     result1 = RunSimulation1()
     result2 = RunSimulation2()
     result = numpy.concatenate((result1,result2),axis=0) 
@@ -137,7 +137,7 @@ def RunTest():
 # main()
 #-------------------------------------------------------------
 if __name__ == '__main__':
-  name,description,status = RunTest()
+  name,description,status = runTest()
   print name,description,status
 
 
diff --git a/Tests/FunctionalTests/TestPyCore/isgisaxs06.py b/Tests/FunctionalTests/TestPyCore/isgisaxs06.py
index e2e4f037449fbb8e51e0da628c48851edf33c47c..147371ec9fdbc1eb3f3672ab6792643d7a6cead2 100644
--- a/Tests/FunctionalTests/TestPyCore/isgisaxs06.py
+++ b/Tests/FunctionalTests/TestPyCore/isgisaxs06.py
@@ -296,7 +296,7 @@ def GetDifference(data, reference):
 # --------------------------------------------------------------
 # run test and analyse test results
 # --------------------------------------------------------------
-def RunTest():
+def runTest():
     result_lattice = RunSimulation_lattice()
     result_centered = RunSimulation_centered()
     result_rotated = RunSimulation_rotated()
@@ -316,7 +316,7 @@ def RunTest():
 # main()
 #-------------------------------------------------------------
 if __name__ == '__main__':
-  name,description,status = RunTest()
+  name,description,status = runTest()
   print name,description,status
 
 
diff --git a/Tests/FunctionalTests/TestPyCore/isgisaxs07.py b/Tests/FunctionalTests/TestPyCore/isgisaxs07.py
index 92f27abb483f70f1c4bebce60f1cabe3c9a22d8b..4b422834270ec2488658d5284b151be22fbb13f6 100644
--- a/Tests/FunctionalTests/TestPyCore/isgisaxs07.py
+++ b/Tests/FunctionalTests/TestPyCore/isgisaxs07.py
@@ -160,7 +160,7 @@ def GetDifference(data, reference):
 # --------------------------------------------------------------
 # run test and analyse test results
 # --------------------------------------------------------------
-def RunTest():
+def runTest():
     result = RunSimulation()
     reference = GetReferenceData()
 
@@ -174,7 +174,7 @@ def RunTest():
 # main()
 #-------------------------------------------------------------
 if __name__ == '__main__':
-  name,description,status = RunTest()
+  name,description,status = runTest()
   print name,description,status
 
 
diff --git a/Tests/FunctionalTests/TestPyCore/isgisaxs08.py b/Tests/FunctionalTests/TestPyCore/isgisaxs08.py
index 9a0c71a9fbd1759e992867c83e7502bb50239afc..1e2919f6171897da606880dd31db3242ae5c4bab 100644
--- a/Tests/FunctionalTests/TestPyCore/isgisaxs08.py
+++ b/Tests/FunctionalTests/TestPyCore/isgisaxs08.py
@@ -126,7 +126,7 @@ def GetDifference(data, reference):
 # --------------------------------------------------------------
 # run test and analyse test results
 # --------------------------------------------------------------
-def RunTest():
+def runTest():
     result1 = RunSimulation1()
     result2 = RunSimulation2()
     result = numpy.concatenate((result1,result2),axis=0) 
@@ -142,7 +142,7 @@ def RunTest():
 # main()
 #-------------------------------------------------------------
 if __name__ == '__main__':
-  name,description,status = RunTest()
+  name,description,status = runTest()
   print name,description,status
 
 
diff --git a/Tests/FunctionalTests/TestPyCore/isgisaxs09.py b/Tests/FunctionalTests/TestPyCore/isgisaxs09.py
index 010534e2010613fbe317a3eccf81fef2079e3219..28ca82cd20acfef3754f3e52cada92554da967a2 100644
--- a/Tests/FunctionalTests/TestPyCore/isgisaxs09.py
+++ b/Tests/FunctionalTests/TestPyCore/isgisaxs09.py
@@ -134,7 +134,7 @@ def GetDifference(data, reference):
 # --------------------------------------------------------------
 # run test and analyse test results
 # --------------------------------------------------------------
-def RunTest():
+def runTest():
     result1 = RunSimulation1()
     result2 = RunSimulation2()
     result = numpy.concatenate((result1,result2),axis=0) 
@@ -150,7 +150,7 @@ def RunTest():
 # main()
 #-------------------------------------------------------------
 if __name__ == '__main__':
-  name,description,status = RunTest()
+  name,description,status = runTest()
   print name,description,status
 
 
diff --git a/Tests/FunctionalTests/TestPyCore/isgisaxs10.py b/Tests/FunctionalTests/TestPyCore/isgisaxs10.py
index 81fcd94dfe683c89289fbacda2ecf9dcc971dbce..fd10f299ee9036bf75d50d39763c55fbc21979b0 100644
--- a/Tests/FunctionalTests/TestPyCore/isgisaxs10.py
+++ b/Tests/FunctionalTests/TestPyCore/isgisaxs10.py
@@ -78,7 +78,7 @@ def GetDifference(data, reference):
 # --------------------------------------------------------------
 # run test and analyse test results
 # --------------------------------------------------------------
-def RunTest():
+def runTest():
     result = RunSimulation()
     reference = GetReferenceData()
 
@@ -92,7 +92,7 @@ def RunTest():
 # main()
 #-------------------------------------------------------------
 if __name__ == '__main__':
-  name,description,status = RunTest()
+  name,description,status = runTest()
   print name,description,status
 
 
diff --git a/Tests/FunctionalTests/TestPyCore/isgisaxs11.py b/Tests/FunctionalTests/TestPyCore/isgisaxs11.py
index 629c5031c49f0bdf863e6955dce0a26d9188af69..b6668ebbb0048345d0c3c5f0101ce86ca5b1257a 100644
--- a/Tests/FunctionalTests/TestPyCore/isgisaxs11.py
+++ b/Tests/FunctionalTests/TestPyCore/isgisaxs11.py
@@ -84,7 +84,7 @@ def GetDifference(data, reference):
 # --------------------------------------------------------------
 # run test and analyse test results
 # --------------------------------------------------------------
-def RunTest():
+def runTest():
     result = RunSimulation()
     reference = GetReferenceData()
 
@@ -98,7 +98,7 @@ def RunTest():
 # main()
 #-------------------------------------------------------------
 if __name__ == '__main__':
-  name,description,status = RunTest()
+  name,description,status = runTest()
   print name,description,status
 
 
diff --git a/Tests/FunctionalTests/TestPyCore/isgisaxs15.py b/Tests/FunctionalTests/TestPyCore/isgisaxs15.py
index 74816e7906535fc47c08160065502f6604437022..6f477f3ee5bb6f5065480c18ba222cc57f3dc869 100644
--- a/Tests/FunctionalTests/TestPyCore/isgisaxs15.py
+++ b/Tests/FunctionalTests/TestPyCore/isgisaxs15.py
@@ -91,7 +91,7 @@ def GetDifference(data, reference):
 # --------------------------------------------------------------
 # run test and analyse test results
 # --------------------------------------------------------------
-def RunTest():
+def runTest():
     result = RunSimulation()
     reference = GetReferenceData()
 
@@ -105,7 +105,7 @@ def RunTest():
 # main()
 #-------------------------------------------------------------
 if __name__ == '__main__':
-  name,description,status = RunTest()
+  name,description,status = runTest()
   print name,description,status
 
 
diff --git a/Tests/FunctionalTests/TestPyCore/test_all.py b/Tests/FunctionalTests/TestPyCore/test_all.py
index 61d98a4b66aa707f362ff4e742f3e717c0b13238..b796aa9f4e42ab3f4ccdcf9bbcd8dbeb9f2dc135 100644
--- a/Tests/FunctionalTests/TestPyCore/test_all.py
+++ b/Tests/FunctionalTests/TestPyCore/test_all.py
@@ -1,4 +1,5 @@
-# run all tests
+# Run Python core tests for libBornAgainCore library
+# Usage: python test_all.py
 
 import sys
 import os
@@ -18,17 +19,17 @@ import isgisaxs11
 import isgisaxs15
 
 Tests = {
-    "IsGISAXS01": isgisaxs01.RunTest,
-    "IsGISAXS02": isgisaxs02.RunTest,
-    "IsGISAXS03": isgisaxs03.RunTest,
-    "IsGISAXS04": isgisaxs04.RunTest,
-    "IsGISAXS06": isgisaxs06.RunTest,
-    "IsGISAXS07": isgisaxs07.RunTest,
-    "IsGISAXS08": isgisaxs08.RunTest,
-    "IsGISAXS09": isgisaxs09.RunTest,
-    "IsGISAXS10": isgisaxs10.RunTest,
-    "IsGISAXS11": isgisaxs11.RunTest,
-    "IsGISAXS15": isgisaxs15.RunTest
+    "IsGISAXS01": isgisaxs01.runTest,
+    "IsGISAXS02": isgisaxs02.runTest,
+    "IsGISAXS03": isgisaxs03.runTest,
+    "IsGISAXS04": isgisaxs04.runTest,
+    "IsGISAXS06": isgisaxs06.runTest,
+    "IsGISAXS07": isgisaxs07.runTest,
+    "IsGISAXS08": isgisaxs08.runTest,
+    "IsGISAXS09": isgisaxs09.runTest,
+    "IsGISAXS10": isgisaxs10.runTest,
+    "IsGISAXS11": isgisaxs11.runTest,
+    "IsGISAXS15": isgisaxs15.runTest
 }
 
 test_info = []
@@ -62,7 +63,9 @@ def runTests():
 
 # print test results
 def printResults():
-    print "========================================"
+    print "-------------------------------------------------------------------------------"
+    print "TestPyCore Summary                                                             "
+    print "-------------------------------------------------------------------------------"
     n=1
     for x in test_info:
         print '{0:2d}. {1}  {2}  {3:.3f}sec  [{4}] '.format(n, x[0],x[1],x[2],x[3])