fixing flake8
Fixing tests