Flake8 compliance
Flake8 compliance
Finally got some working tests again
Cleaned up whitespaces