diff --git a/javatests/google/registry/testing/AbstractDomainBaseSubject.java b/javatests/google/registry/testing/AbstractDomainBaseSubject.java
index 2a1f5794b..efb693f7b 100644
--- a/javatests/google/registry/testing/AbstractDomainBaseSubject.java
+++ b/javatests/google/registry/testing/AbstractDomainBaseSubject.java
@@ -36,7 +36,7 @@ public abstract class AbstractDomainBaseSubject
   public And<S> hasFullyQualifiedDomainName(String fullyQualifiedDomainName) {
     return hasValue(
         fullyQualifiedDomainName,
-        getSubject().getFullyQualifiedDomainName(),
+        actual().getFullyQualifiedDomainName(),
         "has fullyQualifiedDomainName");
   }
 
@@ -45,19 +45,19 @@ public abstract class AbstractDomainBaseSubject
   }
 
   public And<S> hasExactlyDsData(Set<DelegationSignerData> dsData) {
-    return hasValue(dsData, getSubject().getDsData(), "has dsData");
+    return hasValue(dsData, actual().getDsData(), "has dsData");
   }
 
   public And<S> hasNumDsData(int num) {
-    return hasValue(num, getSubject().getDsData().size(), "has num dsData");
+    return hasValue(num, actual().getDsData().size(), "has num dsData");
   }
 
   public And<S> hasLaunchNotice(LaunchNotice launchNotice) {
-    return hasValue(launchNotice, getSubject().getLaunchNotice(), "has launchNotice");
+    return hasValue(launchNotice, actual().getLaunchNotice(), "has launchNotice");
   }
 
   public And<S> hasAuthInfoPwd(String pw) {
-    AuthInfo authInfo = getSubject().getAuthInfo();
+    AuthInfo authInfo = actual().getAuthInfo();
     return hasValue(pw, authInfo == null ? null : authInfo.getPw().getValue(), "has auth info pw");
   }
 }
diff --git a/javatests/google/registry/testing/AbstractEppResourceSubject.java b/javatests/google/registry/testing/AbstractEppResourceSubject.java
index 3085b6fc8..fe847da8a 100644
--- a/javatests/google/registry/testing/AbstractEppResourceSubject.java
+++ b/javatests/google/registry/testing/AbstractEppResourceSubject.java
@@ -42,7 +42,7 @@ abstract class AbstractEppResourceSubject
   }
 
   private List<HistoryEntry> getHistoryEntries() {
-    return DatastoreHelper.getHistoryEntries(getSubject());
+    return DatastoreHelper.getHistoryEntries(actual());
   }
 
   @SuppressWarnings("unchecked")
