Travis coverage fix
Flake8 fixes