diff --git a/src/test/java/com/google/api/generator/engine/ast/AnonymousClassExprTest.java b/src/test/java/com/google/api/generator/engine/ast/AnonymousClassExprTest.java
index dd7bb8f80a..b53fa9e77b 100644
--- a/src/test/java/com/google/api/generator/engine/ast/AnonymousClassExprTest.java
+++ b/src/test/java/com/google/api/generator/engine/ast/AnonymousClassExprTest.java
@@ -41,7 +41,7 @@ public void validAnonymousClass_basic() {
     AnonymousClassExpr anonymousClassExpr =
         AnonymousClassExpr.builder().setType(type).setMethods(Arrays.asList(method)).build();
     assertTrue(TypeNode.isReferenceType(anonymousClassExpr.type()));
-    assertEquals(anonymousClassExpr.type(), type);
+    assertEquals(type, anonymousClassExpr.type());
   }
 
   @Test
@@ -96,7 +96,7 @@ public void validAnonymousClass_genericAndVariableExpr() {
             .setMethods(Arrays.asList(method))
             .build();
     assertTrue(TypeNode.isReferenceType(anonymousClassExpr.type()));
-    assertEquals(anonymousClassExpr.type(), type);
+    assertEquals(type, anonymousClassExpr.type());
   }
 
   @Test
diff --git a/src/test/java/com/google/api/generator/engine/ast/ConcreteReferenceTest.java b/src/test/java/com/google/api/generator/engine/ast/ConcreteReferenceTest.java
index 7083cc280b..d45c9bdc37 100644
--- a/src/test/java/com/google/api/generator/engine/ast/ConcreteReferenceTest.java
+++ b/src/test/java/com/google/api/generator/engine/ast/ConcreteReferenceTest.java
@@ -29,7 +29,7 @@ public class ConcreteReferenceTest {
   @Test
   public void basicConcreteReference() {
     Reference reference = ConcreteReference.builder().setClazz(Integer.class).build();
-    assertEquals(reference.name(), Integer.class.getSimpleName());
+    assertEquals(Integer.class.getSimpleName(), reference.name());
     assertFalse(reference.isStaticImport());
   }
 
@@ -37,14 +37,14 @@ public void basicConcreteReference() {
   public void basicConcreteReference_setIsStaticImport() {
     Reference reference =
         ConcreteReference.builder().setClazz(Integer.class).setIsStaticImport(true).build();
-    assertEquals(reference.name(), Integer.class.getSimpleName());
+    assertEquals(Integer.class.getSimpleName(), reference.name());
     assertFalse(reference.isStaticImport());
   }
 
   @Test
   public void basicConcreteReference_nested() {
     Reference reference = ConcreteReference.builder().setClazz(Map.Entry.class).build();
-    assertEquals(reference.name(), "Map.Entry");
+    assertEquals("Map.Entry", reference.name());
     assertFalse(reference.isStaticImport());
   }
 
@@ -52,7 +52,7 @@ public void basicConcreteReference_nested() {
   public void basicConcreteReference_nestedAndStaticImport() {
     Reference reference =
         ConcreteReference.builder().setClazz(Map.Entry.class).setIsStaticImport(true).build();
-    assertEquals(reference.name(), Map.Entry.class.getSimpleName());
+    assertEquals(Map.Entry.class.getSimpleName(), reference.name());
     assertTrue(reference.isStaticImport());
   }
 
@@ -67,7 +67,7 @@ public void parameterizedConcreteReference() {
                     ConcreteReference.withClazz(Integer.class)))
             .build();
     assertEquals(reference.name(), "HashMap<String, Integer>");
-    assertEquals(reference.fullName(), "java.util.HashMap");
+    assertEquals("java.util.HashMap", reference.fullName());
   }
 
   @Test
@@ -91,8 +91,8 @@ public void nestedParameterizedConcreteReference() {
             .setGenerics(Arrays.asList(outerMapReference))
             .build();
     assertEquals(
-        listReference.name(), "List<HashMap<HashMap<String, Integer>, HashMap<String, Integer>>>");
-    assertEquals(listReference.fullName(), "java.util.List");
+        "List<HashMap<HashMap<String, Integer>, HashMap<String, Integer>>>", listReference.name());
+    assertEquals("java.util.List", listReference.fullName());
   }
 
   @Test
