Stop using setup.py for running the tests.
Stop shipping subpackages of tests.
Cosmetic fix.