Merge branch 'objprops'

Conflicts:
	Profile.py

1 files changed, 3 insertions, 5 deletions

diff --git a/TestAll.py b/TestAll.py
index 23b34ea..b24cf5e 100644
--- a/TestAll.py
+++ b/TestAll.py
@@ -1,9 +1,7 @@
 import unittest
 from unittest import TestLoader
-import tests.TestConfigLoaders 
-import tests.TestComponentRegistry
-testSuite = TestLoader().loadTestsFromModule(tests.TestConfigLoaders)
-unittest.TextTestRunner(verbosity=2).run(testSuite)
+import tests
 
-testSuite = TestLoader().loadTestsFromModule(tests.TestComponentRegistry)
+testSuite = TestLoader().loadTestsFromModule(tests)
 unittest.TextTestRunner(verbosity=2).run(testSuite)
+