clean up formatting and other linting issues
correct for missing fail() methods which were lost when we removed unittest.TestCase