Another flake8 fix
Improve testing environment