Test helper cleanup