Clear before pull request

- Fix tests
- Flake8
- Remove needless lines