Revert "Merge branch 'master' into master"

This reverts commit 9dfbfc5e32, reversing
changes made to 94a2681127.

TestFile.txt

@@ -1,2 +0,0 @@
-This is a test file.
-Maybe this will change your mind?

gradle/core/build.gradle

@@ -609,8 +609,6 @@ test {
   // This setting makes the build take 35 minutes, without it it takes about 10.
   // forkEvery 1
 
-  forkEvery 1
-
   // Sets the maximum number of test executors that may exist at the same time.
   maxParallelForks 5
 

javatests/google/registry/tools/CreateTldCommandTest.java

@@ -98,18 +98,6 @@ public class CreateTldCommandTest extends CommandTestCase<CreateTldCommand> {
     assertThat(thrown).hasMessageThat().contains("Can't create more than one TLD at a time");
   }
 
-  @Test
-  public void testSuccess_initialRenewBillingCostFlag() throws Exception {
-    runCommandForced(
-        "--initial_renew_billing_cost=\"USD 42.42\"",
-        "--roid_suffix=Q9JYB4C",
-        "--dns_writers=VoidDnsWriter",
-        "xn--q9jyb4c");
-
-    assertThat(Registry.get("xn--q9jyb4c").getStandardRenewCost(DateTime.now(UTC)))
-        .isEqualTo(Money.of(USD, 42.42));
-  }
-
   @Test
   public void testSuccess_initialTldStateFlag() throws Exception {
     runCommandForced(
@@ -118,7 +106,18 @@ public class CreateTldCommandTest extends CommandTestCase<CreateTldCommand> {
         "--dns_writers=VoidDnsWriter",
         "xn--q9jyb4c");
     assertThat(Registry.get("xn--q9jyb4c").getTldState(DateTime.now(UTC)))
-        .isEqualTo(TldState.GENERAL_AVAILABILITY);
+        .isEqualTo(GENERAL_AVAILABILITY);
+  }
+
+  @Test
+  public void testSuccess_initialRenewBillingCostFlag() throws Exception {
+    runCommandForced(
+        "--initial_renew_billing_cost=\"USD 42.42\"",
+        "--roid_suffix=Q9JYB4C",
+        "--dns_writers=VoidDnsWriter",
+        "xn--q9jyb4c");
+    assertThat(Registry.get("xn--q9jyb4c").getStandardRenewCost(DateTime.now(UTC)))
+        .isEqualTo(Money.of(USD, 42.42));
   }
 
   @Test

test.txt

@@ -1 +0,0 @@
-This is a test file to trigger a build on travis.