@@ -143,7 +143,7 @@ public void isSupertype_nestedGenerics() {
 
   @Test
   public void wildcards() {
-    assertEquals("?", ConcreteReference.wildcard().name());
+    assertEquals(ConcreteReference.wildcard().name(), "?");
     assertEquals(
         "? extends String",
         ConcreteReference.wildcardWithUpperBound(TypeNode.STRING.reference()).name());
diff --git a/src/test/java/com/google/api/generator/engine/ast/IdentifierNodeTest.java b/src/test/java/com/google/api/generator/engine/ast/IdentifierNodeTest.java
index 917ea7df93..b4a7453337 100644
--- a/src/test/java/com/google/api/generator/engine/ast/IdentifierNodeTest.java
+++ b/src/test/java/com/google/api/generator/engine/ast/IdentifierNodeTest.java
@@ -113,6 +113,6 @@ private static void assertInvalidIdentifier(String idName) {
   }
 
   private static void assertValidIdentifier(String idName) {
-    assertEquals(IdentifierNode.builder().setName(idName).build().name(), idName);
+    assertEquals(idName, IdentifierNode.builder().setName(idName).build().name());
   }
 }
diff --git a/src/test/java/com/google/api/generator/engine/ast/IfStatementTest.java b/src/test/java/com/google/api/generator/engine/ast/IfStatementTest.java
index f43799b475..46e183d6e0 100644
--- a/src/test/java/com/google/api/generator/engine/ast/IfStatementTest.java
+++ b/src/test/java/com/google/api/generator/engine/ast/IfStatementTest.java
@@ -28,7 +28,7 @@ public void validIfStatement_simple() {
             .setConditionExpr(createConditionExpr("condition"))
             .setBody(createAssignmentExprList())
             .build();
-    assertEquals(ifStatement.conditionExpr().type(), TypeNode.BOOLEAN);
+    assertEquals(TypeNode.BOOLEAN, ifStatement.conditionExpr().type());
   }
 
   @Test
@@ -43,7 +43,7 @@ public void validIfStatement_booleanObjectCondition() {
             .setConditionExpr(condExpr)
             .setBody(createAssignmentExprList())
             .build();
-    assertEquals(ifStatement.conditionExpr().type(), TypeNode.BOOLEAN);
+    assertEquals(TypeNode.BOOLEAN, ifStatement.conditionExpr().type());
   }
 
   @Test
@@ -60,7 +60,7 @@ public void validIfStatement_elseIfsAndElse() {
             .addElseIf(thirdCondExpr, createAssignmentExprList())
             .setElseBody(createAssignmentExprList())
             .build();
-    assertEquals(ifStatement.conditionExpr().type(), TypeNode.BOOLEAN);
+    assertEquals(TypeNode.BOOLEAN, ifStatement.conditionExpr().type());
   }
 
   @Test
@@ -78,7 +78,7 @@ public void validIfStatement_nested() {
             .setConditionExpr(condExpr)
             .setBody(Arrays.asList(nestedIfStatement))
             .build();
-    assertEquals(ifStatement.conditionExpr().type(), TypeNode.BOOLEAN);
+    assertEquals(TypeNode.BOOLEAN, ifStatement.conditionExpr().type());
   }
 
   private static List<Statement> createAssignmentExprList() {
diff --git a/src/test/java/com/google/api/generator/engine/ast/NullObjectValueTest.java b/src/test/java/com/google/api/generator/engine/ast/NullObjectValueTest.java
index 6afe35a5e0..22e3434ea3 100644
--- a/src/test/java/com/google/api/generator/engine/ast/NullObjectValueTest.java
+++ b/src/test/java/com/google/api/generator/engine/ast/NullObjectValueTest.java
@@ -25,7 +25,7 @@ public class NullObjectValueTest {
   @Test
   public void createNullObjectValue_valid() {
     NullObjectValue nullValue = NullObjectValue.create();
-    assertEquals(nullValue.value(), NULL_VALUE);
+    assertEquals(NULL_VALUE, nullValue.value());
     assertThat(nullValue.type()).isEqualTo(TypeNode.NULL);
   }
 }
diff --git a/src/test/java/com/google/api/generator/engine/ast/PrimitiveValueTest.java b/src/test/java/com/google/api/generator/engine/ast/PrimitiveValueTest.java
index 81494a905c..9c2f034d4c 100644
--- a/src/test/java/com/google/api/generator/engine/ast/PrimitiveValueTest.java
+++ b/src/test/java/com/google/api/generator/engine/ast/PrimitiveValueTest.java
@@ -49,7 +49,7 @@ public void createPrimitiveValue_unsupported() {
   private static void assertValidValue(TypeKind typeKind, String value) {
     TypeNode type = TypeNode.builder().setTypeKind(typeKind).build();
     PrimitiveValue primitiveValue = PrimitiveValue.builder().setType(type).setValue(value).build();
-    assertEquals(primitiveValue.value(), value);
+    assertEquals(value, primitiveValue.value());
     assertThat(primitiveValue.type()).isEqualTo(type);
   }
 
diff --git a/src/test/java/com/google/api/generator/engine/ast/ReferenceTest.java b/src/test/java/com/google/api/generator/engine/ast/ReferenceTest.java
index daf93c5313..4fb0dca02d 100644
--- a/src/test/java/com/google/api/generator/engine/ast/ReferenceTest.java
+++ b/src/test/java/com/google/api/generator/engine/ast/ReferenceTest.java
@@ -45,8 +45,8 @@ public void nestedGenerics_concreteReferenceOuter() {
             .setGenerics(Arrays.asList(outerMapReference))
             .build();
     assertEquals(
-        listReference.name(), "List<HashMap<HashMap<String, Integer>, HashMap<String, Integer>>>");
-    assertEquals(listReference.fullName(), "java.util.List");
+        "List<HashMap<HashMap<String, Integer>, HashMap<String, Integer>>>", listReference.name());
+    assertEquals("java.util.List", listReference.fullName());
   }
 
   @Test
@@ -72,8 +72,8 @@ public void nestedGenerics_vaporReferenceOuter() {
             .setGenerics(Arrays.asList(outerMapReference))
             .build();
     assertEquals(
-        listReference.name(), "List<HashMap<HashMap<String, Integer>, HashMap<String, Integer>>>");
-    assertEquals(listReference.fullName(), "java.util.List");
+        "List<HashMap<HashMap<String, Integer>, HashMap<String, Integer>>>", listReference.name());
+    assertEquals("java.util.List", listReference.fullName());
   }
 
   @Test
diff --git a/src/test/java/com/google/api/generator/engine/ast/TernaryExprTest.java b/src/test/java/com/google/api/generator/engine/ast/TernaryExprTest.java
index 19fa9cfb63..b16fded214 100644
--- a/src/test/java/com/google/api/generator/engine/ast/TernaryExprTest.java
+++ b/src/test/java/com/google/api/generator/engine/ast/TernaryExprTest.java
@@ -37,9 +37,9 @@ public void validTernaryExpr_primitiveType() {
             .setThenExpr(thenExpr)
             .setElseExpr(elseExpr)
             .build();
-    assertEquals(ternaryExpr.conditionExpr().type(), TypeNode.BOOLEAN);
-    assertEquals(ternaryExpr.thenExpr().type(), ternaryExpr.elseExpr().type());
-    assertEquals(ternaryExpr.type(), TypeNode.INT);
+    assertEquals(TypeNode.BOOLEAN, ternaryExpr.conditionExpr().type());
+    assertEquals(ternaryExpr.elseExpr().type(), ternaryExpr.thenExpr().type());
+    assertEquals(TypeNode.INT, ternaryExpr.type());
   }
 
   @Test
@@ -59,9 +59,9 @@ public void validTernaryExpr_objectType() {
             .setThenExpr(thenExpr)
             .setElseExpr(elseExpr)
             .build();
-    assertEquals(ternaryExpr.conditionExpr().type(), TypeNode.BOOLEAN);
-    assertEquals(ternaryExpr.thenExpr().type(), ternaryExpr.elseExpr().type());
-    assertEquals(ternaryExpr.type(), TypeNode.STRING);
+    assertEquals(TypeNode.BOOLEAN, ternaryExpr.conditionExpr().type());
+    assertEquals(ternaryExpr.elseExpr().type(), ternaryExpr.thenExpr().type());
+    assertEquals(TypeNode.STRING, ternaryExpr.type());
   }
 
   @Test
@@ -82,9 +82,9 @@ public void validTernaryExpr_primitiveAndBoxedType() {
             .setThenExpr(thenExpr)
             .setElseExpr(elseExpr)
             .build();
-    assertEquals(ternaryExpr.conditionExpr().type(), TypeNode.BOOLEAN);
-    assertEquals(ternaryExpr.thenExpr().type(), ternaryExpr.elseExpr().type());
-    assertEquals(ternaryExpr.type(), TypeNode.INT_OBJECT);
+    assertEquals(TypeNode.BOOLEAN, ternaryExpr.conditionExpr().type());
+    assertEquals(ternaryExpr.elseExpr().type(), ternaryExpr.thenExpr().type());
+    assertEquals(TypeNode.INT_OBJECT, ternaryExpr.type());
   }
 
   @Test
@@ -106,9 +106,9 @@ public void validTernaryExpr_boxedAndPrimitiveType() {
             .setThenExpr(thenExpr)
             .setElseExpr(elseExpr)
             .build();
-    assertEquals(ternaryExpr.conditionExpr().type(), TypeNode.BOOLEAN);
-    assertEquals(ternaryExpr.thenExpr().type(), ternaryExpr.elseExpr().type());
-    assertEquals(ternaryExpr.type(), TypeNode.DOUBLE_OBJECT);
+    assertEquals(TypeNode.BOOLEAN, ternaryExpr.conditionExpr().type());
+    assertEquals(ternaryExpr.elseExpr().type(), ternaryExpr.thenExpr().type());
+    assertEquals(TypeNode.DOUBLE_OBJECT, ternaryExpr.type());
   }
 
   @Test
@@ -121,8 +121,8 @@ public void validTernaryExpr_objectAndNull() {
             .setThenExpr(ValueExpr.withValue(StringObjectValue.withValue("foobar")))
             .setElseExpr(ValueExpr.withValue(NullObjectValue.create()))
             .build();
-    assertEquals(ternaryExpr.conditionExpr().type(), TypeNode.BOOLEAN);
-    assertEquals(ternaryExpr.type(), TypeNode.STRING);
+    assertEquals(TypeNode.BOOLEAN, ternaryExpr.conditionExpr().type());
+    assertEquals(TypeNode.STRING, ternaryExpr.type());
   }
 
   @Test
@@ -135,8 +135,8 @@ public void validTernaryExpr_nullAndObject() {
             .setThenExpr(ValueExpr.withValue(NullObjectValue.create()))
             .setElseExpr(ValueExpr.withValue(StringObjectValue.withValue("foobar")))
             .build();
-    assertEquals(ternaryExpr.conditionExpr().type(), TypeNode.BOOLEAN);
-    assertEquals(ternaryExpr.type(), TypeNode.STRING);
+    assertEquals(TypeNode.BOOLEAN, ternaryExpr.conditionExpr().type());
+    assertEquals(TypeNode.STRING, ternaryExpr.type());
   }
 
   @Test
@@ -151,8 +151,8 @@ public void validTernaryExpr_superAndSubtype() {
                     Variable.builder().setName("anObject").setType(TypeNode.OBJECT).build()))
             .setElseExpr(ValueExpr.withValue(StringObjectValue.withValue("foobar")))
             .build();
