CFY-1604 Added private only tests and corrected flake8 issues.