CFY-494 flake8 + tests