Fixed PEP8 conflicts I introduced in the existing unit tests
Fixed PEP8 conflicts in new code