Extracted class cleanup test