-import unittest
-import doctest
+"""
+The whole test suite.
+
+This module compiles the doctests and unittests from the rest of the
+codebase into one big TestSuite() and the runs it.
+"""
+
+from unittest import TestLoader, TestSuite, TextTestRunner
+from doctest import DocTestSuite
# Add '../' to our path.
from site import addsitedir
import matrices
import symmetric_linear_game
-suite = unittest.TestSuite()
-suite.addTest(doctest.DocTestSuite(cones))
-suite.addTest(doctest.DocTestSuite(errors))
-suite.addTest(doctest.DocTestSuite(matrices))
-suite.addTest(doctest.DocTestSuite(symmetric_linear_game))
-
-runner = unittest.TextTestRunner(verbosity=2)
+suite = TestSuite()
+suite.addTest(DocTestSuite(cones))
+suite.addTest(DocTestSuite(errors))
+suite.addTest(DocTestSuite(matrices))
+suite.addTest(DocTestSuite(symmetric_linear_game))
+suite.addTest(TestLoader().loadTestsFromModule(symmetric_linear_game))
+runner = TextTestRunner(verbosity=2)
runner.run(suite)