Fix flake, and add flake8 to `make test` target