-import unittest
+from unittest import TextTestRunner
+from unittest import TestLoader
+from unittest import TestSuite
# import your test modules
-from tests.vcpeutils.SoUtils_test import *
-
+from tests.vcpeutils.SoUtils_test import SoUtilsTest
+from tests.ONAPLibrary.ProtobufKeywordsTest import ProtobufKeywordsTest
+from tests.ONAPLibrary.UUIDKeywordsTest import UUIDKeywordsTest
+from tests.ONAPLibrary.ServiceMappingKeywordsTests import ServiceMappingKeywordsTests
+from tests.ONAPLibrary.Base64KeywordsTests import Base64KeywordsTests
+from tests.ONAPLibrary.RequestsHelperTests import RequestsHelperTests
+from tests.ONAPLibrary.AAITests import AAITests
+from tests.ONAPLibrary.SOTests import SOTests
+from tests.ONAPLibrary.JSONKeywordsTest import JSONKeywordsTest
# initialize the test suite
-loader = unittest.TestLoader()
-suite = unittest.TestSuite()
+loader = TestLoader()
+suite = TestSuite()
# add tests to the test suite
+suite.addTests(loader.loadTestsFromTestCase(AAITests))
+suite.addTests(loader.loadTestsFromTestCase(SOTests))
+suite.addTests(loader.loadTestsFromTestCase(ProtobufKeywordsTest))
suite.addTests(loader.loadTestsFromTestCase(SoUtilsTest))
+suite.addTests(loader.loadTestsFromTestCase(UUIDKeywordsTest))
+suite.addTests(loader.loadTestsFromTestCase(ServiceMappingKeywordsTests))
+suite.addTests(loader.loadTestsFromTestCase(Base64KeywordsTests))
+suite.addTests(loader.loadTestsFromTestCase(RequestsHelperTests))
+suite.addTests(loader.loadTestsFromTestCase(JSONKeywordsTest))
# initialize a runner, pass it your suite and run it
-runner = unittest.TextTestRunner(verbosity=3)
+runner = TextTestRunner(verbosity=3)
result = runner.run(suite)