@@ -54,12 +54,12 @@ abstract class AbstractEppResourceSubject
   public String getDisplaySubject() {
     return String.format(
         "%s with foreign key '%s'",
-        getSubject().getClass().getSimpleName(),
-        getSubject().getForeignKey());
+        actual().getClass().getSimpleName(),
+        actual().getForeignKey());
   }
 
   public And<S> hasRepoId(long roid) {
-    return hasValue(roid, getSubject().getRepoId(), "has repoId");
+    return hasValue(roid, actual().getRepoId(), "has repoId");
   }
 
   public And<S> hasNoHistoryEntries() {
@@ -77,7 +77,7 @@ abstract class AbstractEppResourceSubject
   }
 
   public And<S> hasNumHistoryEntriesOfType(HistoryEntry.Type type, int num) {
-    List<HistoryEntry> entries = getHistoryEntriesOfType(getSubject(), type);
+    List<HistoryEntry> entries = getHistoryEntriesOfType(actual(), type);
     if (entries.size() != num) {
       failWithBadResults(
           String.format("has this number of history entries of type %s", type.toString()),
@@ -121,14 +121,14 @@ abstract class AbstractEppResourceSubject
   }
 
   public And<S> hasStatusValue(StatusValue statusValue) {
-    if (!getSubject().getStatusValues().contains(statusValue)) {
+    if (!actual().getStatusValues().contains(statusValue)) {
       failWithRawMessage("%s should have had status value %s", getDisplaySubject(), statusValue);
     }
     return andChainer();
   }
 
   public And<S> doesNotHaveStatusValue(StatusValue statusValue) {
-    if (getSubject().getStatusValues().contains(statusValue)) {
+    if (actual().getStatusValues().contains(statusValue)) {
       failWithRawMessage(
           "%s should not have had status value %s", getDisplaySubject(), statusValue);
     }
@@ -136,9 +136,9 @@ abstract class AbstractEppResourceSubject
   }
 
   public And<S> hasExactlyStatusValues(StatusValue... statusValues) {
-    if (!ImmutableSet.copyOf(getSubject().getStatusValues())
+    if (!ImmutableSet.copyOf(actual().getStatusValues())
         .equals(ImmutableSet.copyOf(statusValues))) {
-      assertThat(getSubject().getStatusValues()).named("status values for " + getDisplaySubject())
+      assertThat(actual().getStatusValues()).named("status values for " + getDisplaySubject())
           .containsExactly((Object[]) statusValues);
     }
     return andChainer();
@@ -147,33 +147,33 @@ abstract class AbstractEppResourceSubject
   public And<S> hasDeletionTime(DateTime deletionTime) {
     return hasValue(
         deletionTime,
-        getSubject().getDeletionTime(),
+        actual().getDeletionTime(),
         "has deletionTime");
   }
 
   public And<S> hasLastTransferTime(DateTime lastTransferTime) {
     return hasValue(
         lastTransferTime,
-        getSubject().getLastTransferTime(),
+        actual().getLastTransferTime(),
         "has lastTransferTime");
   }
 
   public And<S> hasLastTransferTimeNotEqualTo(DateTime lastTransferTime) {
     return doesNotHaveValue(
         lastTransferTime,
-        getSubject().getLastTransferTime(),
+        actual().getLastTransferTime(),
         "lastTransferTime");
   }
 
   public And<S> hasLastEppUpdateTime(DateTime lastUpdateTime) {
     return hasValue(
         lastUpdateTime,
-        getSubject().getLastEppUpdateTime(),
+        actual().getLastEppUpdateTime(),
         "has lastEppUpdateTime");
   }
 
   public And<S> hasLastEppUpdateTimeAtLeast(DateTime before) {
-    DateTime lastEppUpdateTime = getSubject().getLastEppUpdateTime();
+    DateTime lastEppUpdateTime = actual().getLastEppUpdateTime();
     if (lastEppUpdateTime == null || before.isAfter(lastEppUpdateTime)) {
       failWithBadResults("has lastEppUpdateTime at least", before, lastEppUpdateTime);
     }
@@ -183,61 +183,61 @@ abstract class AbstractEppResourceSubject
   public And<S> hasLastEppUpdateClientId(String clientId) {
     return hasValue(
         clientId,
-        getSubject().getLastEppUpdateClientId(),
+        actual().getLastEppUpdateClientId(),
         "has lastEppUpdateClientId");
   }
 
   public And<S> hasCurrentSponsorClientId(String clientId) {
     return hasValue(
         clientId,
-        getSubject().getCurrentSponsorClientId(),
+        actual().getCurrentSponsorClientId(),
         "has currentSponsorClientId");
   }
 
   public And<S> hasTransferStatus(TransferStatus transferStatus) {
     return hasValue(
         transferStatus,
-        getSubject().getTransferData().getTransferStatus(),
+        actual().getTransferData().getTransferStatus(),
         "has transferStatus");
   }
 
   public And<S> hasTransferRequestClientTrid(String clTrid) {
     return hasValue(
         clTrid,
-        getSubject().getTransferData().getTransferRequestTrid().getClientTransactionId(),
+        actual().getTransferData().getTransferRequestTrid().getClientTransactionId(),
         "has trid");
   }
 
   public And<S> hasPendingTransferExpirationTime(DateTime pendingTransferExpirationTime) {
     return hasValue(
         pendingTransferExpirationTime,
-        getSubject().getTransferData().getPendingTransferExpirationTime(),
+        actual().getTransferData().getPendingTransferExpirationTime(),
         "has pendingTransferExpirationTime");
   }
 
   public And<S> hasTransferGainingClientId(String gainingClientId) {
     return hasValue(
         gainingClientId,
-        getSubject().getTransferData().getGainingClientId(),
+        actual().getTransferData().getGainingClientId(),
         "has transfer ga");
   }
 
   public And<S> hasTransferLosingClientId(String losingClientId) {
     return hasValue(
         losingClientId,
-        getSubject().getTransferData().getLosingClientId(),
+        actual().getTransferData().getLosingClientId(),
         "has transfer losingClientId");
   }
 
   public And<S> isActiveAt(DateTime time) {
-    if (!isActive(getSubject(), time)) {
+    if (!isActive(actual(), time)) {
       fail("is active at " + time);
     }
     return andChainer();
   }
 
   public And<S> isNotActiveAt(DateTime time) {
-    if (isActive(getSubject(), time)) {
+    if (isActive(actual(), time)) {
       fail("is not active at " + time);
     }
     return andChainer();
diff --git a/javatests/google/registry/testing/ContactResourceSubject.java b/javatests/google/registry/testing/ContactResourceSubject.java
index 931cd5186..a87e9fc46 100644
--- a/javatests/google/registry/testing/ContactResourceSubject.java
+++ b/javatests/google/registry/testing/ContactResourceSubject.java
@@ -37,18 +37,18 @@ public final class ContactResourceSubject
   }
 
   public And<ContactResourceSubject> hasLocalizedPostalInfo(PostalInfo postalInfo) {
-    return hasValue(postalInfo, getSubject().getLocalizedPostalInfo(), "has localizedPostalInfo");
+    return hasValue(postalInfo, actual().getLocalizedPostalInfo(), "has localizedPostalInfo");
   }
 
   public And<ContactResourceSubject> hasNullLocalizedPostalInfo() {
-    if (getSubject().getLocalizedPostalInfo() != null) {
+    if (actual().getLocalizedPostalInfo() != null) {
       fail("has null localized postal info");
     }
     return andChainer();
   }
 
   public And<ContactResourceSubject> hasNonNullLocalizedPostalInfo() {
-    if (getSubject().getLocalizedPostalInfo() == null) {
+    if (actual().getLocalizedPostalInfo() == null) {
       fail("has non-null localized postal info");
     }
     return andChainer();
@@ -58,12 +58,12 @@ public final class ContactResourceSubject
       PostalInfo postalInfo) {
     return hasValue(
         postalInfo,
-        getSubject().getInternationalizedPostalInfo(),
+        actual().getInternationalizedPostalInfo(),
         "has internationalizedPostalInfo");
   }
 
   public And<ContactResourceSubject> hasNullInternationalizedPostalInfo() {
-    if (getSubject().getInternationalizedPostalInfo() != null) {
+    if (actual().getInternationalizedPostalInfo() != null) {
       fail("has null internationalized postal info");
     }
     return andChainer();
@@ -71,56 +71,56 @@ public final class ContactResourceSubject
 
 
   public And<ContactResourceSubject> hasNonNullInternationalizedPostalInfo() {
-    if (getSubject().getInternationalizedPostalInfo() == null) {
+    if (actual().getInternationalizedPostalInfo() == null) {
       fail("has non-null internationalized postal info");
     }
     return andChainer();
   }
 
   public And<ContactResourceSubject> hasNullEmailAddress() {
-    if (getSubject().getEmailAddress() != null) {
+    if (actual().getEmailAddress() != null) {
       fail("has null email address");
     }
     return andChainer();
   }
 
   public And<ContactResourceSubject> hasNonNullEmailAddress() {
-    if (getSubject().getEmailAddress() == null) {
+    if (actual().getEmailAddress() == null) {
       fail("has non-null email address");
     }
     return andChainer();
   }
 
   public And<ContactResourceSubject> hasNullVoiceNumber() {
-    if (getSubject().getVoiceNumber() != null) {
+    if (actual().getVoiceNumber() != null) {
       fail("has null voice number");
     }
     return andChainer();
   }
 
   public And<ContactResourceSubject> hasNonNullVoiceNumber() {
-    if (getSubject().getVoiceNumber() == null) {
+    if (actual().getVoiceNumber() == null) {
       fail("has non-null voice number");
     }
     return andChainer();
   }
 
   public And<ContactResourceSubject> hasNullFaxNumber() {
-    if (getSubject().getFaxNumber() != null) {
+    if (actual().getFaxNumber() != null) {
       fail("has null fax number");
     }
     return andChainer();
   }
 
   public And<ContactResourceSubject> hasNonNullFaxNumber() {
-    if (getSubject().getFaxNumber() == null) {
+    if (actual().getFaxNumber() == null) {
       fail("has non-null fax number");
     }
     return andChainer();
   }
 
   public And<ContactResourceSubject> hasAuthInfoPwd(String pw) {
-    AuthInfo authInfo = getSubject().getAuthInfo();
+    AuthInfo authInfo = actual().getAuthInfo();
     return hasValue(pw, authInfo == null ? null : authInfo.getPw().getValue(), "has auth info pw");
   }
 
diff --git a/javatests/google/registry/testing/DomainApplicationSubject.java b/javatests/google/registry/testing/DomainApplicationSubject.java
index 6de6786c2..2e8bace99 100644
--- a/javatests/google/registry/testing/DomainApplicationSubject.java
+++ b/javatests/google/registry/testing/DomainApplicationSubject.java
@@ -33,9 +33,9 @@ public final class DomainApplicationSubject
 
   public And<DomainApplicationSubject> hasApplicationStatus(
       ApplicationStatus applicationStatus) {
-    if (!Objects.equals(getSubject().getApplicationStatus(), applicationStatus)) {
+    if (!Objects.equals(actual().getApplicationStatus(), applicationStatus)) {
       failWithBadResults(
-          "has application status", applicationStatus, getSubject().getApplicationStatus());
+          "has application status", applicationStatus, actual().getApplicationStatus());
     }
     return andChainer();
   }
@@ -44,16 +44,16 @@ public final class DomainApplicationSubject
       ApplicationStatus applicationStatus) {
     return doesNotHaveValue(
         applicationStatus,
-        getSubject().getApplicationStatus(),
+        actual().getApplicationStatus(),
         "application status");
   }
 
   public And<DomainApplicationSubject> hasExactlyEncodedSignedMarks(
       EncodedSignedMark... encodedSignedMarks) {
     if (!Objects.equals(
-        ImmutableSet.copyOf(getSubject().getEncodedSignedMarks()),
+        ImmutableSet.copyOf(actual().getEncodedSignedMarks()),
         ImmutableSet.of(encodedSignedMarks))) {
-      assertThat(getSubject().getEncodedSignedMarks())
+      assertThat(actual().getEncodedSignedMarks())
           .named("the encoded signed marks of " + getDisplaySubject())
           .containsExactly((Object[]) encodedSignedMarks);
     }
@@ -61,9 +61,9 @@ public final class DomainApplicationSubject
   }
 
   public And<DomainApplicationSubject> hasNumEncodedSignedMarks(int num) {
-    if (getSubject().getEncodedSignedMarks().size() != num) {
+    if (actual().getEncodedSignedMarks().size() != num) {
       failWithBadResults(
-          "has this many encoded signed marks: ", num, getSubject().getEncodedSignedMarks().size());
+          "has this many encoded signed marks: ", num, actual().getEncodedSignedMarks().size());
     }
     return andChainer();
   }
diff --git a/javatests/google/registry/testing/DomainResourceSubject.java b/javatests/google/registry/testing/DomainResourceSubject.java
index b8cdedd19..73f1cff42 100644
--- a/javatests/google/registry/testing/DomainResourceSubject.java
+++ b/javatests/google/registry/testing/DomainResourceSubject.java
@@ -33,31 +33,31 @@ public final class DomainResourceSubject
       extends ReflectiveSubjectFactory<DomainResource, DomainResourceSubject>{}
 
   public And<DomainResourceSubject> hasRegistrationExpirationTime(DateTime expiration) {
-    if (!Objects.equals(getSubject().getRegistrationExpirationTime(), expiration)) {
+    if (!Objects.equals(actual().getRegistrationExpirationTime(), expiration)) {
       failWithBadResults(
           "has registrationExpirationTime",
           expiration,
-          getSubject().getRegistrationExpirationTime());
+          actual().getRegistrationExpirationTime());
     }
     return andChainer();
   }
 
   public And<DomainResourceSubject> hasDeletePollMessage() {
-    if (getSubject().getDeletePollMessage() == null) {
+    if (actual().getDeletePollMessage() == null) {
       fail("has a delete poll message");
     }
     return andChainer();
   }
 
   public And<DomainResourceSubject> hasNoDeletePollMessage() {
-    if (getSubject().getDeletePollMessage() != null) {
+    if (actual().getDeletePollMessage() != null) {
       fail("has no delete poll message");
     }
     return andChainer();
   }
 
   public And<DomainResourceSubject> hasSmdId(String smdId) {
-    return hasValue(smdId, getSubject().getSmdId(), "has smdId");
+    return hasValue(smdId, actual().getSmdId(), "has smdId");
   }
 
   public DomainResourceSubject(FailureStrategy strategy, DomainResource subject) {
diff --git a/javatests/google/registry/testing/HistoryEntrySubject.java b/javatests/google/registry/testing/HistoryEntrySubject.java
index f340f2cef..623911489 100644
--- a/javatests/google/registry/testing/HistoryEntrySubject.java
+++ b/javatests/google/registry/testing/HistoryEntrySubject.java
@@ -40,7 +40,7 @@ public class HistoryEntrySubject extends Subject<HistoryEntrySubject, HistoryEnt
 
   @Override
   public String getDisplaySubject() {
-    return Optional.fromNullable(customDisplaySubject).or(super.getDisplaySubject());
+    return Optional.fromNullable(customDisplaySubject).or(super.actualAsString());
   }
 
   public HistoryEntrySubject withCustomDisplaySubject(String customDisplaySubject) {
@@ -49,15 +49,15 @@ public class HistoryEntrySubject extends Subject<HistoryEntrySubject, HistoryEnt
   }
 
   public And<HistoryEntrySubject> hasType(HistoryEntry.Type type) {
-    return hasValue(type, getSubject().getType(), "has type");
+    return hasValue(type, actual().getType(), "has type");
   }
 
   public And<HistoryEntrySubject> hasClientId(String clientId) {
-    return hasValue(clientId, getSubject().getClientId(), "has client ID");
+    return hasValue(clientId, actual().getClientId(), "has client ID");
   }
 
   public And<HistoryEntrySubject> hasPeriod() {
-    if (getSubject().getPeriod() == null) {
+    if (actual().getPeriod() == null) {
       fail("has a period");
     }
     return new And<HistoryEntrySubject>(this);
@@ -65,24 +65,24 @@ public class HistoryEntrySubject extends Subject<HistoryEntrySubject, HistoryEnt
 
   public And<HistoryEntrySubject> hasPeriodYears(int years) {
     return hasPeriod().and()
-        .hasValue(Period.Unit.YEARS, getSubject().getPeriod().getUnit(), "has period in").and()
-        .hasValue(years, getSubject().getPeriod().getValue(), "has period length");
+        .hasValue(Period.Unit.YEARS, actual().getPeriod().getUnit(), "has period in").and()
+        .hasValue(years, actual().getPeriod().getValue(), "has period length");
   }
 
   public And<HistoryEntrySubject> hasNoXml() {
-    if (getSubject().getXmlBytes() != null) {
+    if (actual().getXmlBytes() != null) {
       fail("has no xml");
     }
     return new And<HistoryEntrySubject>(this);
   }
 
   public And<HistoryEntrySubject> hasMetadataReason(String reason) {
-    return hasValue(reason, getSubject().getReason(), "has metadata reason");
+    return hasValue(reason, actual().getReason(), "has metadata reason");
   }
 
   public And<HistoryEntrySubject> hasMetadataRequestedByRegistrar(
         boolean requestedByRegistrar) {
-    if (getSubject().getRequestedByRegistrar() != requestedByRegistrar) {
+    if (actual().getRequestedByRegistrar() != requestedByRegistrar) {
       fail("has metadata requestedByRegistrar with value", requestedByRegistrar);
     }
     return new And<HistoryEntrySubject>(this);
diff --git a/javatests/google/registry/testing/LogsSubject.java b/javatests/google/registry/testing/LogsSubject.java
index b6094dcea..d12c6a266 100644
--- a/javatests/google/registry/testing/LogsSubject.java
+++ b/javatests/google/registry/testing/LogsSubject.java
@@ -37,8 +37,8 @@ public class LogsSubject extends Subject<LogsSubject, TestLogHandler> {
   }
 
   public And<LogsSubject> hasNoLogsAtLevel(Level level) {
-    for (LogRecord log : getSubject().getStoredLogRecords()) {
-      if (log.getLevel() == level) {
+    for (LogRecord log : actual().getStoredLogRecords()) {
+      if (log.getLevel().equals(level)) {
         failWithRawMessage(
             "Not true that there are no logs at level %s. Found <%s>.", level, log.getMessage());
       }
@@ -48,8 +48,8 @@ public class LogsSubject extends Subject<LogsSubject, TestLogHandler> {
 
   public And<LogsSubject> hasLogAtLevelWithMessage(Level level, String message) {
     boolean found = false;
-    for (LogRecord log : getSubject().getStoredLogRecords()) {
-      if (log.getLevel() == level && log.getMessage().contains(message)) {
+    for (LogRecord log : actual().getStoredLogRecords()) {
+      if (log.getLevel().equals(level) && log.getMessage().contains(message)) {
         found = true;
         break;
       }