flake8 some stuff
make tests pass