Upgrade patch for tests