upgrade tests fixes