modify test class struture, flake8 updates
flake8 updates