Brush up class names
Classify test scripts