Updating test functions for PEP 8 and new tools modules.  Updating modules for PEP 8 and local imports