fix upgrade tests
add destruct changes