Fixed up some more flake8 violations (this particular violation still has many...

Fixed up some more flake8 violations (this particular violation still has many occurrences in the tests/ dir so it can't be removed from setup.cfg yet)