Fixing the tests; droping flake8 until I have a sec