HHH-2403 - Test cleanup