Bring test class name in line with filename