CFY-1433 update tests
CFY-1433 flake8