Reverted autopep8 import 'fix' causing an import error for all testing
Manual fixes for style E501, etc. errors in testing package