From 9223b81ab38743f03f32f6b2e019ce6a5217b0d7 Mon Sep 17 00:00:00 2001
From: sarahcaseybot <sarahbot@google.com>
Date: Tue, 16 Jan 2024 11:32:59 -0500
Subject: [PATCH] Remove create_tld and update_tld commands (#2261)

* Remove create_tld and update_tld commands

These commands are no longer necessary now that configure_tld command is available. However, the configure_tld command should only be used for crash, QA, and alpha environments. TLDs in production and sandbox must be modified using modifications to their config files in Gerrit unless using the configure_tld command in breakglass mode. Check the "How to configure TLDs" procedure doc for more info.

* re-delete file
---
 .../java/google/registry/model/tld/Tld.java   |    2 +-
 .../tools/CreateOrUpdateTldCommand.java       |  485 -------
 .../registry/tools/CreateTldCommand.java      |  113 --
 .../google/registry/tools/RegistryTool.java   |    2 -
 .../registry/tools/RegistryToolComponent.java |    4 -
 .../registry/tools/UpdateTldCommand.java      |  189 ---
 .../registry/tools/CreateTldCommandTest.java  |  733 -----------
 .../registry/tools/UpdateTldCommandTest.java  | 1161 -----------------
 8 files changed, 1 insertion(+), 2688 deletions(-)
 delete mode 100644 core/src/main/java/google/registry/tools/CreateOrUpdateTldCommand.java
 delete mode 100644 core/src/main/java/google/registry/tools/CreateTldCommand.java
 delete mode 100644 core/src/main/java/google/registry/tools/UpdateTldCommand.java
 delete mode 100644 core/src/test/java/google/registry/tools/CreateTldCommandTest.java
 delete mode 100644 core/src/test/java/google/registry/tools/UpdateTldCommandTest.java

diff --git a/core/src/main/java/google/registry/model/tld/Tld.java b/core/src/main/java/google/registry/model/tld/Tld.java
index 3df2451fe..e4e1514e7 100644
--- a/core/src/main/java/google/registry/model/tld/Tld.java
+++ b/core/src/main/java/google/registry/model/tld/Tld.java
@@ -296,7 +296,7 @@ public class Tld extends ImmutableObject implements Buildable, UnsafeSerializabl
    * this procedure to change this value:
    *
    * <ol>
-   *   <li>Pause the DNS queue via {@link google.registry.tools.UpdateTldCommand}
+   *   <li>Pause the DNS queue via {@link google.registry.tools.ConfigureTldCommand}
    *   <li>Change this number
    *   <li>Let the Tld caches expire (currently 5 minutes) and drain the DNS publish queue
    *   <li>Unpause the DNS queue
diff --git a/core/src/main/java/google/registry/tools/CreateOrUpdateTldCommand.java b/core/src/main/java/google/registry/tools/CreateOrUpdateTldCommand.java
deleted file mode 100644
index ab245e465..000000000
--- a/core/src/main/java/google/registry/tools/CreateOrUpdateTldCommand.java
+++ /dev/null
@@ -1,485 +0,0 @@
-// Copyright 2017 The Nomulus Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package google.registry.tools;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.collect.ImmutableSet.toImmutableSet;
-import static google.registry.tools.UpdateOrDeleteAllocationTokensCommand.getTokenKeys;
-import static google.registry.util.CollectionUtils.findDuplicates;
-import static google.registry.util.DomainNameUtils.canonicalizeHostname;
-
-import com.beust.jcommander.Parameter;
-import com.google.common.base.Joiner;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.ImmutableSortedMap;
-import com.google.common.collect.Sets;
-import com.google.common.collect.Sets.SetView;
-import google.registry.model.pricing.StaticPremiumListPricingEngine;
-import google.registry.model.tld.Tld;
-import google.registry.model.tld.Tld.TldState;
-import google.registry.model.tld.Tld.TldType;
-import google.registry.model.tld.Tlds;
-import google.registry.model.tld.label.PremiumList;
-import google.registry.model.tld.label.PremiumListDao;
-import google.registry.tldconfig.idn.IdnTableEnum;
-import google.registry.tools.params.OptionalStringParameter;
-import google.registry.tools.params.StringListParameter;
-import google.registry.tools.params.TransitionListParameter.BillingCostTransitions;
-import google.registry.tools.params.TransitionListParameter.TldStateTransitions;
-import java.io.UnsupportedEncodingException;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import javax.annotation.Nullable;
-import javax.inject.Inject;
-import javax.inject.Named;
-import org.joda.money.Money;
-import org.joda.time.DateTime;
-import org.joda.time.Duration;
-
-/** Shared base class for commands to create or update a TLD. */
-abstract class CreateOrUpdateTldCommand extends MutatingCommand {
-
-  @Inject
-  @Named("dnsWriterNames")
-  Set<String> validDnsWriterNames;
-
-  @Parameter(description = "Names of the TLDs", required = true)
-  List<String> mainParameters;
-
-  @Parameter(
-      names = "--escrow",
-      description = "Whether to enable nightly RDE escrow deposits",
-      arity = 1)
-  private Boolean escrow;
-
-  @Parameter(
-      names = "--dns",
-      description = "Set to false to pause writing to the DNS queue",
-      arity = 1)
-  private Boolean dns;
-
-  @Nullable
-  @Parameter(
-      names = "--add_grace_period",
-      description = "Length of the add grace period (in ISO 8601 duration format)")
-  Duration addGracePeriod;
-
-  @Nullable
-  @Parameter(
-      names = "--redemption_grace_period",
-      description = "Length of the redemption grace period (in ISO 8601 duration format)")
-  Duration redemptionGracePeriod;
-
-  @Nullable
-  @Parameter(
-      names = "--pending_delete_length",
-      description = "Length of the pending delete period (in ISO 8601 duration format)")
-  Duration pendingDeleteLength;
-
-  @Nullable
-  @Parameter(
-      names = "--automatic_transfer_length",
-      description = "Length of the automatic transfer period (in ISO 8601 duration format)")
-  private Duration automaticTransferLength;
-
-  @Nullable
-  @Parameter(
-      names = "--restore_billing_cost",
-      description = "One-time billing cost for restoring a domain")
-  private Money restoreBillingCost;
-
-  @Nullable
-  @Parameter(
-      names = "--roid_suffix",
-      description = "The suffix to be used for ROIDs, e.g. COM for .com domains (which then "
-          + "creates roids looking like 123ABC-COM)")
-  String roidSuffix;
-
-  @Nullable
-  @Parameter(
-      names = "--server_status_change_cost",
-      description = "One-time billing cost for a server status change")
-  private Money serverStatusChangeCost;
-
-  @Nullable
-  @Parameter(
-      names = "--registry_lock_or_unlock_cost",
-      description = "One-time billing cost for a registry lock or unlock")
-  private Money registryLockOrUnlockCost;
-
-  @Nullable
-  @Parameter(
-      names = "--tld_type",
-      description = "Tld type (REAL or TEST)")
-  private TldType tldType;
-
-  @Nullable
-  @Parameter(
-      names = "--invoicing_enabled",
-      description = "Whether invoicing is enabled for this tld.",
-      arity = 1)
-  private Boolean invoicingEnabled;
-
-  @Nullable
-  @Parameter(
-      names = "--create_billing_cost",
-      description = "Per-year billing cost for creating a domain")
-  Money createBillingCost;
-
-  @Nullable
-  @Parameter(
-      names = "--drive_folder_id",
-      description = "Id of the folder in drive used to publish information for this TLD",
-      converter = OptionalStringParameter.class,
-      validateWith = OptionalStringParameter.class)
-  Optional<String> driveFolderId;
-
-  @Nullable
-  @Parameter(
-      names = "--lordn_username",
-      description = "Username for LORDN uploads",
-      converter = OptionalStringParameter.class,
-      validateWith = OptionalStringParameter.class)
-  Optional<String> lordnUsername;
-
-  @Nullable
-  @Parameter(
-      names = "--premium_list",
-      description = "The name of the premium list to apply to the TLD",
-      converter = OptionalStringParameter.class,
-      validateWith = OptionalStringParameter.class)
-  Optional<String> premiumListName;
-
-  @Parameter(
-      names = "--tld_state_transitions",
-      converter = TldStateTransitions.class,
-      validateWith = TldStateTransitions.class,
-      description = "Comma-delimited list of TLD state transitions, of the form "
-          + "<time>=<tld-state>[,<time>=<tld-state>]*")
-  ImmutableSortedMap<DateTime, TldState> tldStateTransitions = ImmutableSortedMap.of();
-
-  @Parameter(
-      names = "--renew_billing_cost_transitions",
-      converter = BillingCostTransitions.class,
-      validateWith = BillingCostTransitions.class,
-      description = "Comma-delimited list of renew billing cost transitions, of the form "
-          + "<time>=<money-amount>[,<time>=<money-amount>]* where each amount "
-          + "represents the per-year billing cost for renewing a domain")
-  ImmutableSortedMap<DateTime, Money> renewBillingCostTransitions =
-      ImmutableSortedMap.of();
-
-  @Parameter(
-      names = "--eap_fee_schedule",
-      converter = BillingCostTransitions.class,
-      validateWith = BillingCostTransitions.class,
-      description = "Comma-delimited list of EAP fees effective on specific dates, of the form "
-          + "<time>=<money-amount>[,<time>=<money-amount>]* where each amount represents the "
-          + "EAP fee for creating a new domain under the TLD.")
-  ImmutableSortedMap<DateTime, Money> eapFeeSchedule = ImmutableSortedMap.of();
-
-  @Nullable
-  @Parameter(
-      names = "--reserved_lists",
-      description = "A comma-separated list of reserved list names to be applied to the TLD",
-      listConverter = StringListParameter.class)
-  List<String> reservedListNames;
-
-  @Nullable
-  @Parameter(
-      names = "--allowed_registrants",
-      description = "A comma-separated list of allowed registrants for the TLD",
-      listConverter = StringListParameter.class)
-  List<String> allowedRegistrants;
-
-  @Nullable
-  @Parameter(
-      names = "--allowed_nameservers",
-      description = "A comma-separated list of allowed nameservers for the TLD",
-      listConverter = StringListParameter.class)
-  List<String> allowedNameservers;
-
-  @Parameter(
-      names = {"-o", "--override_reserved_list_rules"},
-      description = "Override restrictions on reserved list naming")
-  boolean overrideReservedListRules;
-
-  @Nullable
-  @Parameter(
-      names = "--claims_period_end",
-      description = "The end of the claims period")
-  DateTime claimsPeriodEnd;
-
-  @Nullable
-  @Parameter(
-      names = "--dns_writers",
-      description = "A comma-separated list of DnsWriter implementations to use",
-      listConverter = StringListParameter.class)
-  List<String> dnsWriters;
-
-  @Nullable
-  @Parameter(
-      names = {"--num_dns_publish_locks"},
-      description =
-          "The number of publish locks we allow in parallel for DNS updates under this tld "
-              + "(1 for TLD-wide locks)",
-      arity = 1)
-  Integer numDnsPublishShards;
-
-  @Nullable
-  @Parameter(
-      names = {"--dns_a_plus_aaaa_ttl"},
-      description = "The time to live for DNS A and AAAA records (Ex: PT240S)")
-  Duration dnsAPlusAaaaTtl;
-
-  @Nullable
-  @Parameter(
-      names = {"--dns_ns_ttl"},
-      description = "The time to live for DNS NS records (Ex: PT240S)")
-  Duration dnsNsTtl;
-
-  @Nullable
-  @Parameter(
-      names = {"--dns_ds_ttl"},
-      description = "The time to live for DNS DS records (Ex: PT240S)")
-  Duration dnsDsTtl;
-
-  @Nullable
-  @Parameter(
-      names = "--default_tokens",
-      description =
-          "A comma-separated list of default allocation tokens to be applied to the TLD. The"
-              + " ordering of this list will determine which token is used in the case where"
-              + " multiple tokens are valid for a registration. Use an empty string to clear all"
-              + " present default tokens.",
-      listConverter = StringListParameter.class)
-  List<String> defaultTokens;
-
-  @Nullable
-  @Parameter(
-      names = "--idn_tables",
-      description =
-          "A comma-separated list of the IDN tables to use for this TLD. Specify an empty list to"
-              + " remove any previously-set tables and to use the default. All elements must be"
-              + " IdnTableEnum values",
-      listConverter = StringListParameter.class)
-  List<String> idnTables;
-
-  /** Returns the existing tld (for update) or null (for creates). */
-  @Nullable
-  abstract Tld getOldTld(String tld);
-
-  abstract ImmutableSet<String> getAllowedRegistrants(Tld oldTld);
-
-  abstract ImmutableSet<String> getAllowedNameservers(Tld oldTld);
-
-  abstract ImmutableSet<String> getReservedLists(Tld oldTld);
-
-  abstract Optional<Map.Entry<DateTime, TldState>> getTldStateTransitionToAdd();
-
-  /** Subclasses can override this to set their own properties. */
-  void setCommandSpecificProperties(@SuppressWarnings("unused") Tld.Builder builder) {}
-
-  /** Subclasses can override this to assert that the command can be run in this environment. */
-  void assertAllowedEnvironment() {}
-
-  protected abstract void initTldCommand();
-
-  @Override
-  protected final void init() throws UnsupportedEncodingException {
-    assertAllowedEnvironment();
-    initTldCommand();
-    String duplicates = Joiner.on(", ").join(findDuplicates(mainParameters));
-    checkArgument(duplicates.isEmpty(), "Duplicate arguments found: '%s'", duplicates);
-    Set<String> tlds = ImmutableSet.copyOf(mainParameters);
-    checkArgument(roidSuffix == null || tlds.size() == 1,
-        "Can't update roid suffixes on multiple TLDs simultaneously");
-    for (String tld : tlds) {
-      checkArgument(
-          tld.equals(canonicalizeHostname(tld)),
-          "TLD '%s' should be given in the canonical form '%s'",
-          tld,
-          canonicalizeHostname(tld));
-      checkArgument(
-          !Character.isDigit(tld.charAt(0)),
-          "TLDs cannot begin with a number");
-      Tld oldTld = getOldTld(tld);
-      // TODO(b/26901539): Add a flag to set the pricing engine once we have more than one option.
-      Tld.Builder builder =
-          oldTld == null
-              ? new Tld.Builder()
-                  .setTldStr(tld)
-                  .setPremiumPricingEngine(StaticPremiumListPricingEngine.NAME)
-              : oldTld.asBuilder();
-
-      if (escrow != null) {
-        builder.setEscrowEnabled(escrow);
-      }
-
-      if (dns != null) {
-        builder.setDnsPaused(!dns);
-      }
-
-      Optional<Map.Entry<DateTime, TldState>> tldStateTransitionToAdd =
-          getTldStateTransitionToAdd();
-      if (!tldStateTransitions.isEmpty()) {
-        builder.setTldStateTransitions(tldStateTransitions);
-      } else if (tldStateTransitionToAdd.isPresent()) {
-        ImmutableSortedMap.Builder<DateTime, TldState> newTldStateTransitions =
-            ImmutableSortedMap.naturalOrder();
-        if (oldTld != null) {
-          checkArgument(
-              oldTld
-                  .getTldStateTransitions()
-                  .lastKey()
-                  .isBefore(tldStateTransitionToAdd.get().getKey()),
-              "Cannot add %s at %s when there is a later transition already scheduled",
-              tldStateTransitionToAdd.get().getValue(),
-              tldStateTransitionToAdd.get().getKey());
-          newTldStateTransitions.putAll(oldTld.getTldStateTransitions());
-        }
-        builder.setTldStateTransitions(
-            newTldStateTransitions.put(getTldStateTransitionToAdd().get()).build());
-      }
-
-      if (!renewBillingCostTransitions.isEmpty()) {
-        // TODO(b/20764952): need invoicing support for multiple renew billing costs.
-        if (renewBillingCostTransitions.size() > 1) {
-          errorPrintStream.println(
-              "----------------------\n"
-                  + "WARNING: Do not set multiple renew cost transitions "
-                  + "until b/20764952 is fixed.\n"
-                  + "----------------------\n");
-        }
-        builder.setRenewBillingCostTransitions(renewBillingCostTransitions);
-      }
-
-      if (!eapFeeSchedule.isEmpty()) {
-        builder.setEapFeeSchedule(eapFeeSchedule);
-      }
-
-      Optional.ofNullable(addGracePeriod).ifPresent(builder::setAddGracePeriodLength);
-      Optional.ofNullable(redemptionGracePeriod).ifPresent(builder::setRedemptionGracePeriodLength);
-      Optional.ofNullable(pendingDeleteLength).ifPresent(builder::setPendingDeleteLength);
-      Optional.ofNullable(automaticTransferLength).ifPresent(builder::setAutomaticTransferLength);
-      Optional.ofNullable(driveFolderId).ifPresent(id -> builder.setDriveFolderId(id.orElse(null)));
-      Optional.ofNullable(createBillingCost).ifPresent(builder::setCreateBillingCost);
-      Optional.ofNullable(restoreBillingCost).ifPresent(builder::setRestoreBillingCost);
-      Optional.ofNullable(roidSuffix).ifPresent(builder::setRoidSuffix);
-      Optional.ofNullable(serverStatusChangeCost)
-          .ifPresent(builder::setServerStatusChangeBillingCost);
-      Optional.ofNullable(registryLockOrUnlockCost)
-          .ifPresent(builder::setRegistryLockOrUnlockBillingCost);
-      Optional.ofNullable(tldType).ifPresent(builder::setTldType);
-      Optional.ofNullable(invoicingEnabled).ifPresent(builder::setInvoicingEnabled);
-      Optional.ofNullable(lordnUsername).ifPresent(u -> builder.setLordnUsername(u.orElse(null)));
-      Optional.ofNullable(claimsPeriodEnd).ifPresent(builder::setClaimsPeriodEnd);
-      Optional.ofNullable(numDnsPublishShards).ifPresent(builder::setNumDnsPublishLocks);
-      Optional.ofNullable(dnsAPlusAaaaTtl).ifPresent(builder::setDnsAPlusAaaaTtl);
-      Optional.ofNullable(dnsNsTtl).ifPresent(builder::setDnsNsTtl);
-      Optional.ofNullable(dnsDsTtl).ifPresent(builder::setDnsDsTtl);
-
-      if (premiumListName != null) {
-        if (premiumListName.isPresent()) {
-          Optional<PremiumList> premiumList =
-              PremiumListDao.getLatestRevision(premiumListName.get());
-          checkArgument(
-              premiumList.isPresent(),
-              String.format("The premium list '%s' doesn't exist", premiumListName.get()));
-          builder.setPremiumList(premiumList.get());
-        } else {
-          builder.setPremiumList(null);
-        }
-      }
-
-      if (dnsWriters != null) {
-        ImmutableSet<String> dnsWritersSet = ImmutableSet.copyOf(dnsWriters);
-        SetView<String> invalidDnsWriters = Sets.difference(dnsWritersSet, validDnsWriterNames);
-        checkArgument(
-            invalidDnsWriters.isEmpty(),
-            "Invalid DNS writer name(s) specified: %s",
-            invalidDnsWriters);
-        builder.setDnsWriters(dnsWritersSet);
-      }
-
-      ImmutableSet<String> newReservedListNames = getReservedLists(oldTld);
-      checkReservedListValidityForTld(tld, newReservedListNames);
-      builder.setReservedListsByName(newReservedListNames);
-
-      builder.setAllowedRegistrantContactIds(getAllowedRegistrants(oldTld));
-
-      builder.setAllowedFullyQualifiedHostNames(getAllowedNameservers(oldTld));
-
-      if (defaultTokens != null) {
-        builder.setDefaultPromoTokens(getTokenKeys(defaultTokens, null));
-      }
-      if (idnTables != null) {
-        if (idnTables.equals(ImmutableList.of(""))) {
-          builder.setIdnTables(ImmutableSet.of());
-        } else {
-          ImmutableSet<String> upperCaseIdnTables =
-              idnTables.stream().map(String::toUpperCase).collect(toImmutableSet());
-          ImmutableSet<String> validIdnStringValues =
-              Arrays.stream(IdnTableEnum.values()).map(Enum::name).collect(toImmutableSet());
-          checkArgument(
-              validIdnStringValues.containsAll(upperCaseIdnTables),
-              "IDN tables %s contained invalid value(s). Possible values: %s",
-              upperCaseIdnTables,
-              validIdnStringValues);
-          builder.setIdnTables(
-              upperCaseIdnTables.stream().map(IdnTableEnum::valueOf).collect(toImmutableSet()));
-        }
-      }
-      // Update the Registry object.
-      setCommandSpecificProperties(builder);
-      stageEntityChange(oldTld, builder.build());
-    }
-  }
-
-  @Override
-  public String execute() throws Exception {
-    try {
-      return super.execute();
-    } finally {
-      // Manually reset the cache here so that subsequent commands (e.g. in SetupOteCommand) see
-      // the latest version of the data.
-      // TODO(b/24903801): change all those places to use uncached code paths to get TLDs.
-      Tlds.resetCache();
-    }
-  }
-
-  private void checkReservedListValidityForTld(String tld, Set<String> reservedListNames) {
-    ImmutableList.Builder<String> builder = new ImmutableList.Builder<>();
-    for (String reservedListName : reservedListNames) {
-      if (!reservedListName.startsWith("common_") && !reservedListName.startsWith(tld + "_")) {
-        builder.add(reservedListName);
-      }
-    }
-    ImmutableList<String> invalidNames = builder.build();
-    if (!invalidNames.isEmpty()) {
-      String errMsg = String.format("The reserved list(s) %s cannot be applied to the tld %s",
-          Joiner.on(", ").join(invalidNames),
-          tld);
-      if (overrideReservedListRules) {
-        errorPrintStream.println("Error overridden: " + errMsg);
-      } else {
-        throw new IllegalArgumentException(errMsg);
-      }
-    }
-  }
-}
diff --git a/core/src/main/java/google/registry/tools/CreateTldCommand.java b/core/src/main/java/google/registry/tools/CreateTldCommand.java
deleted file mode 100644
index 46e92fd29..000000000
--- a/core/src/main/java/google/registry/tools/CreateTldCommand.java
+++ /dev/null
@@ -1,113 +0,0 @@
-// Copyright 2017 The Nomulus Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package google.registry.tools;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkState;
-import static google.registry.model.tld.Tlds.getTlds;
-import static google.registry.util.CollectionUtils.nullToEmpty;
-import static google.registry.util.DateTimeUtils.START_OF_TIME;
-
-import com.beust.jcommander.Parameter;
-import com.beust.jcommander.Parameters;
-import com.google.common.base.Strings;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.ImmutableSortedMap;
-import com.google.common.collect.Maps;
-import google.registry.model.tld.Tld;
-import google.registry.model.tld.Tld.TldState;
-import java.util.Map;
-import java.util.Optional;
-import javax.annotation.Nullable;
-import org.joda.money.CurrencyUnit;
-import org.joda.money.Money;
-import org.joda.time.DateTime;
-
-/** Command to create a TLD. */
-@Parameters(separators = " =", commandDescription = "Create new TLD(s)")
-class CreateTldCommand extends CreateOrUpdateTldCommand {
-
-  @Nullable
-  @Parameter(
-      names = "--initial_tld_state",
-      description = "Initial state of the TLD (cannot be combined with a transitions list)")
-  TldState initialTldState;
-
-  @Nullable
-  @Parameter(
-      names = "--initial_renew_billing_cost",
-      description = "Initial per-year billing cost for renewing a domain "
-          + "(cannot be combined with a transitions list)")
-  private Money initialRenewBillingCost;
-
-  @Override
-  protected void initTldCommand() {
-    checkArgument(initialTldState == null || tldStateTransitions.isEmpty(),
-        "Don't pass both --initial_tld_state and --tld_state_transitions");
-    checkArgument(initialRenewBillingCost == null || renewBillingCostTransitions.isEmpty(),
-        "Don't pass both --initial_renew_billing_cost and --renew_billing_cost_transitions");
-    if (initialRenewBillingCost != null) {
-      renewBillingCostTransitions = ImmutableSortedMap.of(START_OF_TIME, initialRenewBillingCost);
-    }
-    checkArgument(mainParameters.size() == 1, "Can't create more than one TLD at a time");
-    checkArgument(
-        !Strings.isNullOrEmpty(roidSuffix),
-        "The roid suffix is required when creating a TLD");
-  }
-
-  @Override
-  void setCommandSpecificProperties(Tld.Builder builder) {
-    // Pick up the currency from the create cost. Since all costs must be in one currency, and that
-    // condition is enforced by the builder, it doesn't matter which cost we choose it from.
-    CurrencyUnit currency =
-        createBillingCost != null ? createBillingCost.getCurrencyUnit() : Tld.DEFAULT_CURRENCY;
-
-    builder.setCurrency(currency);
-
-    // If this is a non-default currency and the user hasn't specified an EAP fee schedule, set the
-    // EAP fee schedule to a matching currency.
-    if (!currency.equals(Tld.DEFAULT_CURRENCY) && eapFeeSchedule.isEmpty()) {
-      builder.setEapFeeSchedule(ImmutableSortedMap.of(START_OF_TIME, Money.zero(currency)));
-    }
-  }
-
-  @Override
-  Tld getOldTld(String tld) {
-    checkState(!getTlds().contains(tld), "TLD '%s' already exists", tld);
-    return null;
-  }
-
-  @Override
-  ImmutableSet<String> getAllowedRegistrants(Tld oldTld) {
-    return ImmutableSet.copyOf(nullToEmpty(allowedRegistrants));
-  }
-
-  @Override
-  ImmutableSet<String> getAllowedNameservers(Tld oldTld) {
-    return ImmutableSet.copyOf(nullToEmpty(allowedNameservers));
-  }
-
-  @Override
-  ImmutableSet<String> getReservedLists(Tld oldTld) {
-    return ImmutableSet.copyOf(nullToEmpty(reservedListNames));
-  }
-
-  @Override
-  Optional<Map.Entry<DateTime, TldState>> getTldStateTransitionToAdd() {
-    return initialTldState != null
-        ? Optional.of(Maps.immutableEntry(START_OF_TIME, initialTldState))
-        : Optional.empty();
-  }
-}
diff --git a/core/src/main/java/google/registry/tools/RegistryTool.java b/core/src/main/java/google/registry/tools/RegistryTool.java
index 1970e0132..f49faa208 100644
--- a/core/src/main/java/google/registry/tools/RegistryTool.java
+++ b/core/src/main/java/google/registry/tools/RegistryTool.java
@@ -49,7 +49,6 @@ public final class RegistryTool {
           .put("create_registrar", CreateRegistrarCommand.class)
           .put("create_registrar_groups", CreateRegistrarGroupsCommand.class)
           .put("create_reserved_list", CreateReservedListCommand.class)
-          .put("create_tld", CreateTldCommand.class)
           .put("create_user", CreateUserCommand.class)
           .put("curl", CurlCommand.class)
           .put("delete_allocation_tokens", DeleteAllocationTokensCommand.class)
@@ -114,7 +113,6 @@ public final class RegistryTool {
           .put("update_registrar", UpdateRegistrarCommand.class)
           .put("update_reserved_list", UpdateReservedListCommand.class)
           .put("update_server_locks", UpdateServerLocksCommand.class)
-          .put("update_tld", UpdateTldCommand.class)
           .put("update_user", UpdateUserCommand.class)
           .put("upload_claims_list", UploadClaimsListCommand.class)
           .put("validate_escrow_deposit", ValidateEscrowDepositCommand.class)
diff --git a/core/src/main/java/google/registry/tools/RegistryToolComponent.java b/core/src/main/java/google/registry/tools/RegistryToolComponent.java
index e0d19e562..e35b67c99 100644
--- a/core/src/main/java/google/registry/tools/RegistryToolComponent.java
+++ b/core/src/main/java/google/registry/tools/RegistryToolComponent.java
@@ -102,8 +102,6 @@ interface RegistryToolComponent {
 
   void inject(CreateRegistrarCommand command);
 
-  void inject(CreateTldCommand command);
-
   void inject(EncryptEscrowDepositCommand command);
 
   void inject(EnqueuePollMessageCommand command);
@@ -162,8 +160,6 @@ interface RegistryToolComponent {
 
   void inject(UpdateRegistrarCommand command);
 
-  void inject(UpdateTldCommand command);
-
   void inject(ValidateEscrowDepositCommand command);
 
   void inject(ValidateLoginCredentialsCommand command);
diff --git a/core/src/main/java/google/registry/tools/UpdateTldCommand.java b/core/src/main/java/google/registry/tools/UpdateTldCommand.java
deleted file mode 100644
index 938416558..000000000
--- a/core/src/main/java/google/registry/tools/UpdateTldCommand.java
+++ /dev/null
@@ -1,189 +0,0 @@
-// Copyright 2017 The Nomulus Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package google.registry.tools;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.collect.Sets.difference;
-import static com.google.common.collect.Sets.intersection;
-import static com.google.common.collect.Sets.union;
-import static google.registry.model.tld.Tlds.assertTldExists;
-import static google.registry.util.CollectionUtils.nullToEmpty;
-
-import com.beust.jcommander.Parameter;
-import com.beust.jcommander.Parameters;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Maps;
-import google.registry.model.tld.Tld;
-import google.registry.model.tld.Tld.TldState;
-import google.registry.tools.params.StringListParameter;
-import google.registry.util.RegistryEnvironment;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import javax.annotation.Nullable;
-import org.joda.time.DateTime;
-import org.joda.time.DateTimeZone;
-
-/** Command to update a TLD. */
-@Parameters(separators = " =", commandDescription = "Update existing TLD(s)")
-public class UpdateTldCommand extends CreateOrUpdateTldCommand {
-
-  @Nullable
-  @Parameter(
-      names = "--add_reserved_lists",
-      description = "A comma-separated list of reserved list names to be added to the TLD",
-      listConverter = StringListParameter.class)
-  List<String> reservedListsAdd;
-
-  @Nullable
-  @Parameter(
-      names = "--remove_reserved_lists",
-      description = "A comma-separated list of reserved list names to be removed from the TLD",
-      listConverter = StringListParameter.class)
-  List<String> reservedListsRemove;
-
-  @Nullable
-  @Parameter(
-      names = "--add_allowed_registrants",
-      description = "A comma-separated list of allowed registrants to be added to the TLD",
-      listConverter = StringListParameter.class)
-  List<String> allowedRegistrantsAdd;
-
-  @Nullable
-  @Parameter(
-      names = "--remove_allowed_registrants",
-      description = "A comma-separated list of allowed registrants to be removed from the TLD",
-      listConverter = StringListParameter.class)
-  List<String> allowedRegistrantsRemove;
-
-  @Nullable
-  @Parameter(
-      names = "--add_allowed_nameservers",
-      description = "A comma-separated list of allowed nameservers to be added to the TLD",
-      listConverter = StringListParameter.class)
-  List<String> allowedNameserversAdd;
-
-  @Nullable
-  @Parameter(
-      names = "--remove_allowed_nameservers",
-      description = "A comma-separated list of allowed nameservers to be removed from the TLD",
-      listConverter = StringListParameter.class)
-  List<String> allowedNameserversRemove;
-
-  @Nullable
-  @Parameter(
-      names = "--set_current_tld_state",
-      description = "Set the current TLD state. Specifically, adds a TLD transition at the "
-          + "current time for the specified state.")
-  TldState setCurrentTldState;
-
-  @Override
-  Tld getOldTld(String tld) {
-    return Tld.get(assertTldExists(tld));
-  }
-
-  @Override
-  ImmutableSet<String> getAllowedRegistrants(Tld oldTld) {
-    return formUpdatedList(
-        "allowed registrants",
-        oldTld.getAllowedRegistrantContactIds(),
-        allowedRegistrants,
-        allowedRegistrantsAdd,
-        allowedRegistrantsRemove);
-  }
-
-  @Override
-  ImmutableSet<String> getAllowedNameservers(Tld oldTld) {
-    return formUpdatedList(
-        "allowed nameservers",
-        oldTld.getAllowedFullyQualifiedHostNames(),
-        allowedNameservers,
-        allowedNameserversAdd,
-        allowedNameserversRemove);
-  }
-
-  @Override
-  ImmutableSet<String> getReservedLists(Tld oldTld) {
-    return formUpdatedList(
-        "reserved lists",
-        oldTld.getReservedListNames(),
-        reservedListNames,
-        reservedListsAdd,
-        reservedListsRemove);
-  }
-
-  @Override
-  Optional<Map.Entry<DateTime, TldState>> getTldStateTransitionToAdd() {
-    return setCurrentTldState != null
-        ? Optional.of(Maps.immutableEntry(DateTime.now(DateTimeZone.UTC), setCurrentTldState))
-        : Optional.empty();
-  }
-
-  @Override
-  protected void initTldCommand() {
-    // Due to per-instance caching on Registry, different instances can end up in different TLD
-    // states at the same time, so --set_current_tld_state should never be used in production.
-    checkArgument(
-        !RegistryEnvironment.get().equals(RegistryEnvironment.PRODUCTION)
-            || setCurrentTldState == null,
-        "--set_current_tld_state is not safe to use in production.");
-    checkConflicts("reserved_lists", reservedListNames, reservedListsAdd, reservedListsRemove);
-    checkConflicts(
-        "allowed_registrants", allowedRegistrants, allowedRegistrantsAdd, allowedRegistrantsRemove);
-    checkConflicts(
-        "allowed_nameservers", allowedNameservers, allowedNameserversAdd, allowedNameserversRemove);
-    checkArgument(setCurrentTldState == null || tldStateTransitions.isEmpty(),
-        "Don't pass both --set_current_tld_state and --tld_state_transitions");
-  }
-
-  private static ImmutableSet<String> formUpdatedList(
-      String description,
-      ImmutableSet<String> originals,
-      List<String> fullReplacement,
-      List<String> itemsToAdd,
-      List<String> itemsToRemove) {
-    if (fullReplacement != null) {
-      return ImmutableSet.copyOf(fullReplacement);
-    }
-    Set<String> toAdd = ImmutableSet.copyOf(nullToEmpty(itemsToAdd));
-    Set<String> toRemove = ImmutableSet.copyOf(nullToEmpty(itemsToRemove));
-    checkIsEmpty(
-        intersection(toAdd, toRemove),
-        String.format(
-            "Adding and removing the same %s simultaneously doesn't make sense", description));
-    checkIsEmpty(
-        intersection(originals, toAdd),
-        String.format("Cannot add %s that were previously present", description));
-    checkIsEmpty(
-        difference(toRemove, originals),
-        String.format("Cannot remove %s that were not previously present", description));
-    return ImmutableSet.copyOf(difference(union(originals, toAdd), toRemove));
-  }
-
-  private static void checkIsEmpty(Set<String> set, String errorString) {
-    checkArgument(set.isEmpty(), String.format("%s: %s", errorString, set));
-  }
-
-  private static void checkConflicts(
-      String baseFlagName, Object overwriteValue, Object addValue, Object removeValue) {
-    checkNotBoth(baseFlagName, overwriteValue, "add_" + baseFlagName, addValue);
-    checkNotBoth(baseFlagName, overwriteValue, "remove_" + baseFlagName, removeValue);
-  }
-
-  private static void checkNotBoth(String nameA, Object valueA, String nameB, Object valueB) {
-    checkArgument(valueA == null || valueB == null, "Don't pass both --%s and --%s", nameA, nameB);
-  }
-}
diff --git a/core/src/test/java/google/registry/tools/CreateTldCommandTest.java b/core/src/test/java/google/registry/tools/CreateTldCommandTest.java
deleted file mode 100644
index 32479ae86..000000000
--- a/core/src/test/java/google/registry/tools/CreateTldCommandTest.java
+++ /dev/null
@@ -1,733 +0,0 @@
-// Copyright 2017 The Nomulus Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package google.registry.tools;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth8.assertThat;
-import static google.registry.model.domain.token.AllocationToken.TokenType.DEFAULT_PROMO;
-import static google.registry.model.tld.Tld.TldState.GENERAL_AVAILABILITY;
-import static google.registry.model.tld.Tld.TldState.PREDELEGATION;
-import static google.registry.testing.DatabaseHelper.createTld;
-import static google.registry.testing.DatabaseHelper.persistPremiumList;
-import static google.registry.testing.DatabaseHelper.persistReservedList;
-import static google.registry.testing.DatabaseHelper.persistResource;
-import static google.registry.util.DateTimeUtils.START_OF_TIME;
-import static java.math.BigDecimal.ROUND_UNNECESSARY;
-import static org.joda.money.CurrencyUnit.JPY;
-import static org.joda.money.CurrencyUnit.USD;
-import static org.joda.time.DateTimeZone.UTC;
-import static org.joda.time.Duration.standardMinutes;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-import com.beust.jcommander.ParameterException;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Range;
-import google.registry.model.domain.token.AllocationToken;
-import google.registry.model.tld.Tld;
-import google.registry.tldconfig.idn.IdnTableEnum;
-import java.math.BigDecimal;
-import org.joda.money.Money;
-import org.joda.time.DateTime;
-import org.joda.time.Duration;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-/** Unit tests for {@link CreateTldCommand}. */
-class CreateTldCommandTest extends CommandTestCase<CreateTldCommand> {
-
-  @BeforeEach
-  void beforeEach() {
-    persistReservedList("common_abuse", "baa,FULLY_BLOCKED");
-    persistReservedList("xn--q9jyb4c_abuse", "lamb,FULLY_BLOCKED");
-    persistReservedList("tld_banned", "kilo,FULLY_BLOCKED", "lima,FULLY_BLOCKED");
-    persistReservedList("soy_expurgated", "fireflies,FULLY_BLOCKED");
-    persistPremiumList("xn--q9jyb4c", USD, "minecraft,USD 1000");
-    command.validDnsWriterNames = ImmutableSet.of("VoidDnsWriter", "FooDnsWriter");
-  }
-
-  @Test
-  void testSuccess() throws Exception {
-    DateTime before = fakeClock.nowUtc();
-    runCommandForced("xn--q9jyb4c", "--roid_suffix=Q9JYB4C", "--dns_writers=FooDnsWriter");
-    DateTime after = fakeClock.nowUtc();
-
-    Tld registry = Tld.get("xn--q9jyb4c");
-    assertThat(registry).isNotNull();
-    assertThat(registry.getAddGracePeriodLength()).isEqualTo(Tld.DEFAULT_ADD_GRACE_PERIOD);
-    assertThat(registry.getCreationTime()).isIn(Range.closed(before, after));
-    assertThat(registry.getDnsWriters()).containsExactly("FooDnsWriter");
-    assertThat(registry.getTldState(registry.getCreationTime())).isEqualTo(PREDELEGATION);
-    assertThat(registry.getRedemptionGracePeriodLength())
-        .isEqualTo(Tld.DEFAULT_REDEMPTION_GRACE_PERIOD);
-    assertThat(registry.getPendingDeleteLength()).isEqualTo(Tld.DEFAULT_PENDING_DELETE_LENGTH);
-    assertThat(registry.getRegistryLockOrUnlockBillingCost())
-        .isEqualTo(Tld.DEFAULT_REGISTRY_LOCK_OR_UNLOCK_BILLING_COST);
-  }
-
-  @Test
-  void testSuccess_ttls() throws Exception {
-    runCommandForced(
-        "xn--q9jyb4c",
-        "--roid_suffix=Q9JYB4C",
-        "--dns_writers=FooDnsWriter",
-        "--dns_a_plus_aaaa_ttl=PT300S",
-        "--dns_ds_ttl=PT240S",
-        "--dns_ns_ttl=PT180S");
-    Tld registry = Tld.get("xn--q9jyb4c");
-    assertThat(registry).isNotNull();
-    assertThat(registry.getDnsAPlusAaaaTtl().get()).isEqualTo(standardMinutes(5));
-    assertThat(registry.getDnsDsTtl().get()).isEqualTo(standardMinutes(4));
-    assertThat(registry.getDnsNsTtl().get()).isEqualTo(standardMinutes(3));
-  }
-
-  @Test
-  void testFailure_multipleArguments() {
-    IllegalArgumentException thrown =
-        assertThrows(
-            IllegalArgumentException.class,
-            () ->
-                runCommandForced(
-                    "--roid_suffix=BLAH", "--dns_writers=VoidDnsWriter", "xn--q9jyb4c", "test"));
-    assertThat(thrown).hasMessageThat().contains("Can't create more than one TLD at a time");
-  }
-
-  @Test
-  void testFailure_multipleDuplicateArguments() {
-    IllegalArgumentException thrown =
-        assertThrows(
-            IllegalArgumentException.class,
-            () ->
-                runCommandForced(
-                    "--roid_suffix=BLAH", "--dns_writers=VoidDnsWriter", "test", "test"));
-    assertThat(thrown).hasMessageThat().contains("Can't create more than one TLD at a time");
-  }
-
-  @Test
-  void testSuccess_initialTldStateFlag() throws Exception {
-    runCommandForced(
-        "--initial_tld_state=GENERAL_AVAILABILITY",
-        "--roid_suffix=Q9JYB4C",
-        "--dns_writers=VoidDnsWriter",
-        "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getTldState(DateTime.now(UTC)))
-        .isEqualTo(GENERAL_AVAILABILITY);
-  }
-
-  @Test
-  void testSuccess_initialRenewBillingCostFlag() throws Exception {
-    runCommandForced(
-        "--initial_renew_billing_cost=\"USD 42.42\"",
-        "--roid_suffix=Q9JYB4C",
-        "--dns_writers=VoidDnsWriter",
-        "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getStandardRenewCost(DateTime.now(UTC)))
-        .isEqualTo(Money.of(USD, 42.42));
-  }
-
-  @Test
-  void testSuccess_eapFeeSchedule() throws Exception {
-    DateTime now = DateTime.now(UTC);
-    DateTime tomorrow = now.plusDays(1);
-    runCommandForced(
-        String.format(
-            "--eap_fee_schedule=\"%s=USD 0.00,%s=USD 50.00,%s=USD 10.00\"",
-            START_OF_TIME, now, tomorrow),
-        "--roid_suffix=Q9JYB4C",
-        "--dns_writers=VoidDnsWriter",
-        "xn--q9jyb4c");
-
-    Tld registry = Tld.get("xn--q9jyb4c");
-    assertThat(registry.getEapFeeFor(now.minusHours(1)).getCost())
-        .isEqualTo(BigDecimal.ZERO.setScale(2, ROUND_UNNECESSARY));
-    assertThat(registry.getEapFeeFor(now.plusHours(1)).getCost())
-        .isEqualTo(new BigDecimal("50.00"));
-    assertThat(registry.getEapFeeFor(now.plusDays(1).plusHours(1)).getCost())
-        .isEqualTo(new BigDecimal("10.00"));
-  }
-
-  @Test
-  void testSuccess_addGracePeriodFlag() throws Exception {
-    runCommandForced(
-        "--add_grace_period=PT300S",
-        "--roid_suffix=Q9JYB4C",
-        "--dns_writers=VoidDnsWriter",
-        "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getAddGracePeriodLength()).isEqualTo(standardMinutes(5));
-  }
-
-  @Test
-  void testSuccess_roidSuffixWorks() throws Exception {
-    runCommandForced("--roid_suffix=RSUFFIX", "--dns_writers=VoidDnsWriter", "tld");
-    assertThat(Tld.get("tld").getRoidSuffix()).isEqualTo("RSUFFIX");
-  }
-
-  @Test
-  void testSuccess_escrow() throws Exception {
-    runCommandForced(
-        "--escrow=true", "--roid_suffix=Q9JYB4C", "--dns_writers=VoidDnsWriter", "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getEscrowEnabled()).isTrue();
-  }
-
-  @Test
-  void testSuccess_noEscrow() throws Exception {
-    runCommandForced(
-        "--escrow=false", "--roid_suffix=Q9JYB4C", "--dns_writers=VoidDnsWriter", "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getEscrowEnabled()).isFalse();
-  }
-
-  @Test
-  void testSuccess_redemptionGracePeriodFlag() throws Exception {
-    runCommandForced(
-        "--redemption_grace_period=PT300S",
-        "--roid_suffix=Q9JYB4C",
-        "--dns_writers=VoidDnsWriter",
-        "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getRedemptionGracePeriodLength())
-        .isEqualTo(standardMinutes(5));
-  }
-
-  @Test
-  void testSuccess_pendingDeleteLengthFlag() throws Exception {
-    runCommandForced(
-        "--pending_delete_length=PT300S",
-        "--roid_suffix=Q9JYB4C",
-        "--dns_writers=VoidDnsWriter",
-        "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getPendingDeleteLength()).isEqualTo(standardMinutes(5));
-  }
-
-  @Test
-  void testSuccess_automaticTransferLengthFlag() throws Exception {
-    runCommandForced(
-        "--automatic_transfer_length=PT300S",
-        "--roid_suffix=Q9JYB4C",
-        "--dns_writers=VoidDnsWriter",
-        "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getAutomaticTransferLength()).isEqualTo(standardMinutes(5));
-  }
-
-  @Test
-  void testSuccess_createBillingCostFlag() throws Exception {
-    runCommandForced(
-        "--create_billing_cost=\"USD 42.42\"",
-        "--roid_suffix=Q9JYB4C",
-        "--dns_writers=VoidDnsWriter",
-        "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getCreateBillingCost()).isEqualTo(Money.of(USD, 42.42));
-  }
-
-  @Test
-  void testSuccess_restoreBillingCostFlag() throws Exception {
-    runCommandForced(
-        "--restore_billing_cost=\"USD 42.42\"",
-        "--roid_suffix=Q9JYB4C",
-        "--dns_writers=VoidDnsWriter",
-        "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getRestoreBillingCost()).isEqualTo(Money.of(USD, 42.42));
-  }
-
-  @Test
-  void testSuccess_serverStatusChangeCostFlag() throws Exception {
-    runCommandForced(
-        "--server_status_change_cost=\"USD 42.42\"",
-        "--roid_suffix=Q9JYB4C",
-        "--dns_writers=VoidDnsWriter",
-        "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getServerStatusChangeBillingCost())
-        .isEqualTo(Money.of(USD, 42.42));
-  }
-
-  @Test
-  void testSuccess_registryLockOrUnlockCostFlag() throws Exception {
-    runCommandForced(
-        "--registry_lock_or_unlock_cost=\"USD 42.42\"",
-        "--roid_suffix=Q9JYB4C",
-        "--dns_writers=VoidDnsWriter",
-        "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getRegistryLockOrUnlockBillingCost())
-        .isEqualTo(Money.of(USD, 42.42));
-  }
-
-  @Test
-  void testSuccess_nonUsdBillingCostFlag() throws Exception {
-    runCommandForced(
-        "--create_billing_cost=\"JPY 12345\"",
-        "--restore_billing_cost=\"JPY 67890\"",
-        "--initial_renew_billing_cost=\"JPY 101112\"",
-        "--server_status_change_cost=\"JPY 97865\"",
-        "--registry_lock_or_unlock_cost=\"JPY 9001\"",
-        "--roid_suffix=Q9JYB4C",
-        "--dns_writers=VoidDnsWriter",
-        "xn--q9jyb4c");
-    Tld registry = Tld.get("xn--q9jyb4c");
-    assertThat(registry.getCreateBillingCost()).isEqualTo(Money.ofMajor(JPY, 12345));
-    assertThat(registry.getRestoreBillingCost()).isEqualTo(Money.ofMajor(JPY, 67890));
-    assertThat(registry.getStandardRenewCost(START_OF_TIME)).isEqualTo(Money.ofMajor(JPY, 101112));
-  }
-
-  @Test
-  void testSuccess_multipartTld() throws Exception {
-    runCommandForced("co.uk", "--roid_suffix=COUK", "--dns_writers=VoidDnsWriter");
-
-    Tld registry = Tld.get("co.uk");
-    assertThat(registry.getTldState(DateTime.now(UTC))).isEqualTo(PREDELEGATION);
-    assertThat(registry.getAddGracePeriodLength()).isEqualTo(Tld.DEFAULT_ADD_GRACE_PERIOD);
-    assertThat(registry.getRedemptionGracePeriodLength())
-        .isEqualTo(Tld.DEFAULT_REDEMPTION_GRACE_PERIOD);
-    assertThat(registry.getPendingDeleteLength()).isEqualTo(Tld.DEFAULT_PENDING_DELETE_LENGTH);
-  }
-
-  @Test
-  void testSuccess_setReservedLists() throws Exception {
-    runCommandForced(
-        "--reserved_lists=xn--q9jyb4c_abuse,common_abuse",
-        "--roid_suffix=Q9JYB4C",
-        "--dns_writers=VoidDnsWriter",
-        "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getReservedListNames())
-        .containsExactly("xn--q9jyb4c_abuse", "common_abuse");
-  }
-
-  @Test
-  void testFailure_invalidAddGracePeriod() {
-    IllegalArgumentException thrown =
-        assertThrows(
-            IllegalArgumentException.class,
-            () ->
-                runCommandForced(
-                    "--add_grace_period=5m",
-                    "--roid_suffix=Q9JYB4C",
-                    "--dns_writers=VoidDnsWriter",
-                    "xn--q9jyb4c"));
-    assertThat(thrown).hasMessageThat().contains("Invalid format: \"5m\"");
-  }
-
-  @Test
-  void testFailure_invalidRedemptionGracePeriod() {
-    IllegalArgumentException thrown =
-        assertThrows(
-            IllegalArgumentException.class,
-            () ->
-                runCommandForced(
-                    "--redemption_grace_period=5m",
-                    "--roid_suffix=Q9JYB4C",
-                    "--dns_writers=VoidDnsWriter",
-                    "xn--q9jyb4c"));
-    assertThat(thrown).hasMessageThat().contains("Invalid format: \"5m\"");
-  }
-
-  @Test
-  void testFailure_invalidPendingDeleteLength() {
-    IllegalArgumentException thrown =
-        assertThrows(
-            IllegalArgumentException.class,
-            () ->
-                runCommandForced(
-                    "--pending_delete_length=5m",
-                    "--roid_suffix=Q9JYB4C",
-                    "--dns_writers=VoidDnsWriter",
-                    "xn--q9jyb4c"));
-    assertThat(thrown).hasMessageThat().contains("Invalid format: \"5m\"");
-  }
-
-  @Test
-  void testFailure_invalidTldState() {
-    ParameterException thrown =
-        assertThrows(
-            ParameterException.class,
-            () ->
-                runCommandForced(
-                    "--initial_tld_state=INVALID_STATE",
-                    "--roid_suffix=Q9JYB4C",
-                    "--dns_writers=VoidDnsWriter",
-                    "xn--q9jyb4c"));
-    assertThat(thrown).hasMessageThat().contains("Invalid value for --initial_tld_state parameter");
-  }
-
-  @Test
-  void testFailure_bothTldStateFlags() {
-    DateTime now = DateTime.now(UTC);
-    IllegalArgumentException thrown =
-        assertThrows(
-            IllegalArgumentException.class,
-            () ->
-                runCommandForced(
-                    String.format(
-                        "--tld_state_transitions=%s=PREDELEGATION,%s=START_DATE_SUNRISE",
-                        now, now.plus(Duration.millis(1))),
-                    "--initial_tld_state=GENERAL_AVAILABILITY",
-                    "--dns_writers=VoidDnsWriter",
-                    "xn--q9jyb4c"));
-    assertThat(thrown)
-        .hasMessageThat()
-        .contains("Don't pass both --initial_tld_state and --tld_state_transitions");
-  }
-
-  @Test
-  void testFailure_negativeInitialRenewBillingCost() {
-    IllegalArgumentException thrown =
-        assertThrows(
-            IllegalArgumentException.class,
-            () ->
-                runCommandForced(
-                    "--initial_renew_billing_cost=USD -42",
-                    "--roid_suffix=Q9JYB4C",
-                    "--dns_writers=VoidDnsWriter",
-                    "xn--q9jyb4c"));
-    assertThat(thrown).hasMessageThat().contains("Renew billing cost cannot be negative");
-  }
-
-  @Test
-  void testFailure_invalidEapCurrency() {
-    IllegalArgumentException thrown =
-        assertThrows(
-            IllegalArgumentException.class,
-            () ->
-                runCommandForced(
-                    String.format("--eap_fee_schedule=\"%s=JPY 123456\"", START_OF_TIME),
-                    "--roid_suffix=Q9JYB4C",
-                    "--dns_writers=VoidDnsWriter",
-                    "xn--q9jyb4c"));
-    assertThat(thrown).hasMessageThat().contains("All EAP fees must be in the TLD's currency");
-  }
-
-  @Test
-  void testFailure_noTldName() {
-    ParameterException thrown = assertThrows(ParameterException.class, this::runCommandForced);
-    assertThat(thrown)
-        .hasMessageThat()
-        .contains("Main parameters are required (\"Names of the TLDs\")");
-  }
-
-  @Test
-  void testFailure_noDnsWriter() {
-    IllegalArgumentException thrown =
-        assertThrows(
-            IllegalArgumentException.class,
-            () -> runCommandForced("xn--q9jyb4c", "--roid_suffix=Q9JYB4C"));
-    assertThat(thrown).hasMessageThat().contains("At least one DNS writer must be specified");
-  }
-
-  @Test
-  void testFailure_alreadyExists() {
-    createTld("xn--q9jyb4c");
-    IllegalStateException thrown =
-        assertThrows(
-            IllegalStateException.class,
-            () ->
-                runCommandForced(
-                    "--roid_suffix=NOTDUPE", "--dns_writers=VoidDnsWriter", "xn--q9jyb4c"));
-    assertThat(thrown).hasMessageThat().contains("TLD 'xn--q9jyb4c' already exists");
-  }
-
-  @Test
-  void testFailure_tldStartsWithDigit() {
-    IllegalArgumentException thrown =
-        assertThrows(
-            IllegalArgumentException.class,
-            () -> runCommandForced("1foo", "--roid_suffix=1FOO", "--dns_writers=VoidDnsWriter"));
-    assertThat(thrown).hasMessageThat().contains("TLDs cannot begin with a number");
-  }
-
-  @Test
-  void testSuccess_setAllowedRegistrants() throws Exception {
-    runCommandForced(
-        "--allowed_registrants=alice,bob",
-        "--roid_suffix=Q9JYB4C",
-        "--dns_writers=VoidDnsWriter",
-        "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getAllowedRegistrantContactIds())
-        .containsExactly("alice", "bob");
-  }
-
-  @Test
-  void testSuccess_emptyAllowedRegistrants() throws Exception {
-    runCommandForced(
-        "--allowed_registrants=",
-        "--roid_suffix=Q9JYB4C",
-        "--dns_writers=VoidDnsWriter",
-        "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getAllowedRegistrantContactIds()).isEmpty();
-  }
-
-  @Test
-  void testSuccess_setAllowedNameservers() throws Exception {
-    runCommandForced(
-        "--allowed_nameservers=ns1.example.com,ns2.example.com",
-        "--roid_suffix=Q9JYB4C",
-        "--dns_writers=FooDnsWriter",
-        "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getAllowedFullyQualifiedHostNames())
-        .containsExactly("ns1.example.com", "ns2.example.com");
-  }
-
-  @Test
-  void testSuccess_emptyAllowedNameservers() throws Exception {
-    runCommandForced(
-        "--allowed_nameservers=",
-        "--roid_suffix=Q9JYB4C",
-        "--dns_writers=FooDnsWriter",
-        "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getAllowedFullyQualifiedHostNames()).isEmpty();
-  }
-
-  @Test
-  void testSuccess_setCommonReservedListOnTld() throws Exception {
-    runSuccessfulReservedListsTest("common_abuse");
-  }
-
-  @Test
-  void testSuccess_setTldSpecificReservedListOnTld() throws Exception {
-    runSuccessfulReservedListsTest("xn--q9jyb4c_abuse");
-  }
-
-  @Test
-  void testSuccess_setCommonReservedListAndTldSpecificReservedListOnTld() throws Exception {
-    runSuccessfulReservedListsTest("common_abuse,xn--q9jyb4c_abuse");
-  }
-
-  @Test
-  void testFailure_setReservedListFromOtherTld() {
-    runFailureReservedListsTest(
-        "tld_banned",
-        IllegalArgumentException.class,
-        "The reserved list(s) tld_banned cannot be applied to the tld xn--q9jyb4c");
-  }
-
-  @Test
-  void testSuccess_setReservedListFromOtherTld_withOverride() throws Exception {
-    runReservedListsTestOverride("tld_banned");
-  }
-
-  @Test
-  void testFailure_setCommonAndReservedListFromOtherTld() {
-    runFailureReservedListsTest(
-        "common_abuse,tld_banned",
-        IllegalArgumentException.class,
-        "The reserved list(s) tld_banned cannot be applied to the tld xn--q9jyb4c");
-  }
-
-  @Test
-  void testSuccess_setCommonAndReservedListFromOtherTld_withOverride() throws Exception {
-    command.errorPrintStream = System.err;
-    runReservedListsTestOverride("common_abuse,tld_banned");
-    String errMsg =
-        "Error overridden: The reserved list(s) tld_banned "
-            + "cannot be applied to the tld xn--q9jyb4c";
-    assertThat(getStderrAsString()).contains(errMsg);
-  }
-
-  @Test
-  void testFailure_setMultipleReservedListsFromOtherTld() {
-    runFailureReservedListsTest(
-        "tld_banned,soy_expurgated",
-        IllegalArgumentException.class,
-        "The reserved list(s) tld_banned, soy_expurgated cannot be applied to the tld xn--q9jyb4c");
-  }
-
-  @Test
-  void testSuccess_setMultipleReservedListsFromOtherTld_withOverride() throws Exception {
-    runReservedListsTestOverride("tld_banned,soy_expurgated");
-  }
-
-  @Test
-  void testFailure_setNonExistentReservedLists() {
-    runFailureReservedListsTest(
-        "xn--q9jyb4c_asdf,common_asdsdgh",
-        IllegalArgumentException.class,
-        "Could not find reserved list xn--q9jyb4c_asdf to add to the tld");
-  }
-
-  @Test
-  void testSuccess_setPremiumList() throws Exception {
-    runCommandForced(
-        "--premium_list=xn--q9jyb4c",
-        "--roid_suffix=Q9JYB4C",
-        "--dns_writers=FooDnsWriter",
-        "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getPremiumListName()).hasValue("xn--q9jyb4c");
-  }
-
-  @Test
-  void testSuccess_setDriveFolderIdToValue() throws Exception {
-    runCommandForced(
-        "--drive_folder_id=madmax2030",
-        "--roid_suffix=Q9JYB4C",
-        "--dns_writers=VoidDnsWriter",
-        "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getDriveFolderId()).isEqualTo("madmax2030");
-  }
-
-  @Test
-  void testSuccess_setDriveFolderIdToNull() throws Exception {
-    runCommandForced(
-        "--drive_folder_id=null",
-        "--roid_suffix=Q9JYB4C",
-        "--dns_writers=VoidDnsWriter",
-        "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getDriveFolderId()).isNull();
-  }
-
-  @Test
-  void testSuccess_setsIdnTables() throws Exception {
-    runCommandForced(
-        "--idn_tables=extended_latin,ja",
-        "--roid_suffix=ASDF",
-        "--dns_writers=VoidDnsWriter",
-        "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getIdnTables())
-        .containsExactly(IdnTableEnum.EXTENDED_LATIN, IdnTableEnum.JA);
-  }
-
-  @Test
-  void testFailure_invalidIdnTable() throws Exception {
-    IllegalArgumentException thrown =
-        assertThrows(
-            IllegalArgumentException.class,
-            () ->
-                runCommandForced(
-                    "--idn_tables=extended_latin,bad_value",
-                    "--roid_suffix=ASDF",
-                    "--dns_writers=VoidDnsWriter",
-                    "xn--q9jyb4c"));
-    assertThat(thrown)
-        .hasMessageThat()
-        .isEqualTo(
-            "IDN tables [EXTENDED_LATIN, BAD_VALUE] contained invalid value(s). Possible values:"
-                + " [EXTENDED_LATIN, UNCONFUSABLE_LATIN, JA]");
-  }
-
-  @Test
-  void testFailure_setPremiumListThatDoesntExist() {
-    IllegalArgumentException thrown =
-        assertThrows(
-            IllegalArgumentException.class,
-            () ->
-                runCommandForced(
-                    "--premium_list=phonies",
-                    "--roid_suffix=Q9JYB4C",
-                    "--dns_writers=VoidDnsWriter",
-                    "xn--q9jyb4c"));
-    assertThat(thrown).hasMessageThat().contains("The premium list 'phonies' doesn't exist");
-  }
-
-  @Test
-  void testFailure_specifiedDnsWriters_dontExist() {
-    IllegalArgumentException thrown =
-        assertThrows(
-            IllegalArgumentException.class,
-            () ->
-                runCommandForced(
-                    "xn--q9jyb4c", "--roid_suffix=Q9JYB4C", "--dns_writers=Invalid,Deadbeef"));
-    assertThat(thrown)
-        .hasMessageThat()
-        .contains("Invalid DNS writer name(s) specified: [Invalid, Deadbeef]");
-  }
-
-  @Test
-  void testSuccess_defaultToken() throws Exception {
-    AllocationToken token =
-        persistResource(
-            new AllocationToken()
-                .asBuilder()
-                .setToken("abc123")
-                .setTokenType(DEFAULT_PROMO)
-                .setAllowedTlds(ImmutableSet.of("xn--q9jyb4c"))
-                .build());
-    runCommandForced(
-        "--default_tokens=abc123",
-        "--roid_suffix=Q9JYB4C",
-        "--dns_writers=FooDnsWriter",
-        "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getDefaultPromoTokens()).containsExactly(token.createVKey());
-  }
-
-  @Test
-  void testSuccess_multipleDefaultTokens() throws Exception {
-    AllocationToken token =
-        persistResource(
-            new AllocationToken()
-                .asBuilder()
-                .setToken("abc123")
-                .setTokenType(DEFAULT_PROMO)
-                .setAllowedTlds(ImmutableSet.of("xn--q9jyb4c"))
-                .build());
-    AllocationToken token2 =
-        persistResource(
-            new AllocationToken()
-                .asBuilder()
-                .setToken("token")
-                .setTokenType(DEFAULT_PROMO)
-                .setAllowedTlds(ImmutableSet.of("xn--q9jyb4c"))
-                .build());
-    runCommandForced(
-        "--default_tokens=abc123,token",
-        "--roid_suffix=Q9JYB4C",
-        "--dns_writers=FooDnsWriter",
-        "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getDefaultPromoTokens())
-        .containsExactly(token.createVKey(), token2.createVKey());
-  }
-
-  @Test
-  void testFailure_specifiedDefaultToken_doesntExist() {
-    IllegalStateException thrown =
-        assertThrows(
-            IllegalStateException.class,
-            () ->
-                runCommandForced(
-                    "xn--q9jyb4c",
-                    "--default_tokens=InvalidToken",
-                    "--roid_suffix=Q9JYB4C",
-                    "--dns_writers=FooDnsWriter"));
-    assertThat(thrown)
-        .hasMessageThat()
-        .contains("Tokens with keys [VKey<AllocationToken>(sql:InvalidToken)] did not exist");
-  }
-
-  private void runSuccessfulReservedListsTest(String reservedLists) throws Exception {
-    runCommandForced(
-        "--reserved_lists",
-        reservedLists,
-        "--roid_suffix=Q9JYB4C",
-        "--dns_writers=VoidDnsWriter",
-        "xn--q9jyb4c");
-  }
-
-  private void runReservedListsTestOverride(String reservedLists) throws Exception {
-    runCommandForced(
-        "--override_reserved_list_rules",
-        "--reserved_lists",
-        reservedLists,
-        "--roid_suffix=Q9JYB4C",
-        "--dns_writers=VoidDnsWriter",
-        "xn--q9jyb4c");
-  }
-
-  private void runFailureReservedListsTest(
-      String reservedLists, Class<? extends Exception> errorClass, String errorMsg) {
-    Exception e =
-        assertThrows(
-            errorClass,
-            () ->
-                runCommandForced(
-                    "--reserved_lists",
-                    reservedLists,
-                    "--roid_suffix=Q9JYB4C",
-                    "--dns_writers=VoidDnsWriter",
-                    "xn--q9jyb4c"));
-    assertThat(e).hasMessageThat().isEqualTo(errorMsg);
-  }
-}
diff --git a/core/src/test/java/google/registry/tools/UpdateTldCommandTest.java b/core/src/test/java/google/registry/tools/UpdateTldCommandTest.java
deleted file mode 100644
index 6c33b6f1a..000000000
--- a/core/src/test/java/google/registry/tools/UpdateTldCommandTest.java
+++ /dev/null
@@ -1,1161 +0,0 @@
-// Copyright 2017 The Nomulus Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package google.registry.tools;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth8.assertThat;
-import static google.registry.model.domain.token.AllocationToken.TokenType.DEFAULT_PROMO;
-import static google.registry.model.tld.Tld.TldState.GENERAL_AVAILABILITY;
-import static google.registry.model.tld.Tld.TldState.PREDELEGATION;
-import static google.registry.model.tld.Tld.TldState.QUIET_PERIOD;
-import static google.registry.model.tld.Tld.TldState.START_DATE_SUNRISE;
-import static google.registry.testing.DatabaseHelper.createTld;
-import static google.registry.testing.DatabaseHelper.persistPremiumList;
-import static google.registry.testing.DatabaseHelper.persistReservedList;
-import static google.registry.testing.DatabaseHelper.persistResource;
-import static google.registry.util.DateTimeUtils.END_OF_TIME;
-import static google.registry.util.DateTimeUtils.START_OF_TIME;
-import static org.joda.money.CurrencyUnit.JPY;
-import static org.joda.money.CurrencyUnit.USD;
-import static org.joda.time.DateTimeZone.UTC;
-import static org.joda.time.Duration.standardMinutes;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-import com.beust.jcommander.ParameterException;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.ImmutableSortedMap;
-import google.registry.model.domain.token.AllocationToken;
-import google.registry.model.tld.Tld;
-import google.registry.tldconfig.idn.IdnTableEnum;
-import java.util.Optional;
-import org.joda.money.Money;
-import org.joda.time.DateTime;
-import org.joda.time.Duration;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-/** Unit tests for {@link UpdateTldCommand}. */
-class UpdateTldCommandTest extends CommandTestCase<UpdateTldCommand> {
-
-  private final DateTime now = DateTime.now(UTC);
-
-  @BeforeEach
-  void beforeEach() {
-    persistReservedList("common_abuse", "baa,FULLY_BLOCKED");
-    persistReservedList("xn--q9jyb4c_abuse", "lamb,FULLY_BLOCKED");
-    persistReservedList("tld_banned", "kilo,FULLY_BLOCKED", "lima,FULLY_BLOCKED");
-    persistReservedList("soy_expurgated", "fireflies,FULLY_BLOCKED");
-    persistPremiumList("xn--q9jyb4c", USD, "minecraft,USD 1000");
-    persistReservedList("xn--q9jyb4c_r1", "foo,FULLY_BLOCKED");
-    persistReservedList("xn--q9jyb4c_r2", "moop,FULLY_BLOCKED");
-    createTld("xn--q9jyb4c");
-    command.validDnsWriterNames = ImmutableSet.of("VoidDnsWriter", "FooDnsWriter");
-  }
-
-  @Test
-  void testSuccess_tldStateTransitions() throws Exception {
-    DateTime sunriseStart = now;
-    DateTime quietPeriodStart = sunriseStart.plusMonths(2);
-    DateTime gaStart = quietPeriodStart.plusWeeks(1);
-    runCommandForced(
-        String.format(
-            "--tld_state_transitions=%s=PREDELEGATION,%s=START_DATE_SUNRISE,%s=QUIET_PERIOD,"
-                + "%s=GENERAL_AVAILABILITY",
-            START_OF_TIME, sunriseStart, quietPeriodStart, gaStart),
-        "xn--q9jyb4c");
-
-    Tld registry = Tld.get("xn--q9jyb4c");
-    assertThat(registry.getTldState(sunriseStart.minusMillis(1))).isEqualTo(PREDELEGATION);
-    assertThat(registry.getTldState(sunriseStart)).isEqualTo(START_DATE_SUNRISE);
-    assertThat(registry.getTldState(sunriseStart.plusMillis(1))).isEqualTo(START_DATE_SUNRISE);
-    assertThat(registry.getTldState(quietPeriodStart.minusMillis(1))).isEqualTo(START_DATE_SUNRISE);
-    assertThat(registry.getTldState(quietPeriodStart)).isEqualTo(QUIET_PERIOD);
-    assertThat(registry.getTldState(quietPeriodStart.plusMillis(1))).isEqualTo(QUIET_PERIOD);
-    assertThat(registry.getTldState(gaStart.minusMillis(1))).isEqualTo(QUIET_PERIOD);
-    assertThat(registry.getTldState(gaStart)).isEqualTo(GENERAL_AVAILABILITY);
-    assertThat(registry.getTldState(gaStart.plusMillis(1))).isEqualTo(GENERAL_AVAILABILITY);
-    assertThat(registry.getTldState(END_OF_TIME)).isEqualTo(GENERAL_AVAILABILITY);
-  }
-
-  @Test
-  void testSuccess_setTldState() throws Exception {
-    persistResource(
-        Tld.get("xn--q9jyb4c")
-            .asBuilder()
-            .setTldStateTransitions(ImmutableSortedMap.of(START_OF_TIME, PREDELEGATION))
-            .build());
-    runCommandForced("--set_current_tld_state=START_DATE_SUNRISE", "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getTldState(now.plusDays(1))).isEqualTo(START_DATE_SUNRISE);
-  }
-
-  @Test
-  void testSuccess_renewBillingCostTransitions() throws Exception {
-    DateTime later = now.plusMonths(1);
-    runCommandForced(
-        String.format(
-            "--renew_billing_cost_transitions=\"%s=USD 1,%s=USD 2.00,%s=USD 100\"",
-            START_OF_TIME,
-            now,
-            later),
-        "xn--q9jyb4c");
-
-    Tld registry = Tld.get("xn--q9jyb4c");
-    assertThat(registry.getStandardRenewCost(START_OF_TIME)).isEqualTo(Money.of(USD, 1));
-    assertThat(registry.getStandardRenewCost(now.minusMillis(1))).isEqualTo(Money.of(USD, 1));
-    assertThat(registry.getStandardRenewCost(now)).isEqualTo(Money.of(USD, 2));
-    assertThat(registry.getStandardRenewCost(now.plusMillis(1))).isEqualTo(Money.of(USD, 2));
-    assertThat(registry.getStandardRenewCost(later.minusMillis(1))).isEqualTo(Money.of(USD, 2));
-    assertThat(registry.getStandardRenewCost(later)).isEqualTo(Money.of(USD, 100));
-    assertThat(registry.getStandardRenewCost(later.plusMillis(1))).isEqualTo(Money.of(USD, 100));
-    assertThat(registry.getStandardRenewCost(END_OF_TIME)).isEqualTo(Money.of(USD, 100));
-  }
-
-  @Test
-  void testSuccess_multipleArguments() throws Exception {
-    assertThat(Tld.get("xn--q9jyb4c").getAddGracePeriodLength()).isNotEqualTo(standardMinutes(5));
-    createTld("example");
-    assertThat(Tld.get("example").getAddGracePeriodLength()).isNotEqualTo(standardMinutes(5));
-
-    runCommandForced("--add_grace_period=PT300S", "xn--q9jyb4c", "example");
-
-    assertThat(Tld.get("xn--q9jyb4c").getAddGracePeriodLength()).isEqualTo(standardMinutes(5));
-    assertThat(Tld.get("example").getAddGracePeriodLength()).isEqualTo(standardMinutes(5));
-  }
-
-  @Test
-  void testSuccess_addGracePeriodFlag() throws Exception {
-    assertThat(Tld.get("xn--q9jyb4c").getAddGracePeriodLength()).isNotEqualTo(standardMinutes(5));
-    runCommandForced("--add_grace_period=PT300S", "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getAddGracePeriodLength()).isEqualTo(standardMinutes(5));
-  }
-
-  @Test
-  void testSuccess_redemptionGracePeriodFlag() throws Exception {
-    assertThat(Tld.get("xn--q9jyb4c").getRedemptionGracePeriodLength())
-        .isNotEqualTo(standardMinutes(5));
-    runCommandForced("--redemption_grace_period=PT300S", "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getRedemptionGracePeriodLength())
-        .isEqualTo(standardMinutes(5));
-  }
-
-  @Test
-  void testSuccess_pendingDeleteLengthFlag() throws Exception {
-    assertThat(Tld.get("xn--q9jyb4c").getPendingDeleteLength()).isNotEqualTo(standardMinutes(5));
-    runCommandForced("--pending_delete_length=PT300S", "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getPendingDeleteLength()).isEqualTo(standardMinutes(5));
-  }
-
-  @Test
-  void testSuccess_dnsWriter() throws Exception {
-    assertThat(Tld.get("xn--q9jyb4c").getDnsWriters()).containsExactly("VoidDnsWriter");
-    runCommandForced("--dns_writers=FooDnsWriter", "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getDnsWriters()).containsExactly("FooDnsWriter");
-  }
-
-  @Test
-  void testSuccess_multipleDnsWriters() throws Exception {
-    assertThat(Tld.get("xn--q9jyb4c").getDnsWriters()).containsExactly("VoidDnsWriter");
-
-    runCommandForced("--dns_writers=FooDnsWriter,VoidDnsWriter", "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getDnsWriters())
-        .containsExactly("FooDnsWriter", "VoidDnsWriter");
-  }
-
-  @Test
-  void testSuccess_defaultToken() throws Exception {
-    AllocationToken token =
-        persistResource(
-            new AllocationToken()
-                .asBuilder()
-                .setToken("abc123")
-                .setTokenType(DEFAULT_PROMO)
-                .setAllowedTlds(ImmutableSet.of("xn--q9jyb4c"))
-                .build());
-    assertThat(Tld.get("xn--q9jyb4c").getDefaultPromoTokens()).isEmpty();
-    runCommandForced("--default_tokens=abc123", "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getDefaultPromoTokens()).containsExactly(token.createVKey());
-  }
-
-  @Test
-  void testSuccess_multipleDefaultTokens() throws Exception {
-    AllocationToken token =
-        persistResource(
-            new AllocationToken()
-                .asBuilder()
-                .setToken("abc123")
-                .setTokenType(DEFAULT_PROMO)
-                .setAllowedTlds(ImmutableSet.of("xn--q9jyb4c"))
-                .build());
-    AllocationToken token2 =
-        persistResource(
-            new AllocationToken()
-                .asBuilder()
-                .setToken("token")
-                .setTokenType(DEFAULT_PROMO)
-                .setAllowedTlds(ImmutableSet.of("xn--q9jyb4c"))
-                .build());
-    assertThat(Tld.get("xn--q9jyb4c").getDefaultPromoTokens()).isEmpty();
-    runCommandForced("--default_tokens=abc123,token", "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getDefaultPromoTokens())
-        .containsExactly(token.createVKey(), token2.createVKey());
-  }
-
-  @Test
-  void testSuccess_emptyTokenList() throws Exception {
-    AllocationToken token =
-        persistResource(
-            new AllocationToken()
-                .asBuilder()
-                .setToken("abc123")
-                .setTokenType(DEFAULT_PROMO)
-                .setAllowedTlds(ImmutableSet.of("xn--q9jyb4c"))
-                .build());
-    assertThat(Tld.get("xn--q9jyb4c").getDefaultPromoTokens()).isEmpty();
-    persistResource(
-        Tld.get("xn--q9jyb4c")
-            .asBuilder()
-            .setDefaultPromoTokens(ImmutableList.of(token.createVKey()))
-            .build());
-    assertThat(Tld.get("xn--q9jyb4c").getDefaultPromoTokens()).containsExactly(token.createVKey());
-    runCommandForced("--default_tokens=", "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getDefaultPromoTokens()).isEmpty();
-  }
-
-  @Test
-  void testSuccess_replaceExistingDefaultTokensListOrder() throws Exception {
-    AllocationToken token =
-        persistResource(
-            new AllocationToken()
-                .asBuilder()
-                .setToken("abc123")
-                .setTokenType(DEFAULT_PROMO)
-                .setAllowedTlds(ImmutableSet.of("xn--q9jyb4c"))
-                .build());
-    AllocationToken token2 =
-        persistResource(
-            new AllocationToken()
-                .asBuilder()
-                .setToken("token")
-                .setTokenType(DEFAULT_PROMO)
-                .setAllowedTlds(ImmutableSet.of("xn--q9jyb4c"))
-                .build());
-    AllocationToken token3 =
-        persistResource(
-            new AllocationToken()
-                .asBuilder()
-                .setToken("othertoken")
-                .setTokenType(DEFAULT_PROMO)
-                .setAllowedTlds(ImmutableSet.of("xn--q9jyb4c"))
-                .build());
-    assertThat(Tld.get("xn--q9jyb4c").getDefaultPromoTokens()).isEmpty();
-    persistResource(
-        Tld.get("xn--q9jyb4c")
-            .asBuilder()
-            .setDefaultPromoTokens(ImmutableList.of(token.createVKey(), token2.createVKey()))
-            .build());
-    assertThat(Tld.get("xn--q9jyb4c").getDefaultPromoTokens())
-        .containsExactly(token.createVKey(), token2.createVKey());
-    runCommandForced("--default_tokens=token,othertoken", "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getDefaultPromoTokens())
-        .containsExactly(token2.createVKey(), token3.createVKey());
-  }
-
-  @Test
-  void testFailure_specifiedDefaultToken_doesntExist() {
-    IllegalStateException thrown =
-        assertThrows(
-            IllegalStateException.class,
-            () -> runCommandForced("xn--q9jyb4c", "--default_tokens=InvalidToken"));
-    assertThat(thrown)
-        .hasMessageThat()
-        .contains("Tokens with keys [VKey<AllocationToken>(sql:InvalidToken)] did not exist");
-  }
-
-  @Test
-  void testSuccess_escrow() throws Exception {
-    runCommandForced("--escrow=true", "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getEscrowEnabled()).isTrue();
-  }
-
-  @Test
-  void testSuccess_noEscrow() throws Exception {
-    runCommandForced("--escrow=false", "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getEscrowEnabled()).isFalse();
-  }
-
-  @Test
-  void testSuccess_createBillingCostFlag() throws Exception {
-    runCommandForced("--create_billing_cost=\"USD 42.42\"", "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getCreateBillingCost()).isEqualTo(Money.of(USD, 42.42));
-  }
-
-  @Test
-  void testSuccess_restoreBillingCostFlag() throws Exception {
-    runCommandForced("--restore_billing_cost=\"USD 42.42\"", "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getRestoreBillingCost()).isEqualTo(Money.of(USD, 42.42));
-  }
-
-  @Test
-  void testSuccess_nonUsdBillingCostFlag() throws Exception {
-    persistResource(
-        Tld.get("xn--q9jyb4c")
-            .asBuilder()
-            .setCurrency(JPY)
-            .setCreateBillingCost(Money.ofMajor(JPY, 1))
-            .setRestoreBillingCost(Money.ofMajor(JPY, 1))
-            .setRenewBillingCostTransitions(
-                ImmutableSortedMap.of(START_OF_TIME, Money.ofMajor(JPY, 1)))
-            .setEapFeeSchedule(ImmutableSortedMap.of(START_OF_TIME, Money.zero(JPY)))
-            .setServerStatusChangeBillingCost(Money.ofMajor(JPY, 1))
-            .setRegistryLockOrUnlockBillingCost(Money.ofMajor(JPY, 1))
-            .build());
-    runCommandForced(
-        "--create_billing_cost=\"JPY 12345\"",
-        "--restore_billing_cost=\"JPY 67890\"",
-        "--renew_billing_cost_transitions=\"0=JPY 101112\"",
-        "--server_status_change_cost=\"JPY 97865\"",
-        "--registry_lock_or_unlock_cost=\"JPY 9001\"",
-        "xn--q9jyb4c");
-    Tld registry = Tld.get("xn--q9jyb4c");
-    assertThat(registry.getCreateBillingCost()).isEqualTo(Money.ofMajor(JPY, 12345));
-    assertThat(registry.getRestoreBillingCost()).isEqualTo(Money.ofMajor(JPY, 67890));
-    assertThat(registry.getStandardRenewCost(START_OF_TIME)).isEqualTo(Money.ofMajor(JPY, 101112));
-    assertThat(registry.getServerStatusChangeBillingCost()).isEqualTo(Money.ofMajor(JPY, 97865));
-    assertThat(registry.getRegistryLockOrUnlockBillingCost()).isEqualTo(Money.ofMajor(JPY, 9001));
-  }
-
-  @Test
-  void testSuccess_setLordnUsername() throws Exception {
-    runCommandForced("--lordn_username=lordn000", "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getLordnUsername()).isEqualTo("lordn000");
-  }
-
-  @Test
-  void testSuccess_setOptionalParamsNullString() throws Exception {
-    persistResource(Tld.get("xn--q9jyb4c").asBuilder().setLordnUsername("lordn000").build());
-    runCommandForced("--lordn_username=null", "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getLordnUsername()).isNull();
-  }
-
-  @Test
-  void testSuccess_setOptionalParamsEmptyString() throws Exception {
-    persistResource(Tld.get("xn--q9jyb4c").asBuilder().setLordnUsername("lordn000").build());
-    runCommandForced("--lordn_username=", "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getLordnUsername()).isNull();
-  }
-
-  @Test
-  void testSuccess_setReservedLists() throws Exception {
-    runCommandForced("--reserved_lists=xn--q9jyb4c_r1,xn--q9jyb4c_r2", "xn--q9jyb4c");
-
-    assertThat(Tld.get("xn--q9jyb4c").getReservedListNames())
-        .containsExactly("xn--q9jyb4c_r1", "xn--q9jyb4c_r2");
-  }
-
-  @Test
-  void testSuccess_setReservedListsOverwrites() throws Exception {
-    persistResource(
-        Tld.get("xn--q9jyb4c")
-            .asBuilder()
-            .setReservedListsByName(ImmutableSet.of("xn--q9jyb4c_r1", "xn--q9jyb4c_r2"))
-            .build());
-    runCommandForced("--reserved_lists=xn--q9jyb4c_r2", "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getReservedListNames()).containsExactly("xn--q9jyb4c_r2");
-  }
-
-  @Test
-  void testSuccess_addReservedLists() throws Exception {
-    persistResource(
-        Tld.get("xn--q9jyb4c")
-            .asBuilder()
-            .setReservedListsByName(ImmutableSet.of("xn--q9jyb4c_r1"))
-            .build());
-    runCommandForced("--add_reserved_lists=xn--q9jyb4c_r2", "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getReservedListNames())
-        .containsExactly("xn--q9jyb4c_r1", "xn--q9jyb4c_r2");
-  }
-
-  @Test
-  void testSuccess_removeAllReservedLists() throws Exception {
-    persistResource(
-        Tld.get("xn--q9jyb4c")
-            .asBuilder()
-            .setReservedListsByName(ImmutableSet.of("xn--q9jyb4c_r1", "xn--q9jyb4c_r2"))
-            .build());
-    runCommandForced("--remove_reserved_lists=xn--q9jyb4c_r1,xn--q9jyb4c_r2", "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getReservedListNames()).isEmpty();
-  }
-
-  @Test
-  void testSuccess_removeSomeReservedLists() throws Exception {
-    persistResource(
-        Tld.get("xn--q9jyb4c")
-            .asBuilder()
-            .setReservedListsByName(ImmutableSet.of("xn--q9jyb4c_r1", "xn--q9jyb4c_r2"))
-            .build());
-    runCommandForced("--remove_reserved_lists=xn--q9jyb4c_r1", "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getReservedListNames()).containsExactly("xn--q9jyb4c_r2");
-  }
-
-  @Test
-  void testSuccess_setAllowedRegistrants() throws Exception {
-    runCommandForced("--allowed_registrants=alice,bob", "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getAllowedRegistrantContactIds())
-        .containsExactly("alice", "bob");
-  }
-
-  @Test
-  void testSuccess_setAllowedRegistrantsOverwrites() throws Exception {
-    persistResource(
-        Tld.get("xn--q9jyb4c")
-            .asBuilder()
-            .setAllowedRegistrantContactIds(ImmutableSet.of("jane", "john"))
-            .build());
-    runCommandForced("--allowed_registrants=alice,bob", "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getAllowedRegistrantContactIds())
-        .containsExactly("alice", "bob");
-  }
-
-  @Test
-  void testSuccess_emptyAllowedRegistrants() throws Exception {
-    persistResource(
-        Tld.get("xn--q9jyb4c")
-            .asBuilder()
-            .setAllowedRegistrantContactIds(ImmutableSet.of("jane", "john"))
-            .build());
-    runCommandForced("--allowed_registrants=", "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getAllowedRegistrantContactIds()).isEmpty();
-  }
-
-  @Test
-  void testSuccess_addAllowedRegistrants() throws Exception {
-    persistResource(
-        Tld.get("xn--q9jyb4c")
-            .asBuilder()
-            .setAllowedRegistrantContactIds(ImmutableSet.of("alice"))
-            .build());
-    runCommandForced("--add_allowed_registrants=bob", "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getAllowedRegistrantContactIds())
-        .containsExactly("alice", "bob");
-  }
-
-  @Test
-  void testSuccess_removeAllAllowedRegistrants() throws Exception {
-    persistResource(
-        Tld.get("xn--q9jyb4c")
-            .asBuilder()
-            .setAllowedRegistrantContactIds(ImmutableSet.of("alice", "bob"))
-            .build());
-    runCommandForced("--remove_allowed_registrants=alice,bob", "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getAllowedRegistrantContactIds()).isEmpty();
-  }
-
-  @Test
-  void testSuccess_removeSomeAllowedRegistrants() throws Exception {
-    persistResource(
-        Tld.get("xn--q9jyb4c")
-            .asBuilder()
-            .setAllowedRegistrantContactIds(ImmutableSet.of("alice", "bob"))
-            .build());
-    runCommandForced("--remove_allowed_registrants=alice", "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getAllowedRegistrantContactIds()).containsExactly("bob");
-  }
-
-  @Test
-  void testSuccess_setAllowedNameservers() throws Exception {
-    runCommandForced("--allowed_nameservers=ns1.example.com,ns2.example.com", "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getAllowedFullyQualifiedHostNames())
-        .containsExactly("ns1.example.com", "ns2.example.com");
-  }
-
-  @Test
-  void testSuccess_setAllowedNameserversOverwrites() throws Exception {
-    persistResource(
-        Tld.get("xn--q9jyb4c")
-            .asBuilder()
-            .setAllowedFullyQualifiedHostNames(
-                ImmutableSet.of("ns1.example.tld", "ns2.example.tld"))
-            .build());
-    runCommandForced("--allowed_nameservers=ns1.example.com,ns2.example.com", "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getAllowedFullyQualifiedHostNames())
-        .containsExactly("ns1.example.com", "ns2.example.com");
-  }
-
-  @Test
-  void testSuccess_emptyAllowedNameservers() throws Exception {
-    persistResource(
-        Tld.get("xn--q9jyb4c")
-            .asBuilder()
-            .setAllowedFullyQualifiedHostNames(ImmutableSet.of("ns1.example.com"))
-            .build());
-    runCommandForced("--allowed_nameservers=", "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getAllowedFullyQualifiedHostNames()).isEmpty();
-  }
-
-  @Test
-  void testSuccess_addAllowedNameservers() throws Exception {
-    persistResource(
-        Tld.get("xn--q9jyb4c")
-            .asBuilder()
-            .setAllowedFullyQualifiedHostNames(ImmutableSet.of("ns1.example.com"))
-            .build());
-    runCommandForced("--add_allowed_nameservers=ns2.example.com", "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getAllowedFullyQualifiedHostNames())
-        .containsExactly("ns1.example.com", "ns2.example.com");
-  }
-
-  @Test
-  void testSuccess_removeAllAllowedNameservers() throws Exception {
-    persistResource(
-        Tld.get("xn--q9jyb4c")
-            .asBuilder()
-            .setAllowedFullyQualifiedHostNames(
-                ImmutableSet.of("ns1.example.com", "ns2.example.com"))
-            .build());
-    runCommandForced("--remove_allowed_nameservers=ns1.example.com,ns2.example.com", "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getAllowedFullyQualifiedHostNames()).isEmpty();
-  }
-
-  @Test
-  void testSuccess_removeSomeAllowedNameservers() throws Exception {
-    persistResource(
-        Tld.get("xn--q9jyb4c")
-            .asBuilder()
-            .setAllowedFullyQualifiedHostNames(
-                ImmutableSet.of("ns1.example.com", "ns2.example.com"))
-            .build());
-    runCommandForced("--remove_allowed_nameservers=ns1.example.com", "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getAllowedFullyQualifiedHostNames())
-        .containsExactly("ns2.example.com");
-  }
-
-  @Test
-  void testFailure_invalidAddGracePeriod() {
-    IllegalArgumentException thrown =
-        assertThrows(
-            IllegalArgumentException.class,
-            () -> runCommandForced("--add_grace_period=5m", "xn--q9jyb4c"));
-    assertThat(thrown).hasMessageThat().contains("Invalid format: \"5m\"");
-  }
-
-  @Test
-  void testFailure_invalidRedemptionGracePeriod() {
-    IllegalArgumentException thrown =
-        assertThrows(
-            IllegalArgumentException.class,
-            () -> runCommandForced("--redemption_grace_period=5m", "xn--q9jyb4c"));
-    assertThat(thrown).hasMessageThat().contains("Invalid format: \"5m\"");
-  }
-
-  @Test
-  void testFailure_invalidPendingDeleteLength() {
-    IllegalArgumentException thrown =
-        assertThrows(
-            IllegalArgumentException.class,
-            () -> runCommandForced("--pending_delete_length=5m", "xn--q9jyb4c"));
-    assertThat(thrown).hasMessageThat().contains("Invalid format: \"5m\"");
-  }
-
-  @Test
-  void testFailure_invalidTldState() {
-    ParameterException thrown =
-        assertThrows(
-            ParameterException.class,
-            () ->
-                runCommandForced(
-                    "--tld_state_transitions=" + START_OF_TIME + "=INVALID_STATE", "xn--q9jyb4c"));
-    assertThat(thrown)
-        .hasMessageThat()
-        .contains("INVALID_STATE not formatted correctly or has transition times out of order");
-  }
-
-  @Test
-  void testFailure_invalidTldStateTransitionTime() {
-    ParameterException thrown =
-        assertThrows(
-            ParameterException.class,
-            () ->
-                runCommandForced("--tld_state_transitions=tomorrow=INVALID_STATE", "xn--q9jyb4c"));
-    assertThat(thrown)
-        .hasMessageThat()
-        .contains("INVALID_STATE not formatted correctly or has transition times out of order");
-  }
-
-  @Test
-  void testFailure_tldStatesOutOfOrder() {
-    IllegalArgumentException thrown =
-        assertThrows(
-            IllegalArgumentException.class,
-            () ->
-                runCommandForced(
-                    String.format(
-                        "--tld_state_transitions=%s=START_DATE_SUNRISE,%s=PREDELEGATION",
-                        now, now.plusMonths(1)),
-                    "xn--q9jyb4c"));
-    assertThat(thrown).hasMessageThat().contains("The TLD states are chronologically out of order");
-  }
-
-  @Test
-  void testFailure_duplicateTldStateTransitions() {
-    IllegalArgumentException thrown =
-        assertThrows(
-            IllegalArgumentException.class,
-            () ->
-                runCommandForced(
-                    String.format(
-                        "--tld_state_transitions=%s=START_DATE_SUNRISE,%s=START_DATE_SUNRISE",
-                        now, now.plusMonths(1)),
-                    "xn--q9jyb4c"));
-    assertThat(thrown).hasMessageThat().contains("The TLD states are chronologically out of order");
-  }
-
-  @Test
-  void testFailure_duplicateTldStateTransitionTimes() {
-    ParameterException thrown =
-        assertThrows(
-            ParameterException.class,
-            () ->
-                runCommandForced(
-                    String.format(
-                        "--tld_state_transitions=%s=PREDELEGATION,%s=START_DATE_SUNRISE", now, now),
-                    "xn--q9jyb4c"));
-    assertThat(thrown)
-        .hasMessageThat()
-        .contains("not formatted correctly or has transition times out of order");
-  }
-
-  @Test
-  void testFailure_outOfOrderTldStateTransitionTimes() {
-    ParameterException thrown =
-        assertThrows(
-            ParameterException.class,
-            () ->
-                runCommandForced(
-                    String.format(
-                        "--tld_state_transitions=%s=PREDELEGATION,%s=START_DATE_SUNRISE",
-                        now, now.minus(Duration.millis(1))),
-                    "xn--q9jyb4c"));
-    assertThat(thrown)
-        .hasMessageThat()
-        .contains("not formatted correctly or has transition times out of order");
-  }
-
-  @Test
-  void testFailure_bothTldStateFlags() {
-    IllegalArgumentException thrown =
-        assertThrows(
-            IllegalArgumentException.class,
-            () ->
-                runCommandForced(
-                    String.format(
-                        "--tld_state_transitions=%s=PREDELEGATION,%s=START_DATE_SUNRISE",
-                        now, now.plusDays(1)),
-                    "--set_current_tld_state=GENERAL_AVAILABILITY",
-                    "xn--q9jyb4c"));
-    assertThat(thrown)
-        .hasMessageThat()
-        .contains("Don't pass both --set_current_tld_state and --tld_state_transitions");
-    }
-
-  @Test
-  void testFailure_setCurrentTldState_outOfOrder() {
-    persistResource(
-        Tld.get("xn--q9jyb4c")
-            .asBuilder()
-            .setTldStateTransitions(
-                ImmutableSortedMap.of(
-                    START_OF_TIME, PREDELEGATION, now.minusMonths(1), GENERAL_AVAILABILITY))
-            .build());
-    IllegalArgumentException thrown =
-        assertThrows(
-            IllegalArgumentException.class,
-            () -> runCommandForced("--set_current_tld_state=START_DATE_SUNRISE", "xn--q9jyb4c"));
-    assertThat(thrown).hasMessageThat().contains("The TLD states are chronologically out of order");
-  }
-
-  @Test
-  void testFailure_setCurrentTldState_laterTransitionScheduled() {
-    persistResource(
-        Tld.get("xn--q9jyb4c")
-            .asBuilder()
-            .setTldStateTransitions(
-                ImmutableSortedMap.of(
-                    START_OF_TIME, PREDELEGATION, now.plusMonths(1), GENERAL_AVAILABILITY))
-            .build());
-    IllegalArgumentException thrown =
-        assertThrows(
-            IllegalArgumentException.class,
-            () -> runCommandForced("--set_current_tld_state=START_DATE_SUNRISE", "xn--q9jyb4c"));
-    assertThat(thrown)
-        .hasMessageThat()
-        .contains(" when there is a later transition already scheduled");
-  }
-
-  @Test
-  void testFailure_setCurrentTldState_inProduction() {
-    persistResource(
-        Tld.get("xn--q9jyb4c")
-            .asBuilder()
-            .setTldStateTransitions(
-                ImmutableSortedMap.of(
-                    START_OF_TIME, PREDELEGATION, now.minusMonths(1), GENERAL_AVAILABILITY))
-            .build());
-    IllegalArgumentException thrown =
-        assertThrows(
-            IllegalArgumentException.class,
-            () ->
-                runCommandInEnvironment(
-                    RegistryToolEnvironment.PRODUCTION,
-                    "--set_current_tld_state=START_DATE_SUNRISE",
-                    "xn--q9jyb4c",
-                    "--force"));
-    assertThat(thrown)
-        .hasMessageThat()
-        .contains("--set_current_tld_state is not safe to use in production.");
-  }
-
-  @Test
-  void testFailure_invalidRenewBillingCost() {
-    ParameterException thrown =
-        assertThrows(
-            ParameterException.class,
-            () ->
-                runCommandForced(
-                    String.format("--renew_billing_cost_transitions=%s=US42", START_OF_TIME),
-                    "xn--q9jyb4c"));
-    assertThat(thrown)
-        .hasMessageThat()
-        .contains("not formatted correctly or has transition times out of order");
-  }
-
-  @Test
-  void testFailure_negativeRenewBillingCost() {
-    IllegalArgumentException thrown =
-        assertThrows(
-            IllegalArgumentException.class,
-            () ->
-                runCommandForced(
-                    String.format("--renew_billing_cost_transitions=%s=USD-42", START_OF_TIME),
-                    "xn--q9jyb4c"));
-    assertThat(thrown).hasMessageThat().contains("Renew billing cost cannot be negative");
-  }
-
-  @Test
-  void testFailure_invalidRenewCostTransitionTime() {
-    ParameterException thrown =
-        assertThrows(
-            ParameterException.class,
-            () ->
-                runCommandForced("--renew_billing_cost_transitions=tomorrow=USD 1", "xn--q9jyb4c"));
-    assertThat(thrown)
-        .hasMessageThat()
-        .contains("not formatted correctly or has transition times out of order");
-  }
-
-  @Test
-  void testFailure_duplicateRenewCostTransitionTimes() {
-    ParameterException thrown =
-        assertThrows(
-            ParameterException.class,
-            () ->
-                runCommandForced(
-                    String.format(
-                        "--renew_billing_cost_transitions=\"%s=USD 1,%s=USD 2\"", now, now),
-                    "xn--q9jyb4c"));
-    assertThat(thrown)
-        .hasMessageThat()
-        .contains("not formatted correctly or has transition times out of order");
-  }
-
-  @Test
-  void testFailure_outOfOrderRenewCostTransitionTimes() {
-    ParameterException thrown =
-        assertThrows(
-            ParameterException.class,
-            () ->
-                runCommandForced(
-                    String.format(
-                        "--renew_billing_cost_transitions=\"%s=USD 1,%s=USD 2\"",
-                        now, now.minus(Duration.millis(1))),
-                    "xn--q9jyb4c"));
-    assertThat(thrown)
-        .hasMessageThat()
-        .contains("not formatted correctly or has transition times out of order");
-  }
-
-  @Test
-  void testFailure_noTldName() {
-    ParameterException thrown = assertThrows(ParameterException.class, this::runCommandForced);
-    assertThat(thrown)
-        .hasMessageThat()
-        .contains("Main parameters are required (\"Names of the TLDs\")");
-  }
-
-  @Test
-  void testFailure_oneTldDoesNotExist() {
-    IllegalArgumentException thrown =
-        assertThrows(IllegalArgumentException.class, () -> runCommandForced("foo", "xn--q9jyb4c"));
-    assertThat(thrown).hasMessageThat().contains("TLD foo does not exist");
-  }
-
-  @Test
-  void testFailure_duplicateArguments() {
-    IllegalArgumentException thrown =
-        assertThrows(
-            IllegalArgumentException.class, () -> runCommandForced("xn--q9jyb4c", "xn--q9jyb4c"));
-    assertThat(thrown).hasMessageThat().contains("Duplicate arguments found: 'xn--q9jyb4c'");
-  }
-
-  @Test
-  void testFailure_tldDoesNotExist() {
-    IllegalArgumentException thrown =
-        assertThrows(IllegalArgumentException.class, () -> runCommandForced("foobarbaz"));
-    assertThat(thrown).hasMessageThat().contains("TLD foobarbaz does not exist");
-  }
-
-  @Test
-  void testFailure_specifiedDnsWriter_doesntExist() {
-    IllegalArgumentException thrown =
-        assertThrows(
-            IllegalArgumentException.class,
-            () -> runCommandForced("xn--q9jyb4c", "--dns_writers=InvalidDnsWriter"));
-    assertThat(thrown)
-        .hasMessageThat()
-        .contains("Invalid DNS writer name(s) specified: [InvalidDnsWriter]");
-  }
-
-  @Test
-  void testFailure_setNonExistentReservedLists() {
-    IllegalArgumentException thrown =
-        assertThrows(
-            IllegalArgumentException.class,
-            () -> runCommandForced("--reserved_lists", "xn--q9jyb4c_ZZZ", "xn--q9jyb4c"));
-    assertThat(thrown)
-        .hasMessageThat()
-        .contains("Could not find reserved list xn--q9jyb4c_ZZZ to add to the tld");
-  }
-
-  @Test
-  void testFailure_cantAddDuplicateReservedList() {
-    persistResource(
-        Tld.get("xn--q9jyb4c")
-            .asBuilder()
-            .setReservedListsByName(ImmutableSet.of("xn--q9jyb4c_r1", "xn--q9jyb4c_r2"))
-            .build());
-    IllegalArgumentException thrown =
-        assertThrows(
-            IllegalArgumentException.class,
-            () -> runCommandForced("--add_reserved_lists=xn--q9jyb4c_r1", "xn--q9jyb4c"));
-    assertThat(thrown).hasMessageThat().contains("xn--q9jyb4c_r1");
-  }
-
-  @Test
-  void testFailure_cantRemoveReservedListThatIsntPresent() {
-    persistResource(
-        Tld.get("xn--q9jyb4c")
-            .asBuilder()
-            .setReservedListsByName(ImmutableSet.of("xn--q9jyb4c_r1", "xn--q9jyb4c_r2"))
-            .build());
-    IllegalArgumentException thrown =
-        assertThrows(
-            IllegalArgumentException.class,
-            () -> runCommandForced("--remove_reserved_lists=xn--q9jyb4c_Z", "xn--q9jyb4c"));
-    assertThat(thrown).hasMessageThat().contains("xn--q9jyb4c_Z");
-  }
-
-  @Test
-  void testFailure_cantAddAndRemoveSameReservedListSimultaneously() {
-    IllegalArgumentException thrown =
-        assertThrows(
-            IllegalArgumentException.class,
-            () ->
-                runCommandForced(
-                    "--add_reserved_lists=xn--q9jyb4c_r1",
-                    "--remove_reserved_lists=xn--q9jyb4c_r1",
-                    "xn--q9jyb4c"));
-    assertThat(thrown).hasMessageThat().contains("xn--q9jyb4c_r1");
-  }
-
-  @Test
-  void testFailure_cantAddDuplicateAllowedRegistrants() {
-    persistResource(
-        Tld.get("xn--q9jyb4c")
-            .asBuilder()
-            .setAllowedRegistrantContactIds(ImmutableSet.of("alice", "bob"))
-            .build());
-    IllegalArgumentException thrown =
-        assertThrows(
-            IllegalArgumentException.class,
-            () -> runCommandForced("--add_allowed_registrants=alice", "xn--q9jyb4c"));
-    assertThat(thrown).hasMessageThat().contains("alice");
-  }
-
-  @Test
-  void testFailure_cantRemoveAllowedRegistrantThatIsntPresent() {
-    persistResource(
-        Tld.get("xn--q9jyb4c")
-            .asBuilder()
-            .setAllowedRegistrantContactIds(ImmutableSet.of("alice"))
-            .build());
-    IllegalArgumentException thrown =
-        assertThrows(
-            IllegalArgumentException.class,
-            () -> runCommandForced("--remove_allowed_registrants=bob", "xn--q9jyb4c"));
-    assertThat(thrown).hasMessageThat().contains("bob");
-  }
-
-  @Test
-  void testFailure_cantAddAndRemoveSameAllowedRegistrantsSimultaneously() {
-    IllegalArgumentException thrown =
-        assertThrows(
-            IllegalArgumentException.class,
-            () ->
-                runCommandForced(
-                    "--add_allowed_registrants=alice",
-                    "--remove_allowed_registrants=alice",
-                    "xn--q9jyb4c"));
-    assertThat(thrown).hasMessageThat().contains("alice");
-  }
-
-  @Test
-  void testFailure_cantAddDuplicateAllowedNameservers() {
-    persistResource(
-        Tld.get("xn--q9jyb4c")
-            .asBuilder()
-            .setAllowedFullyQualifiedHostNames(
-                ImmutableSet.of("ns1.example.com", "ns2.example.com"))
-            .build());
-    IllegalArgumentException thrown =
-        assertThrows(
-            IllegalArgumentException.class,
-            () -> runCommandForced("--add_allowed_nameservers=ns1.example.com", "xn--q9jyb4c"));
-    assertThat(thrown).hasMessageThat().contains("ns1.example.com");
-  }
-
-  @Test
-  void testFailure_cantRemoveAllowedNameserverThatIsntPresent() {
-    persistResource(
-        Tld.get("xn--q9jyb4c")
-            .asBuilder()
-            .setAllowedFullyQualifiedHostNames(ImmutableSet.of("ns1.example.com"))
-            .build());
-    IllegalArgumentException thrown =
-        assertThrows(
-            IllegalArgumentException.class,
-            () -> runCommandForced("--remove_allowed_nameservers=ns2.example.com", "xn--q9jyb4c"));
-    assertThat(thrown).hasMessageThat().contains("ns2.example.com");
-  }
-
-  @Test
-  void testFailure_cantAddAndRemoveSameAllowedNameserversSimultaneously() {
-    IllegalArgumentException thrown =
-        assertThrows(
-            IllegalArgumentException.class,
-            () ->
-                runCommandForced(
-                    "--add_allowed_nameservers=ns1.example.com",
-                    "--remove_allowed_nameservers=ns1.example.com",
-                    "xn--q9jyb4c"));
-    assertThat(thrown).hasMessageThat().contains("ns1.example.com");
-  }
-
-  @Test
-  void testSuccess_canSetRoidSuffixToWhatItAlreadyIs() throws Exception {
-    createTld("foo", "BLAH");
-    runCommandForced("--roid_suffix=BLAH", "foo");
-    assertThat(Tld.get("foo").getRoidSuffix()).isEqualTo("BLAH");
-  }
-
-  @Test
-  void testSuccess_updateRoidSuffix() throws Exception {
-    createTld("foo", "ARGLE");
-    runCommandForced("--roid_suffix=BARGLE", "foo");
-    assertThat(Tld.get("foo").getRoidSuffix()).isEqualTo("BARGLE");
-  }
-
-  @Test
-  void testSuccess_removePremiumListWithNull() throws Exception {
-    runCommandForced("--premium_list=null", "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getPremiumListName()).isEmpty();
-  }
-
-  @Test
-  void testSuccess_removePremiumListWithBlank() throws Exception {
-    runCommandForced("--premium_list=", "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getPremiumListName()).isEmpty();
-  }
-
-  @Test
-  void testSuccess_premiumListNotRemovedWhenNotSpecified() throws Exception {
-    runCommandForced("--add_reserved_lists=xn--q9jyb4c_r1,xn--q9jyb4c_r2", "xn--q9jyb4c");
-    Optional<String> premiumListName = Tld.get("xn--q9jyb4c").getPremiumListName();
-    assertThat(premiumListName).hasValue("xn--q9jyb4c");
-  }
-
-  @Test
-  void testSuccess_driveFolderId_notRemovedWhenNotSpecified() throws Exception {
-    persistResource(Tld.get("xn--q9jyb4c").asBuilder().setDriveFolderId("foobar").build());
-    runCommandForced("xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getDriveFolderId()).isEqualTo("foobar");
-  }
-
-  @Test
-  void testSuccess_setCommonReservedListOnTld() throws Exception {
-    runSuccessfulReservedListsTest("common_abuse");
-  }
-
-  @Test
-  void testSuccess_setTldSpecificReservedListOnTld() throws Exception {
-    runSuccessfulReservedListsTest("xn--q9jyb4c_abuse");
-  }
-
-  @Test
-  void testSuccess_setCommonReservedListAndTldSpecificReservedListOnTld() throws Exception {
-    runSuccessfulReservedListsTest("common_abuse,xn--q9jyb4c_abuse");
-  }
-
-  @Test
-  void testFailure_setReservedListFromOtherTld() {
-    runFailureReservedListsTest("tld_banned",
-        IllegalArgumentException.class,
-        "The reserved list(s) tld_banned cannot be applied to the tld xn--q9jyb4c");
-  }
-
-  @Test
-  void testSuccess_setReservedListFromOtherTld_withOverride() throws Exception {
-    runReservedListsTestOverride("tld_banned");
-  }
-
-  @Test
-  void testFailure_setCommonAndReservedListFromOtherTld() {
-    runFailureReservedListsTest("common_abuse,tld_banned",
-        IllegalArgumentException.class,
-        "The reserved list(s) tld_banned cannot be applied to the tld xn--q9jyb4c");
-  }
-
-  @Test
-  void testSuccess_setCommonAndReservedListFromOtherTld_withOverride() throws Exception {
-    command.errorPrintStream = System.err;
-    runReservedListsTestOverride("common_abuse,tld_banned");
-    String errMsg =
-        "Error overridden: The reserved list(s) tld_banned "
-            + "cannot be applied to the tld xn--q9jyb4c";
-    assertThat(getStderrAsString()).contains(errMsg);
-  }
-
-  @Test
-  void testFailure_setMultipleReservedListsFromOtherTld() {
-    runFailureReservedListsTest("tld_banned,soy_expurgated",
-        IllegalArgumentException.class,
-        "The reserved list(s) tld_banned, soy_expurgated cannot be applied to the tld xn--q9jyb4c");
-  }
-
-  @Test
-  void testSuccess_setMultipleReservedListsFromOtherTld_withOverride() throws Exception {
-    runReservedListsTestOverride("tld_banned,soy_expurgated");
-  }
-
-  @Test
-  void testSuccess_setPremiumList() throws Exception {
-    runCommandForced("--premium_list=xn--q9jyb4c", "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getPremiumListName()).hasValue("xn--q9jyb4c");
-  }
-
-  @Test
-  void testSuccess_setDriveFolderIdToValue() throws Exception {
-    runCommandForced("--drive_folder_id=madmax2030", "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getDriveFolderId()).isEqualTo("madmax2030");
-  }
-
-  @Test
-  void testSuccess_setDriveFolderIdToNull() throws Exception {
-    runCommandForced("--drive_folder_id=null", "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getDriveFolderId()).isNull();
-  }
-
-  @Test
-  void testSuccess_setsIdnTables() throws Exception {
-    assertThat(Tld.get("xn--q9jyb4c").getIdnTables()).isEmpty();
-    runCommandForced("--idn_tables=extended_latin,ja", "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getIdnTables())
-        .containsExactly(IdnTableEnum.EXTENDED_LATIN, IdnTableEnum.JA);
-  }
-
-  @Test
-  void testSuccess_removesIndTables() throws Exception {
-    persistResource(
-        Tld.get("xn--q9jyb4c")
-            .asBuilder()
-            .setIdnTables(ImmutableSet.of(IdnTableEnum.EXTENDED_LATIN, IdnTableEnum.JA))
-            .build());
-    runCommandForced("--idn_tables=", "xn--q9jyb4c");
-    assertThat(Tld.get("xn--q9jyb4c").getIdnTables()).isEmpty();
-  }
-
-  @Test
-  void testFailure_invalidIdnTable() throws Exception {
-    IllegalArgumentException thrown =
-        assertThrows(
-            IllegalArgumentException.class,
-            () -> runCommandForced("--idn_tables=extended_latin,bad_value", "xn--q9jyb4c"));
-    assertThat(thrown)
-        .hasMessageThat()
-        .isEqualTo(
-            "IDN tables [EXTENDED_LATIN, BAD_VALUE] contained invalid value(s). Possible values:"
-                + " [EXTENDED_LATIN, UNCONFUSABLE_LATIN, JA]");
-  }
-
-  @Test
-  void testFailure_setPremiumListThatDoesntExist() {
-    IllegalArgumentException thrown =
-        assertThrows(
-            IllegalArgumentException.class,
-            () -> runCommandForced("--premium_list=phonies", "xn--q9jyb4c"));
-    assertThat(thrown).hasMessageThat().contains("The premium list 'phonies' doesn't exist");
-  }
-
-  @Test
-  void testSuccess_setTtls() throws Exception {
-    runCommandForced(
-        "--dns_a_plus_aaaa_ttl=PT300S",
-        "--dns_ds_ttl=PT240S",
-        "--dns_ns_ttl=PT180S",
-        "xn--q9jyb4c");
-    Tld tld = Tld.get("xn--q9jyb4c");
-    assertThat(tld.getDnsAPlusAaaaTtl().get()).isEqualTo(standardMinutes(5));
-    assertThat(tld.getDnsDsTtl().get()).isEqualTo(standardMinutes(4));
-    assertThat(tld.getDnsNsTtl().get()).isEqualTo(standardMinutes(3));
-  }
-
-  private void runSuccessfulReservedListsTest(String reservedLists) throws Exception {
-    runCommandForced("--reserved_lists", reservedLists, "xn--q9jyb4c");
-  }
-
-  private void runReservedListsTestOverride(String reservedLists) throws Exception {
-    runCommandForced("--override_reserved_list_rules",
-        "--reserved_lists",
-        reservedLists,
-        "xn--q9jyb4c");
-  }
-
-  private void runFailureReservedListsTest(
-      String reservedLists, Class<? extends Exception> errorClass, String errorMsg) {
-    Exception e =
-        assertThrows(
-            errorClass, () -> runCommandForced("--reserved_lists", reservedLists, "xn--q9jyb4c"));
-    assertThat(e).hasMessageThat().isEqualTo(errorMsg);
-  }
-}