Fix make test + fix flake8