-    assertEquals(ternaryExpr.conditionExpr().type(), TypeNode.BOOLEAN);
-    assertEquals(ternaryExpr.type(), TypeNode.OBJECT);
+    assertEquals(TypeNode.BOOLEAN, ternaryExpr.conditionExpr().type());
+    assertEquals(TypeNode.OBJECT, ternaryExpr.type());
   }
 
   @Test
@@ -167,8 +167,8 @@ public void validTernaryExpr_subAndSupertype() {
                 VariableExpr.withVariable(
                     Variable.builder().setName("anObject").setType(TypeNode.OBJECT).build()))
             .build();
-    assertEquals(ternaryExpr.conditionExpr().type(), TypeNode.BOOLEAN);
-    assertEquals(ternaryExpr.type(), TypeNode.OBJECT);
+    assertEquals(TypeNode.BOOLEAN, ternaryExpr.conditionExpr().type());
+    assertEquals(TypeNode.OBJECT, ternaryExpr.type());
   }
 
   @Test
diff --git a/src/test/java/com/google/api/generator/engine/ast/VaporReferenceTest.java b/src/test/java/com/google/api/generator/engine/ast/VaporReferenceTest.java
index 042e4b4582..c8a662fdc9 100644
--- a/src/test/java/com/google/api/generator/engine/ast/VaporReferenceTest.java
+++ b/src/test/java/com/google/api/generator/engine/ast/VaporReferenceTest.java
@@ -26,8 +26,8 @@ public void basic() {
     String pkg = "com.google.example.examples.library.v1";
     String name = "Babbage";
     Reference ref = VaporReference.builder().setName(name).setPakkage(pkg).build();
-    assertEquals(ref.name(), name);
-    assertEquals(ref.fullName(), String.format("%s.%s", pkg, name));
+    assertEquals(name, ref.name());
+    assertEquals(String.format("%s.%s", pkg, name), ref.fullName());
     assertFalse(ref.hasEnclosingClass());
     assertTrue(ref.isFromPackage(pkg));
     assertFalse(ref.isFromPackage("com.google.example.library"));
@@ -39,8 +39,8 @@ public void basic_isStaticImport() {
     String name = "Babbage";
     Reference ref =
         VaporReference.builder().setName(name).setPakkage(pkg).setIsStaticImport(true).build();
-    assertEquals(ref.name(), name);
-    assertEquals(ref.fullName(), String.format("%s.%s", pkg, name));
+    assertEquals(name, ref.name());
+    assertEquals(String.format("%s.%s", pkg, name), ref.fullName());
     assertFalse(ref.hasEnclosingClass());
     assertTrue(ref.isFromPackage(pkg));
     // isStaticImport is automatically false for non-nested classes.
@@ -60,9 +60,9 @@ public void basic_nested() {
             .setPakkage(pkg)
             .build();
 
-    assertEquals(ref.name(), "Babbage.Ada.Charles");
+    assertEquals("Babbage.Ada.Charles", ref.name());
     assertTrue(ref.hasEnclosingClass());
-    assertEquals(ref.fullName(), String.format("%s.%s.%s.%s", pkg, "Babbage", "Ada", name));
+    assertEquals(String.format("%s.%s.%s.%s", pkg, "Babbage", "Ada", name), ref.fullName());
     assertTrue(ref.hasEnclosingClass());
     assertTrue(ref.isFromPackage(pkg));
     assertFalse(ref.isFromPackage("com.google.example.library"));
@@ -81,8 +81,8 @@ public void basic_nestedAndStaticImport() {
             .setPakkage(pkg)
             .setIsStaticImport(true)
             .build();
-    assertEquals(ref.name(), name);
-    assertEquals(ref.fullName(), String.format("%s.%s.%s", pkg, enclosingClassName, name));
+    assertEquals(name, ref.name());
+    assertEquals(String.format("%s.%s.%s", pkg, enclosingClassName, name), ref.fullName());
     assertTrue(ref.hasEnclosingClass());
     assertTrue(ref.isFromPackage(pkg));
     assertFalse(ref.isFromPackage("com.google.example.library"));
@@ -114,6 +114,6 @@ public void enclosingClass() {
             .setEnclosingClassNames(enclosingName)
             .build();
     assertTrue(ref.hasEnclosingClass());
-    assertEquals(ref.fullName(), String.format("%s.%s.%s", pkg, enclosingName, name));
+    assertEquals(String.format("%s.%s.%s", pkg, enclosingName, name), ref.fullName());
   }
 }
diff --git a/src/test/java/com/google/api/generator/engine/ast/VariableTest.java b/src/test/java/com/google/api/generator/engine/ast/VariableTest.java
index d5fbb5b6f6..4f0b6c4743 100644
--- a/src/test/java/com/google/api/generator/engine/ast/VariableTest.java
+++ b/src/test/java/com/google/api/generator/engine/ast/VariableTest.java
@@ -41,7 +41,7 @@ public void createVariable_setIdentifier() {
             .setIdentifier(identifierNode)
             .setName("y")
             .build();
-    assertEquals(variable.name(), "y");
+    assertEquals("y", variable.name());
     assertThat(variable.type()).isEqualTo(TypeNode.STRING);
   }
 
@@ -54,7 +54,7 @@ public void createVariable_invalidType() {
   private static void assertValidVariable(TypeKind typeKind, String name) {
     TypeNode type = TypeNode.builder().setTypeKind(typeKind).build();
     Variable variable = Variable.builder().setType(type).setName(name).build();
-    assertEquals(variable.name(), name);
+    assertEquals(name, variable.name());
     assertThat(variable.type()).isEqualTo(type);
   }
 
diff --git a/src/test/java/com/google/api/generator/engine/ast/WhileStatementTest.java b/src/test/java/com/google/api/generator/engine/ast/WhileStatementTest.java
index 72466cf679..ebaedc31ef 100644
--- a/src/test/java/com/google/api/generator/engine/ast/WhileStatementTest.java
+++ b/src/test/java/com/google/api/generator/engine/ast/WhileStatementTest.java
@@ -29,7 +29,7 @@ public void validWhileStatement_simple() {
             .setConditionExpr(createConditionExpr("condition"))
             .setBody(createAssignmentExprList())
             .build();
-    assertEquals(whileStatement.conditionExpr().type(), TypeNode.BOOLEAN);
+    assertEquals(TypeNode.BOOLEAN, whileStatement.conditionExpr().type());
   }
 
   @Test
@@ -43,7 +43,7 @@ public void validWhileStatement_booleanObjectCondition() {
             .setConditionExpr(condExpr)
             .setBody(createAssignmentExprList())
             .build();
-    assertEquals(whileStatement.conditionExpr().type(), TypeNode.BOOLEAN);
+    assertEquals(TypeNode.BOOLEAN, whileStatement.conditionExpr().type());
   }
 
   @Test
@@ -58,7 +58,7 @@ public void validWhileStatement_nested() {
             .setConditionExpr(createConditionExpr("condition"))
             .setBody(Arrays.asList(nestedWhileStatement))
             .build();
-    assertEquals(whileStatement.conditionExpr().type(), TypeNode.BOOLEAN);
+    assertEquals(TypeNode.BOOLEAN, whileStatement.conditionExpr().type());
   }
 
   @Test