A few additional fixes for infra refactoring in testing_support

setup.py

Index: setup.py
diff --git a/setup.py b/setup.py
index 2a6cc5f176385dc3ad2ea2b9357d3d77182d9cbb..4d250fd77f051848bea08c5263b8377eb8273c06 100755
--- a/setup.py
+++ b/setup.py
@@ -3,10 +3,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-try:
-  from setuptools import setup
-except ImportError:
-  from distutils.core import setup
+from setuptools import setup, find_packages
 
 import ast
 
@@ -28,12 +25,12 @@ VARS = read_vars(NAME + '/__init__.py')
 
 
 setup(
-  name=NAME,
-  version=VARS['__version__'],
-  description=VARS['__doc__'].splitlines()[0],
-  long_description=open('README.md').read(),
-  author=VARS['__author__'],
-  author_email=VARS['__email__'],
-  url=VARS['__url__'],
-  packages=[NAME],
+    name=NAME,
+    version=VARS['__version__'],
+    description=VARS['__doc__'].splitlines()[0],
+    long_description=open('README.md').read(),
+    author=VARS['__author__'],
+    author_email=VARS['__email__'],
+    url=VARS['__url__'],
+    packages=find_packages()
 )