wip: passing tests + flake8