extractLabels(String filepath) {
+ String pattern = "U-labels: ";
+ String content = loadFile(filepath);
+ Matcher matcher = Pattern.compile(pattern + ".*").matcher(content);
+ matcher.find();
+ String matchedString = matcher.group().replace(pattern, "");
+ return matchedString.isEmpty()
+ ? ImmutableList.of()
+ : ImmutableList.copyOf(Splitter.on(',').trimResults().split(matchedString));
+ }
}
diff --git a/core/src/test/java/google/registry/tmch/TmchTestDataExpirationTest.java b/core/src/test/java/google/registry/tmch/TmchTestDataExpirationTest.java
index 52fabcd38..a5448eb09 100644
--- a/core/src/test/java/google/registry/tmch/TmchTestDataExpirationTest.java
+++ b/core/src/test/java/google/registry/tmch/TmchTestDataExpirationTest.java
@@ -42,9 +42,9 @@ class TmchTestDataExpirationTest {
* files and so that we can test various types of files, but this test will vail when the validity
* of the ICANN-provided file expires.
*
- * When this fails, check
- * https://newgtlds.icann.org/en/about/trademark-clearinghouse/registries-registrars for a
- * new updated SMD file.
+ *
When this fails, check Signed
+ * Mark Data Files for a new updated SMD file.
*/
@Test
void testActiveSignedMarkFiles_areValidAndNotExpired() throws Exception {
@@ -53,7 +53,7 @@ class TmchTestDataExpirationTest {
new TmchXmlSignature(
new TmchCertificateAuthority(TmchCaMode.PILOT, new SystemClock())));
- String filePath = "active/smd-active-21aug20-en.smd";
+ String filePath = "smd/active.smd";
String tmchData = loadFile(TmchTestDataExpirationTest.class, filePath);
EncodedSignedMark smd = TmchData.readEncodedSignedMark(tmchData);
try {
diff --git a/core/src/test/java/google/registry/tmch/TmchXmlSignatureTest.java b/core/src/test/java/google/registry/tmch/TmchXmlSignatureTest.java
index 01e87be3b..14d3dc1be 100644
--- a/core/src/test/java/google/registry/tmch/TmchXmlSignatureTest.java
+++ b/core/src/test/java/google/registry/tmch/TmchXmlSignatureTest.java
@@ -28,14 +28,18 @@ import java.security.cert.CertificateNotYetValidException;
import java.security.cert.CertificateRevokedException;
import javax.xml.crypto.dsig.XMLSignatureException;
import org.joda.time.DateTime;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+import org.junitpioneer.jupiter.cartesian.CartesianTest;
+import org.junitpioneer.jupiter.cartesian.CartesianTest.Values;
/**
* Unit tests for {@link TmchXmlSignature}.
*
- *
This class does not test the {@code revoked/smd/} folder because it's not a crypto issue.
+ *
This class does not verify if the SMD itself is revoked, which is different from if the
+ * certificate signging the SMD is revoked, as it is not a crypto issue.
*/
class TmchXmlSignatureTest {
@@ -44,38 +48,54 @@ class TmchXmlSignatureTest {
new JpaTestExtensions.Builder().buildIntegrationTestExtension();
// This should be a date which falls within the validity range of the test files contained in the
- // testdata/active directory. Note that test files claiming to be valid for a particular date
+ // smd/ directory. Note that test files claiming to be valid for a particular date
// range in the file header may not actually be valid the whole time, because they contain an
- // embedded certificate which might have a shorter validity range.
+ // embedded (intermediate) certificate which might have a shorter validity range.
//
// New versions of the test files are published every few years by ICANN, and available at in the
- // Signed Mark Data Files section of:
+ // "Signed Mark Data Files" section of:
//
// https://newgtlds.icann.org/en/about/trademark-clearinghouse/registries-registrars
//
- // The link labeled "Set of IDN test-SMDs" leads to a .tar.gz file containing the test files which
- // in our directory structure reside in testdata/active and testdata/revoked/smd (it is not clear
- // where the files in testdata/invalid and testdata/revoked/tmv come from; we probably made them
- // ourselves, since there aren't as many of them). For purposes of testing, we could probably keep
- // using old test files forever, and keep a corresponding old date, but it seems like a good idea
- // to keep up to date if possible.
- //
- // When updating this date, also update the dates below, which test to make sure that dates before
- // and after the validity window result in rejection.
- private final FakeClock clock = new FakeClock(DateTime.parse("2018-05-15T23:15:37.4Z"));
+ // When updating this date, also update the "time travel" dates in two tests below, which test to
+ // make sure that dates before and after the validity window result in rejection.
+ private final FakeClock clock = new FakeClock(DateTime.parse("2023-01-15T23:15:37.4Z"));
private byte[] smdData;
private TmchXmlSignature tmchXmlSignature =
new TmchXmlSignature(new TmchCertificateAuthority(TmchCaMode.PILOT, clock));
- @BeforeEach
- void beforeEach() {}
+ @Test
+ void testActive() throws Exception {
+ smdData = loadSmd("smd/active.smd");
+ tmchXmlSignature.verify(smdData);
+ }
+
+ @Test
+ void testRevoked() throws Exception {
+ smdData = loadSmd("smd/revoked.smd");
+ tmchXmlSignature.verify(smdData);
+ }
+
+ @Test
+ void testInvalid() {
+ smdData = loadSmd("smd/invalid.smd");
+ assertThrows(XMLSignatureException.class, () -> tmchXmlSignature.verify(smdData));
+ }
+
+ @Test
+ void testTmvCertRevoked() {
+ smdData = loadSmd("smd/tmv-cert-revoked.smd");
+ CertificateRevokedException e =
+ assertThrows(CertificateRevokedException.class, () -> tmchXmlSignature.verify(smdData));
+ assertThat(e).hasMessageThat().contains("Certificate has been revoked");
+ }
@Test
void testWrongCertificateAuthority() {
tmchXmlSignature =
new TmchXmlSignature(new TmchCertificateAuthority(TmchCaMode.PRODUCTION, clock));
- smdData = loadSmd("active/Court-Agent-Arab-Active.smd");
+ smdData = loadSmd("smd/active.smd");
CertificateSignatureException e =
assertThrows(CertificateSignatureException.class, () -> tmchXmlSignature.verify(smdData));
assertThat(e).hasMessageThat().contains("Signature does not match");
@@ -83,265 +103,40 @@ class TmchXmlSignatureTest {
@Test
void testTimeTravelBeforeCertificateWasCreated() {
- smdData = loadSmd("active/Court-Agent-Arab-Active.smd");
- clock.setTo(DateTime.parse("2013-05-01T00:00:00Z"));
+ smdData = loadSmd("smd/active.smd");
+ clock.setTo(DateTime.parse("2021-05-01T00:00:00Z"));
assertThrows(CertificateNotYetValidException.class, () -> tmchXmlSignature.verify(smdData));
}
@Test
void testTimeTravelAfterCertificateHasExpired() {
- smdData = loadSmd("active/Court-Agent-Arab-Active.smd");
- clock.setTo(DateTime.parse("2023-06-01T00:00:00Z"));
+ smdData = loadSmd("smd/active.smd");
+ clock.setTo(DateTime.parse("2028-06-01T00:00:00Z"));
assertThrows(CertificateExpiredException.class, () -> tmchXmlSignature.verify(smdData));
}
- @Test
- void testActiveCourtAgentArabActive() throws Exception {
- smdData = loadSmd("active/Court-Agent-Arab-Active.smd");
+ @CartesianTest
+ void testInd(
+ @Values(strings = {"Agent", "Holder"}) String contact,
+ @Values(strings = {"Court", "Trademark", "TreatyStatute"}) String type,
+ @Values(strings = {"Arab", "Chinese", "English", "French"}) String language,
+ @Values(strings = {"Active", "Revoked"}) String status)
+ throws Exception {
+ smdData =
+ loadSmd(
+ String.format(
+ "idn/%s-%s/%s-%s-%s-%s.smd", contact, language, type, contact, language, status));
tmchXmlSignature.verify(smdData);
}
- @Test
- void testActiveCourtAgentChineseActive() throws Exception {
- smdData = loadSmd("active/Court-Agent-Chinese-Active.smd");
- tmchXmlSignature.verify(smdData);
- }
-
- @Test
- void testActiveCourtAgentEnglishActive() throws Exception {
- smdData = loadSmd("active/Court-Agent-English-Active.smd");
- tmchXmlSignature.verify(smdData);
- }
-
- @Test
- void testActiveCourtAgentFrenchActive() throws Exception {
- smdData = loadSmd("active/Court-Agent-French-Active.smd");
- tmchXmlSignature.verify(smdData);
- }
-
- @Test
- void testActiveCourtAgentRussianActive() throws Exception {
- smdData = loadSmd("active/Court-Agent-Russian-Active.smd");
- tmchXmlSignature.verify(smdData);
- }
-
- @Test
- void testActiveCourtHolderArabActive() throws Exception {
- smdData = loadSmd("active/Court-Holder-Arab-Active.smd");
- tmchXmlSignature.verify(smdData);
- }
-
- @Test
- void testActiveCourtHolderChineseActive() throws Exception {
- smdData = loadSmd("active/Court-Holder-Chinese-Active.smd");
- tmchXmlSignature.verify(smdData);
- }
-
- @Test
- void testActiveCourtHolderEnglishActive() throws Exception {
- smdData = loadSmd("active/Court-Holder-English-Active.smd");
- tmchXmlSignature.verify(smdData);
- }
-
- @Test
- void testActiveCourtHolderFrenchActive() throws Exception {
- smdData = loadSmd("active/Court-Holder-French-Active.smd");
- tmchXmlSignature.verify(smdData);
- }
-
- @Test
- void testActiveCourtHolderRussianActive() throws Exception {
- smdData = loadSmd("active/Court-Holder-Russian-Active.smd");
- tmchXmlSignature.verify(smdData);
- }
-
- @Test
- void testActiveTrademarkAgentArabActive() throws Exception {
- smdData = loadSmd("active/Trademark-Agent-Arab-Active.smd");
- tmchXmlSignature.verify(smdData);
- }
-
- @Test
- void testActiveTrademarkAgentChineseActive() throws Exception {
- smdData = loadSmd("active/Trademark-Agent-Chinese-Active.smd");
- tmchXmlSignature.verify(smdData);
- }
-
- @Test
- void testActiveTrademarkAgentEnglishActive() throws Exception {
- smdData = loadSmd("active/Trademark-Agent-English-Active.smd");
- tmchXmlSignature.verify(smdData);
- }
-
- @Test
- void testActiveTrademarkAgentFrenchActive() throws Exception {
- smdData = loadSmd("active/Trademark-Agent-French-Active.smd");
- tmchXmlSignature.verify(smdData);
- }
-
- @Test
- void testActiveTrademarkAgentRussianActive() throws Exception {
- smdData = loadSmd("active/Trademark-Agent-Russian-Active.smd");
- tmchXmlSignature.verify(smdData);
- }
-
- @Test
- void testActiveTrademarkHolderArabActive() throws Exception {
- smdData = loadSmd("active/Trademark-Holder-Arab-Active.smd");
- tmchXmlSignature.verify(smdData);
- }
-
- @Test
- void testActiveTrademarkHolderChineseActive() throws Exception {
- smdData = loadSmd("active/Trademark-Holder-Chinese-Active.smd");
- tmchXmlSignature.verify(smdData);
- }
-
- @Test
- void testActiveTrademarkHolderEnglishActive() throws Exception {
- smdData = loadSmd("active/Trademark-Holder-English-Active.smd");
- tmchXmlSignature.verify(smdData);
- }
-
- @Test
- void testActiveTrademarkHolderFrenchActive() throws Exception {
- smdData = loadSmd("active/Trademark-Holder-French-Active.smd");
- tmchXmlSignature.verify(smdData);
- }
-
- @Test
- void testActiveTrademarkHolderRussianActive() throws Exception {
- smdData = loadSmd("active/Trademark-Holder-Russian-Active.smd");
- tmchXmlSignature.verify(smdData);
- }
-
- @Test
- void testActiveTreatystatuteAgentArabActive() throws Exception {
- smdData = loadSmd("active/TreatyStatute-Agent-Arab-Active.smd");
- tmchXmlSignature.verify(smdData);
- }
-
- @Test
- void testActiveTreatystatuteAgentChineseActive() throws Exception {
- smdData = loadSmd("active/TreatyStatute-Agent-Chinese-Active.smd");
- tmchXmlSignature.verify(smdData);
- }
-
- @Test
- void testActiveTreatystatuteAgentEnglishActive() throws Exception {
- smdData = loadSmd("active/TreatyStatute-Agent-English-Active.smd");
- tmchXmlSignature.verify(smdData);
- }
-
- @Test
- void testActiveTreatystatuteAgentFrenchActive() throws Exception {
- smdData = loadSmd("active/TreatyStatute-Agent-French-Active.smd");
- tmchXmlSignature.verify(smdData);
- }
-
- @Test
- void testActiveTreatystatuteAgentRussianActive() throws Exception {
- smdData = loadSmd("active/TreatyStatute-Agent-Russian-Active.smd");
- tmchXmlSignature.verify(smdData);
- }
-
- @Test
- void testActiveTreatystatuteHolderArabActive() throws Exception {
- smdData = loadSmd("active/TreatyStatute-Holder-Arab-Active.smd");
- tmchXmlSignature.verify(smdData);
- }
-
- @Test
- void testActiveTreatystatuteHolderChineseActive() throws Exception {
- smdData = loadSmd("active/TreatyStatute-Holder-Chinese-Active.smd");
- tmchXmlSignature.verify(smdData);
- }
-
- @Test
- void testActiveTreatystatuteHolderEnglishActive() throws Exception {
- smdData = loadSmd("active/TreatyStatute-Holder-English-Active.smd");
- tmchXmlSignature.verify(smdData);
- }
-
- @Test
- void testActiveTreatystatuteHolderFrenchActive() throws Exception {
- smdData = loadSmd("active/TreatyStatute-Holder-French-Active.smd");
- tmchXmlSignature.verify(smdData);
- }
-
- @Test
- void testActiveTreatystatuteHolderRussianActive() throws Exception {
- smdData = loadSmd("active/TreatyStatute-Holder-Russian-Active.smd");
- tmchXmlSignature.verify(smdData);
- }
-
- @Test
- void testInvalidInvalidsignatureCourtAgentFrenchActive() {
- smdData = loadSmd("invalid/InvalidSignature-Court-Agent-French-Active.smd");
- assertThrows(XMLSignatureException.class, () -> tmchXmlSignature.verify(smdData));
- }
-
- @Test
- void testInvalidInvalidsignatureTrademarkAgentEnglishActive() {
- smdData = loadSmd("invalid/InvalidSignature-Trademark-Agent-English-Active.smd");
- assertThrows(XMLSignatureException.class, () -> tmchXmlSignature.verify(smdData));
- }
-
- @Test
- void testInvalidInvalidsignatureTrademarkAgentRussianActive() {
- smdData = loadSmd("invalid/InvalidSignature-Trademark-Agent-Russian-Active.smd");
- assertThrows(XMLSignatureException.class, () -> tmchXmlSignature.verify(smdData));
- }
-
- @Test
- void testInvalidInvalidsignatureTreatystatuteAgentChineseActive() {
- smdData = loadSmd("invalid/InvalidSignature-TreatyStatute-Agent-Chinese-Active.smd");
- assertThrows(XMLSignatureException.class, () -> tmchXmlSignature.verify(smdData));
- }
-
- @Test
- void testInvalidInvalidsignatureTreatystatuteAgentEnglishActive() {
- smdData = loadSmd("invalid/InvalidSignature-TreatyStatute-Agent-English-Active.smd");
- assertThrows(XMLSignatureException.class, () -> tmchXmlSignature.verify(smdData));
- }
-
- @Test
- void testRevokedTmvTmvrevokedCourtAgentFrenchActive() {
- smdData = loadSmd("revoked/tmv/TMVRevoked-Court-Agent-French-Active.smd");
- CertificateRevokedException e =
- assertThrows(CertificateRevokedException.class, () -> tmchXmlSignature.verify(smdData));
- assertThat(e).hasMessageThat().contains("KEY_COMPROMISE");
- }
-
- @Test
- void testRevokedTmvTmvrevokedTrademarkAgentEnglishActive() {
- smdData = loadSmd("revoked/tmv/TMVRevoked-Trademark-Agent-English-Active.smd");
+ @ParameterizedTest
+ @ValueSource(strings = {"Arab", "Chinese", "English", "French"})
+ void testIndTmvRevoked(String language) {
+ smdData =
+ loadSmd(
+ String.format("idn/RevokedCert/TMVRevoked-Trademark-Agent-%s-Active.smd", language));
CertificateRevokedException e =
assertThrows(CertificateRevokedException.class, () -> tmchXmlSignature.verify(smdData));
assertThat(e).hasMessageThat().contains("Certificate has been revoked");
}
-
- @Test
- void testRevokedTmvTmvrevokedTrademarkAgentRussianActive() {
- smdData = loadSmd("revoked/tmv/TMVRevoked-Trademark-Agent-Russian-Active.smd");
- CertificateRevokedException e =
- assertThrows(CertificateRevokedException.class, () -> tmchXmlSignature.verify(smdData));
- assertThat(e).hasMessageThat().contains("Certificate has been revoked");
- }
-
- @Test
- void testRevokedTmvTmvrevokedTreatystatuteAgentChineseActive() {
- smdData = loadSmd("revoked/tmv/TMVRevoked-TreatyStatute-Agent-Chinese-Active.smd");
- CertificateRevokedException e =
- assertThrows(CertificateRevokedException.class, () -> tmchXmlSignature.verify(smdData));
- assertThat(e).hasMessageThat().contains("KEY_COMPROMISE");
- }
-
- @Test
- void testRevokedTmvTmvrevokedTreatystatuteAgentEnglishActive() {
- smdData = loadSmd("revoked/tmv/TMVRevoked-TreatyStatute-Agent-English-Active.smd");
- CertificateRevokedException e =
- assertThrows(CertificateRevokedException.class, () -> tmchXmlSignature.verify(smdData));
- assertThat(e).hasMessageThat().contains("KEY_COMPROMISE");
- }
}
diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_anchor_tenant_signed_mark.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_anchor_tenant_signed_mark.xml
index 0d940495e..0043bb18f 100644
--- a/core/src/test/resources/google/registry/flows/domain/domain_create_anchor_tenant_signed_mark.xml
+++ b/core/src/test/resources/google/registry/flows/domain/domain_create_anchor_tenant_signed_mark.xml
@@ -27,7 +27,7 @@
sunrise
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHhtbG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il8zOGFjNTg2ZC05OTg5LTQ4MTctYjcwOC1kOGU4MzQ0NzZkOTUiPgogIDxzbWQ6aWQ+MDAwMDAwMTc2MTM3NjA0Mjc1OTEzNi02NTUzNTwvc21kOmlkPgogIDxzbWQ6aXNzdWVySW5mbyBpc3N1ZXJJRD0iNjU1MzUiPgogICAgPHNtZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz4KICAgIDxzbWQ6ZW1haWw+bm90YXZhaWxhYmxlQGV4YW1wbGUuY29tPC9zbWQ6ZW1haWw+CiAgICA8c21kOnVybD5odHRwOi8vd3d3LmV4YW1wbGUuY29tPC9zbWQ6dXJsPgogICAgPHNtZDp2b2ljZT4rMzIuMDAwMDAwPC9zbWQ6dm9pY2U+CiAgPC9zbWQ6aXNzdWVySW5mbz4KICA8c21kOm5vdEJlZm9yZT4yMDEzLTA4LTA5VDEwOjA1OjU5LjEzNlo8L3NtZDpub3RCZWZvcmU+CiAgPHNtZDpub3RBZnRlcj4yMDE3LTA3LTIzVDIyOjAwOjAwLjAwMFo8L3NtZDpub3RBZnRlcj4KICA8bWFyazptYXJrIHhtbG5zOm1hcms9InVybjppZXRmOnBhcmFtczp4bWw6bnM6bWFyay0xLjAiPgogICAgPG1hcms6Y291cnQ+CiAgICAgIDxtYXJrOmlkPjAwMDUyMDEzNzM0NjkxNjkxMzczNDY5MTY5LTY1NTM1PC9tYXJrOmlkPgogICAgICA8bWFyazptYXJrTmFtZT5UZXN0ICZhbXA7IFZhbGlkYXRlPC9tYXJrOm1hcmtOYW1lPgogICAgICA8bWFyazpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj4KICAgICAgICA8bWFyazpvcmc+QWcgY29ycG9yYXRpb248L21hcms6b3JnPgogICAgICAgIDxtYXJrOmFkZHI+CiAgICAgICAgICA8bWFyazpzdHJlZXQ+MTMwNSBCcmlnaHQgQXZlbnVlPC9tYXJrOnN0cmVldD4KICAgICAgICAgIDxtYXJrOmNpdHk+QXJjYWRpYTwvbWFyazpjaXR5PgogICAgICAgICAgPG1hcms6c3A+Q0E8L21hcms6c3A+CiAgICAgICAgICA8bWFyazpwYz45MDAyODwvbWFyazpwYz4KICAgICAgICAgIDxtYXJrOmNjPlVTPC9tYXJrOmNjPgogICAgICAgIDwvbWFyazphZGRyPgogICAgICA8L21hcms6aG9sZGVyPgogICAgICA8bWFyazpjb250YWN0IHR5cGU9ImFnZW50Ij4KICAgICAgICA8bWFyazpuYW1lPlRvbnkgSG9sbGFuZDwvbWFyazpuYW1lPgogICAgICAgIDxtYXJrOm9yZz5BZyBjb3Jwb3JhdGlvbjwvbWFyazpvcmc+CiAgICAgICAgPG1hcms6YWRkcj4KICAgICAgICAgIDxtYXJrOnN0cmVldD4xMzA1IEJyaWdodCBBdmVudWU8L21hcms6c3RyZWV0PgogICAgICAgICAgPG1hcms6Y2l0eT5BcmNhZGlhPC9tYXJrOmNpdHk+CiAgICAgICAgICA8bWFyazpzcD5DQTwvbWFyazpzcD4KICAgICAgICAgIDxtYXJrOnBjPjkwMDI4PC9tYXJrOnBjPgogICAgICAgICAgPG1hcms6Y2M+VVM8L21hcms6Y2M+CiAgICAgICAgPC9tYXJrOmFkZHI+CiAgICAgICAgPG1hcms6dm9pY2U+KzEuMjAyNTU2MjMwMjwvbWFyazp2b2ljZT4KICAgICAgICA8bWFyazpmYXg+KzEuMjAyNTU2MjMwMTwvbWFyazpmYXg+CiAgICAgICAgPG1hcms6ZW1haWw+aW5mb0BhZ2NvcnBvcmF0aW9uLmNvbTwvbWFyazplbWFpbD4KICAgICAgPC9tYXJrOmNvbnRhY3Q+CiAgICAgIDxtYXJrOmxhYmVsPnRlc3RhbmR2YWxpZGF0ZTwvbWFyazpsYWJlbD4KICAgICAgPG1hcms6bGFiZWw+dGVzdC0tLXZhbGlkYXRlPC9tYXJrOmxhYmVsPgogICAgICA8bWFyazpsYWJlbD50ZXN0YW5kLXZhbGlkYXRlPC9tYXJrOmxhYmVsPgogICAgICA8bWFyazpsYWJlbD50ZXN0LXZhbGlkYXRlPC9tYXJrOmxhYmVsPgogICAgICA8bWFyazpsYWJlbD50ZXN0LWFuZHZhbGlkYXRlPC9tYXJrOmxhYmVsPgogICAgICA8bWFyazpsYWJlbD50ZXN0LS12YWxpZGF0ZTwvbWFyazpsYWJlbD4KICAgICAgPG1hcms6bGFiZWw+dGVzdHZhbGlkYXRlPC9tYXJrOmxhYmVsPgogICAgICA8bWFyazpsYWJlbD50ZXN0LWFuZC12YWxpZGF0ZTwvbWFyazpsYWJlbD4KICAgICAgPG1hcms6Z29vZHNBbmRTZXJ2aWNlcz5NdXNpY2FsIGluc3RydW1lbnRzPC9tYXJrOmdvb2RzQW5kU2VydmljZXM+CiAgICAgIDxtYXJrOnJlZk51bT4xMjM0PC9tYXJrOnJlZk51bT4KICAgICAgPG1hcms6cHJvRGF0ZT4yMDEyLTEyLTMxVDIzOjAwOjAwLjAwMFo8L21hcms6cHJvRGF0ZT4KICAgICAgPG1hcms6Y2M+VVM8L21hcms6Y2M+CiAgICAgIDxtYXJrOmNvdXJ0TmFtZT5Ib3ZlPC9tYXJrOmNvdXJ0TmFtZT4KICAgIDwvbWFyazpjb3VydD4KICA8L21hcms6bWFyaz4KPGRzOlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyIgSWQ9Il9mZDBmMTM0Ni03MTM4LTRiMGMtODRkNy0yZTdlYmY2YTExNmMiPjxkczpTaWduZWRJbmZvPjxkczpDYW5vbmljYWxpemF0aW9uTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PGRzOlNpZ25hdHVyZU1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZHNpZy1tb3JlI3JzYS1zaGEyNTYiLz48ZHM6UmVmZXJlbmNlIFVSST0iI18zOGFjNTg2ZC05OTg5LTQ4MTctYjcwOC1kOGU4MzQ0NzZkOTUiPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjZW52ZWxvcGVkLXNpZ25hdHVyZSIvPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1ZT55WDRLTWgrUDJ2OVUxNnh0eTl2ZGU5S0JTZmZFTjRHbTVVa2tLblI5cDdZPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PGRzOlJlZmVyZW5jZSBVUkk9IiNfYjg5MjI1NWItMWJjOC00MTdiLWE0NGYtZWE5OGJjMzQ5OWE0Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+dDNuNkFBTHdiaUhNbGRyZkpEQjNYQ3FkSlFzOEhjeU5pK1lXT3ZoV1krdz08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNlPjwvZHM6U2lnbmVkSW5mbz48ZHM6U2lnbmF0dXJlVmFsdWUgSWQ9Il82OWQzMDRlNC04NzlmLTRmNzEtYmMxMi02ZjJhZDlmOTM5OGYiPmJSVFIzTzUxM0dnTkExS2pxb0g0VXE3cUlhN2NJaTljaXZmZmFyVmE0VVQyVEUzdzEzc2xsUDFXbkdYYjcyYUw0dXhkbDFUaTZZbFoKVnVjSC92ZU5zUnlWZFZwSFF0eEJNTDFLU0tZbXc3ZjdPNnVsYWtrYnFrTkdYVmFZdEVsa1dBZnZFSDBsNURkNkFZT0k2UGN5SzBCWgo2VEl3cWZhQ1luVk5DdTFpdDIzMm9EREtiWU9RNk02YnhmU3BvVFYvaTVVdEVyak0vZWFFanp4MXFxZzlFZmxOcm1obmRtZW42Q2JYCjVrNmZ4Y1o0V2NtWkM4V0Ruc0t0VWVjaGtmbko4L0Jwc2ppM1Foekg4YzFiL0RqTmR5UFFyOGlndXBqR2dlU0JmMHhRRUtoK3pRT2oKYTNvMEhRWjZ1UlUvejdWN2RoNU9qUEhmV2lLc0pqRjVwc2ppRlE9PTwvZHM6U2lnbmF0dXJlVmFsdWU+PGRzOktleUluZm8gSWQ9Il9iODkyMjU1Yi0xYmM4LTQxN2ItYTQ0Zi1lYTk4YmMzNDk5YTQiPjxkczpYNTA5RGF0YT48ZHM6WDUwOUNlcnRpZmljYXRlPk1JSUZMekNDQkJlZ0F3SUJBZ0lnTHJBYmV2b2FlNTJ5M2Y2QzJ0QjBTbjNwN1hKbTBUMDJGb2d4S0NmTmhYb3dEUVlKS29aSWh2Y04KQVFFTEJRQXdmREVMTUFrR0ExVUVCaE1DVlZNeFBEQTZCZ05WQkFvVE0wbHVkR1Z5Ym1WMElFTnZjbkJ2Y21GMGFXOXVJR1p2Y2lCQgpjM05wWjI1bFpDQk9ZVzFsY3lCaGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF4TW1TVU5CVGs0Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5CmFXNW5hRzkxYzJVZ1VHbHNiM1FnUTBFd0hoY05NVE13TmpJMk1EQXdNREF3V2hjTk1UZ3dOakkxTWpNMU9UVTVXakNCanpFTE1Ba0cKQTFVRUJoTUNRa1V4SURBZUJnTlZCQWdURjBKeWRYTnpaV3h6TFVOaGNHbDBZV3dnVW1WbmFXOXVNUkV3RHdZRFZRUUhFd2hDY25WegpjMlZzY3pFUk1BOEdBMVVFQ2hNSVJHVnNiMmwwZEdVeE9EQTJCZ05WQkFNVEwwbERRVTVPSUZSTlEwZ2dRWFYwYUc5eWFYcGxaQ0JVCmNtRmtaVzFoY21zZ1VHbHNiM1FnVm1Gc2FXUmhkRzl5TUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUEKeGxwM0twWUhYM1d5QXNGaFNrM0x3V2ZuR2x4blVERnFGWkEzVW91TVlqL1hpZ2JNa05lRVhJamxrUk9LVDRPUEdmUngvTEF5UmxRUQpqQ012NHFoYmtjWDFwN2FyNjNmbHE0U1pOVmNsMTVsN2gwdVQ1OEZ6U2ZubHowdTVya0hmSkltRDQzK21hUC84Z3YzNkZSMjdqVzhSCjl3WTRoaytXczRJQjBpRlNkOFNYdjFLcjh3L0ptTVFTRGtpdUcrUmZJaXVid1EvZnk3RWtqNVFXaFBadyttTXhOS25IVUx5M3hZejIKTHdWZmZ0andVdWVhY3ZxTlJDa01YbENsT0FEcWZUOG9TWm9lRFhlaEh2bFBzTENlbUdCb1RLdXJza0lTNjlGMHlQRUg1Z3plMEgrZgo4RlJPc0lvS1NzVlEzNEI0Uy9qb0U2N25wc0pQVGRLc05QSlR5UUlEQVFBQm80SUJoekNDQVlNd0RBWURWUjBUQVFIL0JBSXdBREFkCkJnTlZIUTRFRmdRVW9GcFk3NnA1eW9ORFJHdFFwelZ1UjgxVVdRMHdnY1lHQTFVZEl3U0J2akNCdTRBVXc2MCtwdFlSQUVXQVhEcFgKU29wdDNERU5ubkdoZ1lDa2ZqQjhNUXN3Q1FZRFZRUUdFd0pWVXpFOE1Eb0dBMVVFQ2hNelNXNTBaWEp1WlhRZ1EyOXljRzl5WVhScApiMjRnWm05eUlFRnpjMmxuYm1Wa0lFNWhiV1Z6SUdGdVpDQk9kVzFpWlhKek1TOHdMUVlEVlFRREV5WkpRMEZPVGlCVWNtRmtaVzFoCmNtc2dRMnhsWVhKcGJtZG9iM1Z6WlNCUWFXeHZkQ0JEUVlJZ0xyQWJldm9hZTUyeTNmNkMydEIwU24zcDdYSm0wVDAyRm9neEtDZk4KaFhrd0RnWURWUjBQQVFIL0JBUURBZ2VBTURRR0ExVWRId1F0TUNzd0thQW5vQ1dHSTJoMGRIQTZMeTlqY213dWFXTmhibTR1YjNKbgpMM1J0WTJoZmNHbHNiM1F1WTNKc01FVUdBMVVkSUFRK01Ed3dPZ1lES2dNRU1ETXdNUVlJS3dZQkJRVUhBZ0VXSldoMGRIQTZMeTkzCmQzY3VhV05oYm00dWIzSm5MM0JwYkc5MFgzSmxjRzl6YVhSdmNua3dEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBSWVEWVlKcjYwVzMKeTlRcyszelJWSTlrZWtLb201dmtIT2FsQjN3SGFaSWFBRllwSTk4dFkwYVZOOWFHT04wdjZXUUYrbnZ6MUtSWlFiQXowMUJYdGFSSgo0bVBrYXJoaHVMbjlOa0J4cDhIUjVxY2MrS0g3Z3Y2ci9jMGlHM2JDTkorUVNyN1FmKzVNbE1vNnpMNVVkZFUvVDJqaWJNWENqL2YyCjFRdzN4OVFnb3lYTEZKOW96YUxnUTlSTWtMbE9temtDQWlYTjVBYjQzYUo5ZjdOMmdFMk5uUmpOS21tQzlBQlEwVFJ3RUtWTGhWbDEKVUdxQ0hKM0FsQlhXSVhONXNqUFFjRC8rbkhlRVhNeFl2bEF5cXhYb0QzTVd0UVZqN2oyb3FsYWtPQk1nRzgrcTJxWWxtQnRzNEZOaQp3NzQ4SWw1ODZIS0JScXhIdFpkUktXMlZxYVE9PC9kczpYNTA5Q2VydGlmaWNhdGU+PC9kczpYNTA5RGF0YT48L2RzOktleUluZm8+PC9kczpTaWduYXR1cmU+PC9zbWQ6c2lnbmVkTWFyaz4=
+ %SMD%
diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_anchor_tenant_sunrise_metadata_extension_signed_mark.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_anchor_tenant_sunrise_metadata_extension_signed_mark.xml
index 3354fc368..e3d3410b9 100644
--- a/core/src/test/resources/google/registry/flows/domain/domain_create_anchor_tenant_sunrise_metadata_extension_signed_mark.xml
+++ b/core/src/test/resources/google/registry/flows/domain/domain_create_anchor_tenant_sunrise_metadata_extension_signed_mark.xml
@@ -22,7 +22,7 @@
sunrise
- PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHhtbG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il8zOGFjNTg2ZC05OTg5LTQ4MTctYjcwOC1kOGU4MzQ0NzZkOTUiPgogIDxzbWQ6aWQ+MDAwMDAwMTc2MTM3NjA0Mjc1OTEzNi02NTUzNTwvc21kOmlkPgogIDxzbWQ6aXNzdWVySW5mbyBpc3N1ZXJJRD0iNjU1MzUiPgogICAgPHNtZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz4KICAgIDxzbWQ6ZW1haWw+bm90YXZhaWxhYmxlQGV4YW1wbGUuY29tPC9zbWQ6ZW1haWw+CiAgICA8c21kOnVybD5odHRwOi8vd3d3LmV4YW1wbGUuY29tPC9zbWQ6dXJsPgogICAgPHNtZDp2b2ljZT4rMzIuMDAwMDAwPC9zbWQ6dm9pY2U+CiAgPC9zbWQ6aXNzdWVySW5mbz4KICA8c21kOm5vdEJlZm9yZT4yMDEzLTA4LTA5VDEwOjA1OjU5LjEzNlo8L3NtZDpub3RCZWZvcmU+CiAgPHNtZDpub3RBZnRlcj4yMDE3LTA3LTIzVDIyOjAwOjAwLjAwMFo8L3NtZDpub3RBZnRlcj4KICA8bWFyazptYXJrIHhtbG5zOm1hcms9InVybjppZXRmOnBhcmFtczp4bWw6bnM6bWFyay0xLjAiPgogICAgPG1hcms6Y291cnQ+CiAgICAgIDxtYXJrOmlkPjAwMDUyMDEzNzM0NjkxNjkxMzczNDY5MTY5LTY1NTM1PC9tYXJrOmlkPgogICAgICA8bWFyazptYXJrTmFtZT5UZXN0ICZhbXA7IFZhbGlkYXRlPC9tYXJrOm1hcmtOYW1lPgogICAgICA8bWFyazpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj4KICAgICAgICA8bWFyazpvcmc+QWcgY29ycG9yYXRpb248L21hcms6b3JnPgogICAgICAgIDxtYXJrOmFkZHI+CiAgICAgICAgICA8bWFyazpzdHJlZXQ+MTMwNSBCcmlnaHQgQXZlbnVlPC9tYXJrOnN0cmVldD4KICAgICAgICAgIDxtYXJrOmNpdHk+QXJjYWRpYTwvbWFyazpjaXR5PgogICAgICAgICAgPG1hcms6c3A+Q0E8L21hcms6c3A+CiAgICAgICAgICA8bWFyazpwYz45MDAyODwvbWFyazpwYz4KICAgICAgICAgIDxtYXJrOmNjPlVTPC9tYXJrOmNjPgogICAgICAgIDwvbWFyazphZGRyPgogICAgICA8L21hcms6aG9sZGVyPgogICAgICA8bWFyazpjb250YWN0IHR5cGU9ImFnZW50Ij4KICAgICAgICA8bWFyazpuYW1lPlRvbnkgSG9sbGFuZDwvbWFyazpuYW1lPgogICAgICAgIDxtYXJrOm9yZz5BZyBjb3Jwb3JhdGlvbjwvbWFyazpvcmc+CiAgICAgICAgPG1hcms6YWRkcj4KICAgICAgICAgIDxtYXJrOnN0cmVldD4xMzA1IEJyaWdodCBBdmVudWU8L21hcms6c3RyZWV0PgogICAgICAgICAgPG1hcms6Y2l0eT5BcmNhZGlhPC9tYXJrOmNpdHk+CiAgICAgICAgICA8bWFyazpzcD5DQTwvbWFyazpzcD4KICAgICAgICAgIDxtYXJrOnBjPjkwMDI4PC9tYXJrOnBjPgogICAgICAgICAgPG1hcms6Y2M+VVM8L21hcms6Y2M+CiAgICAgICAgPC9tYXJrOmFkZHI+CiAgICAgICAgPG1hcms6dm9pY2U+KzEuMjAyNTU2MjMwMjwvbWFyazp2b2ljZT4KICAgICAgICA8bWFyazpmYXg+KzEuMjAyNTU2MjMwMTwvbWFyazpmYXg+CiAgICAgICAgPG1hcms6ZW1haWw+aW5mb0BhZ2NvcnBvcmF0aW9uLmNvbTwvbWFyazplbWFpbD4KICAgICAgPC9tYXJrOmNvbnRhY3Q+CiAgICAgIDxtYXJrOmxhYmVsPnRlc3RhbmR2YWxpZGF0ZTwvbWFyazpsYWJlbD4KICAgICAgPG1hcms6bGFiZWw+dGVzdC0tLXZhbGlkYXRlPC9tYXJrOmxhYmVsPgogICAgICA8bWFyazpsYWJlbD50ZXN0YW5kLXZhbGlkYXRlPC9tYXJrOmxhYmVsPgogICAgICA8bWFyazpsYWJlbD50ZXN0LXZhbGlkYXRlPC9tYXJrOmxhYmVsPgogICAgICA8bWFyazpsYWJlbD50ZXN0LWFuZHZhbGlkYXRlPC9tYXJrOmxhYmVsPgogICAgICA8bWFyazpsYWJlbD50ZXN0LS12YWxpZGF0ZTwvbWFyazpsYWJlbD4KICAgICAgPG1hcms6bGFiZWw+dGVzdHZhbGlkYXRlPC9tYXJrOmxhYmVsPgogICAgICA8bWFyazpsYWJlbD50ZXN0LWFuZC12YWxpZGF0ZTwvbWFyazpsYWJlbD4KICAgICAgPG1hcms6Z29vZHNBbmRTZXJ2aWNlcz5NdXNpY2FsIGluc3RydW1lbnRzPC9tYXJrOmdvb2RzQW5kU2VydmljZXM+CiAgICAgIDxtYXJrOnJlZk51bT4xMjM0PC9tYXJrOnJlZk51bT4KICAgICAgPG1hcms6cHJvRGF0ZT4yMDEyLTEyLTMxVDIzOjAwOjAwLjAwMFo8L21hcms6cHJvRGF0ZT4KICAgICAgPG1hcms6Y2M+VVM8L21hcms6Y2M+CiAgICAgIDxtYXJrOmNvdXJ0TmFtZT5Ib3ZlPC9tYXJrOmNvdXJ0TmFtZT4KICAgIDwvbWFyazpjb3VydD4KICA8L21hcms6bWFyaz4KPGRzOlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyIgSWQ9Il9mZDBmMTM0Ni03MTM4LTRiMGMtODRkNy0yZTdlYmY2YTExNmMiPjxkczpTaWduZWRJbmZvPjxkczpDYW5vbmljYWxpemF0aW9uTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PGRzOlNpZ25hdHVyZU1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZHNpZy1tb3JlI3JzYS1zaGEyNTYiLz48ZHM6UmVmZXJlbmNlIFVSST0iI18zOGFjNTg2ZC05OTg5LTQ4MTctYjcwOC1kOGU4MzQ0NzZkOTUiPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjZW52ZWxvcGVkLXNpZ25hdHVyZSIvPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1ZT55WDRLTWgrUDJ2OVUxNnh0eTl2ZGU5S0JTZmZFTjRHbTVVa2tLblI5cDdZPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PGRzOlJlZmVyZW5jZSBVUkk9IiNfYjg5MjI1NWItMWJjOC00MTdiLWE0NGYtZWE5OGJjMzQ5OWE0Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+dDNuNkFBTHdiaUhNbGRyZkpEQjNYQ3FkSlFzOEhjeU5pK1lXT3ZoV1krdz08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNlPjwvZHM6U2lnbmVkSW5mbz48ZHM6U2lnbmF0dXJlVmFsdWUgSWQ9Il82OWQzMDRlNC04NzlmLTRmNzEtYmMxMi02ZjJhZDlmOTM5OGYiPmJSVFIzTzUxM0dnTkExS2pxb0g0VXE3cUlhN2NJaTljaXZmZmFyVmE0VVQyVEUzdzEzc2xsUDFXbkdYYjcyYUw0dXhkbDFUaTZZbFoKVnVjSC92ZU5zUnlWZFZwSFF0eEJNTDFLU0tZbXc3ZjdPNnVsYWtrYnFrTkdYVmFZdEVsa1dBZnZFSDBsNURkNkFZT0k2UGN5SzBCWgo2VEl3cWZhQ1luVk5DdTFpdDIzMm9EREtiWU9RNk02YnhmU3BvVFYvaTVVdEVyak0vZWFFanp4MXFxZzlFZmxOcm1obmRtZW42Q2JYCjVrNmZ4Y1o0V2NtWkM4V0Ruc0t0VWVjaGtmbko4L0Jwc2ppM1Foekg4YzFiL0RqTmR5UFFyOGlndXBqR2dlU0JmMHhRRUtoK3pRT2oKYTNvMEhRWjZ1UlUvejdWN2RoNU9qUEhmV2lLc0pqRjVwc2ppRlE9PTwvZHM6U2lnbmF0dXJlVmFsdWU+PGRzOktleUluZm8gSWQ9Il9iODkyMjU1Yi0xYmM4LTQxN2ItYTQ0Zi1lYTk4YmMzNDk5YTQiPjxkczpYNTA5RGF0YT48ZHM6WDUwOUNlcnRpZmljYXRlPk1JSUZMekNDQkJlZ0F3SUJBZ0lnTHJBYmV2b2FlNTJ5M2Y2QzJ0QjBTbjNwN1hKbTBUMDJGb2d4S0NmTmhYb3dEUVlKS29aSWh2Y04KQVFFTEJRQXdmREVMTUFrR0ExVUVCaE1DVlZNeFBEQTZCZ05WQkFvVE0wbHVkR1Z5Ym1WMElFTnZjbkJ2Y21GMGFXOXVJR1p2Y2lCQgpjM05wWjI1bFpDQk9ZVzFsY3lCaGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF4TW1TVU5CVGs0Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5CmFXNW5hRzkxYzJVZ1VHbHNiM1FnUTBFd0hoY05NVE13TmpJMk1EQXdNREF3V2hjTk1UZ3dOakkxTWpNMU9UVTVXakNCanpFTE1Ba0cKQTFVRUJoTUNRa1V4SURBZUJnTlZCQWdURjBKeWRYTnpaV3h6TFVOaGNHbDBZV3dnVW1WbmFXOXVNUkV3RHdZRFZRUUhFd2hDY25WegpjMlZzY3pFUk1BOEdBMVVFQ2hNSVJHVnNiMmwwZEdVeE9EQTJCZ05WQkFNVEwwbERRVTVPSUZSTlEwZ2dRWFYwYUc5eWFYcGxaQ0JVCmNtRmtaVzFoY21zZ1VHbHNiM1FnVm1Gc2FXUmhkRzl5TUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUEKeGxwM0twWUhYM1d5QXNGaFNrM0x3V2ZuR2x4blVERnFGWkEzVW91TVlqL1hpZ2JNa05lRVhJamxrUk9LVDRPUEdmUngvTEF5UmxRUQpqQ012NHFoYmtjWDFwN2FyNjNmbHE0U1pOVmNsMTVsN2gwdVQ1OEZ6U2ZubHowdTVya0hmSkltRDQzK21hUC84Z3YzNkZSMjdqVzhSCjl3WTRoaytXczRJQjBpRlNkOFNYdjFLcjh3L0ptTVFTRGtpdUcrUmZJaXVid1EvZnk3RWtqNVFXaFBadyttTXhOS25IVUx5M3hZejIKTHdWZmZ0andVdWVhY3ZxTlJDa01YbENsT0FEcWZUOG9TWm9lRFhlaEh2bFBzTENlbUdCb1RLdXJza0lTNjlGMHlQRUg1Z3plMEgrZgo4RlJPc0lvS1NzVlEzNEI0Uy9qb0U2N25wc0pQVGRLc05QSlR5UUlEQVFBQm80SUJoekNDQVlNd0RBWURWUjBUQVFIL0JBSXdBREFkCkJnTlZIUTRFRmdRVW9GcFk3NnA1eW9ORFJHdFFwelZ1UjgxVVdRMHdnY1lHQTFVZEl3U0J2akNCdTRBVXc2MCtwdFlSQUVXQVhEcFgKU29wdDNERU5ubkdoZ1lDa2ZqQjhNUXN3Q1FZRFZRUUdFd0pWVXpFOE1Eb0dBMVVFQ2hNelNXNTBaWEp1WlhRZ1EyOXljRzl5WVhScApiMjRnWm05eUlFRnpjMmxuYm1Wa0lFNWhiV1Z6SUdGdVpDQk9kVzFpWlhKek1TOHdMUVlEVlFRREV5WkpRMEZPVGlCVWNtRmtaVzFoCmNtc2dRMnhsWVhKcGJtZG9iM1Z6WlNCUWFXeHZkQ0JEUVlJZ0xyQWJldm9hZTUyeTNmNkMydEIwU24zcDdYSm0wVDAyRm9neEtDZk4KaFhrd0RnWURWUjBQQVFIL0JBUURBZ2VBTURRR0ExVWRId1F0TUNzd0thQW5vQ1dHSTJoMGRIQTZMeTlqY213dWFXTmhibTR1YjNKbgpMM1J0WTJoZmNHbHNiM1F1WTNKc01FVUdBMVVkSUFRK01Ed3dPZ1lES2dNRU1ETXdNUVlJS3dZQkJRVUhBZ0VXSldoMGRIQTZMeTkzCmQzY3VhV05oYm00dWIzSm5MM0JwYkc5MFgzSmxjRzl6YVhSdmNua3dEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBSWVEWVlKcjYwVzMKeTlRcyszelJWSTlrZWtLb201dmtIT2FsQjN3SGFaSWFBRllwSTk4dFkwYVZOOWFHT04wdjZXUUYrbnZ6MUtSWlFiQXowMUJYdGFSSgo0bVBrYXJoaHVMbjlOa0J4cDhIUjVxY2MrS0g3Z3Y2ci9jMGlHM2JDTkorUVNyN1FmKzVNbE1vNnpMNVVkZFUvVDJqaWJNWENqL2YyCjFRdzN4OVFnb3lYTEZKOW96YUxnUTlSTWtMbE9temtDQWlYTjVBYjQzYUo5ZjdOMmdFMk5uUmpOS21tQzlBQlEwVFJ3RUtWTGhWbDEKVUdxQ0hKM0FsQlhXSVhONXNqUFFjRC8rbkhlRVhNeFl2bEF5cXhYb0QzTVd0UVZqN2oyb3FsYWtPQk1nRzgrcTJxWWxtQnRzNEZOaQp3NzQ4SWw1ODZIS0JScXhIdFpkUktXMlZxYVE9PC9kczpYNTA5Q2VydGlmaWNhdGU+PC9kczpYNTA5RGF0YT48L2RzOktleUluZm8+PC9kczpTaWduYXR1cmU+PC9zbWQ6c2lnbmVkTWFyaz4=
+ %SMD%
diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_registration_encoded_signed_mark.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_registration_encoded_signed_mark.xml
index 48742c496..b812b4401 100644
--- a/core/src/test/resources/google/registry/flows/domain/domain_create_registration_encoded_signed_mark.xml
+++ b/core/src/test/resources/google/registry/flows/domain/domain_create_registration_encoded_signed_mark.xml
@@ -22,7 +22,7 @@
%PHASE%
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHhtbG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il8zOGFjNTg2ZC05OTg5LTQ4MTctYjcwOC1kOGU4MzQ0NzZkOTUiPgogIDxzbWQ6aWQ+MDAwMDAwMTc2MTM3NjA0Mjc1OTEzNi02NTUzNTwvc21kOmlkPgogIDxzbWQ6aXNzdWVySW5mbyBpc3N1ZXJJRD0iNjU1MzUiPgogICAgPHNtZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz4KICAgIDxzbWQ6ZW1haWw+bm90YXZhaWxhYmxlQGV4YW1wbGUuY29tPC9zbWQ6ZW1haWw+CiAgICA8c21kOnVybD5odHRwOi8vd3d3LmV4YW1wbGUuY29tPC9zbWQ6dXJsPgogICAgPHNtZDp2b2ljZT4rMzIuMDAwMDAwPC9zbWQ6dm9pY2U+CiAgPC9zbWQ6aXNzdWVySW5mbz4KICA8c21kOm5vdEJlZm9yZT4yMDEzLTA4LTA5VDEwOjA1OjU5LjEzNlo8L3NtZDpub3RCZWZvcmU+CiAgPHNtZDpub3RBZnRlcj4yMDE3LTA3LTIzVDIyOjAwOjAwLjAwMFo8L3NtZDpub3RBZnRlcj4KICA8bWFyazptYXJrIHhtbG5zOm1hcms9InVybjppZXRmOnBhcmFtczp4bWw6bnM6bWFyay0xLjAiPgogICAgPG1hcms6Y291cnQ+CiAgICAgIDxtYXJrOmlkPjAwMDUyMDEzNzM0NjkxNjkxMzczNDY5MTY5LTY1NTM1PC9tYXJrOmlkPgogICAgICA8bWFyazptYXJrTmFtZT5UZXN0ICZhbXA7IFZhbGlkYXRlPC9tYXJrOm1hcmtOYW1lPgogICAgICA8bWFyazpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj4KICAgICAgICA8bWFyazpvcmc+QWcgY29ycG9yYXRpb248L21hcms6b3JnPgogICAgICAgIDxtYXJrOmFkZHI+CiAgICAgICAgICA8bWFyazpzdHJlZXQ+MTMwNSBCcmlnaHQgQXZlbnVlPC9tYXJrOnN0cmVldD4KICAgICAgICAgIDxtYXJrOmNpdHk+QXJjYWRpYTwvbWFyazpjaXR5PgogICAgICAgICAgPG1hcms6c3A+Q0E8L21hcms6c3A+CiAgICAgICAgICA8bWFyazpwYz45MDAyODwvbWFyazpwYz4KICAgICAgICAgIDxtYXJrOmNjPlVTPC9tYXJrOmNjPgogICAgICAgIDwvbWFyazphZGRyPgogICAgICA8L21hcms6aG9sZGVyPgogICAgICA8bWFyazpjb250YWN0IHR5cGU9ImFnZW50Ij4KICAgICAgICA8bWFyazpuYW1lPlRvbnkgSG9sbGFuZDwvbWFyazpuYW1lPgogICAgICAgIDxtYXJrOm9yZz5BZyBjb3Jwb3JhdGlvbjwvbWFyazpvcmc+CiAgICAgICAgPG1hcms6YWRkcj4KICAgICAgICAgIDxtYXJrOnN0cmVldD4xMzA1IEJyaWdodCBBdmVudWU8L21hcms6c3RyZWV0PgogICAgICAgICAgPG1hcms6Y2l0eT5BcmNhZGlhPC9tYXJrOmNpdHk+CiAgICAgICAgICA8bWFyazpzcD5DQTwvbWFyazpzcD4KICAgICAgICAgIDxtYXJrOnBjPjkwMDI4PC9tYXJrOnBjPgogICAgICAgICAgPG1hcms6Y2M+VVM8L21hcms6Y2M+CiAgICAgICAgPC9tYXJrOmFkZHI+CiAgICAgICAgPG1hcms6dm9pY2U+KzEuMjAyNTU2MjMwMjwvbWFyazp2b2ljZT4KICAgICAgICA8bWFyazpmYXg+KzEuMjAyNTU2MjMwMTwvbWFyazpmYXg+CiAgICAgICAgPG1hcms6ZW1haWw+aW5mb0BhZ2NvcnBvcmF0aW9uLmNvbTwvbWFyazplbWFpbD4KICAgICAgPC9tYXJrOmNvbnRhY3Q+CiAgICAgIDxtYXJrOmxhYmVsPnRlc3RhbmR2YWxpZGF0ZTwvbWFyazpsYWJlbD4KICAgICAgPG1hcms6bGFiZWw+dGVzdC0tLXZhbGlkYXRlPC9tYXJrOmxhYmVsPgogICAgICA8bWFyazpsYWJlbD50ZXN0YW5kLXZhbGlkYXRlPC9tYXJrOmxhYmVsPgogICAgICA8bWFyazpsYWJlbD50ZXN0LXZhbGlkYXRlPC9tYXJrOmxhYmVsPgogICAgICA8bWFyazpsYWJlbD50ZXN0LWFuZHZhbGlkYXRlPC9tYXJrOmxhYmVsPgogICAgICA8bWFyazpsYWJlbD50ZXN0LS12YWxpZGF0ZTwvbWFyazpsYWJlbD4KICAgICAgPG1hcms6bGFiZWw+dGVzdHZhbGlkYXRlPC9tYXJrOmxhYmVsPgogICAgICA8bWFyazpsYWJlbD50ZXN0LWFuZC12YWxpZGF0ZTwvbWFyazpsYWJlbD4KICAgICAgPG1hcms6Z29vZHNBbmRTZXJ2aWNlcz5NdXNpY2FsIGluc3RydW1lbnRzPC9tYXJrOmdvb2RzQW5kU2VydmljZXM+CiAgICAgIDxtYXJrOnJlZk51bT4xMjM0PC9tYXJrOnJlZk51bT4KICAgICAgPG1hcms6cHJvRGF0ZT4yMDEyLTEyLTMxVDIzOjAwOjAwLjAwMFo8L21hcms6cHJvRGF0ZT4KICAgICAgPG1hcms6Y2M+VVM8L21hcms6Y2M+CiAgICAgIDxtYXJrOmNvdXJ0TmFtZT5Ib3ZlPC9tYXJrOmNvdXJ0TmFtZT4KICAgIDwvbWFyazpjb3VydD4KICA8L21hcms6bWFyaz4KPGRzOlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyIgSWQ9Il9mZDBmMTM0Ni03MTM4LTRiMGMtODRkNy0yZTdlYmY2YTExNmMiPjxkczpTaWduZWRJbmZvPjxkczpDYW5vbmljYWxpemF0aW9uTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PGRzOlNpZ25hdHVyZU1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZHNpZy1tb3JlI3JzYS1zaGEyNTYiLz48ZHM6UmVmZXJlbmNlIFVSST0iI18zOGFjNTg2ZC05OTg5LTQ4MTctYjcwOC1kOGU4MzQ0NzZkOTUiPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjZW52ZWxvcGVkLXNpZ25hdHVyZSIvPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1ZT55WDRLTWgrUDJ2OVUxNnh0eTl2ZGU5S0JTZmZFTjRHbTVVa2tLblI5cDdZPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PGRzOlJlZmVyZW5jZSBVUkk9IiNfYjg5MjI1NWItMWJjOC00MTdiLWE0NGYtZWE5OGJjMzQ5OWE0Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+dDNuNkFBTHdiaUhNbGRyZkpEQjNYQ3FkSlFzOEhjeU5pK1lXT3ZoV1krdz08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNlPjwvZHM6U2lnbmVkSW5mbz48ZHM6U2lnbmF0dXJlVmFsdWUgSWQ9Il82OWQzMDRlNC04NzlmLTRmNzEtYmMxMi02ZjJhZDlmOTM5OGYiPmJSVFIzTzUxM0dnTkExS2pxb0g0VXE3cUlhN2NJaTljaXZmZmFyVmE0VVQyVEUzdzEzc2xsUDFXbkdYYjcyYUw0dXhkbDFUaTZZbFoKVnVjSC92ZU5zUnlWZFZwSFF0eEJNTDFLU0tZbXc3ZjdPNnVsYWtrYnFrTkdYVmFZdEVsa1dBZnZFSDBsNURkNkFZT0k2UGN5SzBCWgo2VEl3cWZhQ1luVk5DdTFpdDIzMm9EREtiWU9RNk02YnhmU3BvVFYvaTVVdEVyak0vZWFFanp4MXFxZzlFZmxOcm1obmRtZW42Q2JYCjVrNmZ4Y1o0V2NtWkM4V0Ruc0t0VWVjaGtmbko4L0Jwc2ppM1Foekg4YzFiL0RqTmR5UFFyOGlndXBqR2dlU0JmMHhRRUtoK3pRT2oKYTNvMEhRWjZ1UlUvejdWN2RoNU9qUEhmV2lLc0pqRjVwc2ppRlE9PTwvZHM6U2lnbmF0dXJlVmFsdWU+PGRzOktleUluZm8gSWQ9Il9iODkyMjU1Yi0xYmM4LTQxN2ItYTQ0Zi1lYTk4YmMzNDk5YTQiPjxkczpYNTA5RGF0YT48ZHM6WDUwOUNlcnRpZmljYXRlPk1JSUZMekNDQkJlZ0F3SUJBZ0lnTHJBYmV2b2FlNTJ5M2Y2QzJ0QjBTbjNwN1hKbTBUMDJGb2d4S0NmTmhYb3dEUVlKS29aSWh2Y04KQVFFTEJRQXdmREVMTUFrR0ExVUVCaE1DVlZNeFBEQTZCZ05WQkFvVE0wbHVkR1Z5Ym1WMElFTnZjbkJ2Y21GMGFXOXVJR1p2Y2lCQgpjM05wWjI1bFpDQk9ZVzFsY3lCaGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF4TW1TVU5CVGs0Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5CmFXNW5hRzkxYzJVZ1VHbHNiM1FnUTBFd0hoY05NVE13TmpJMk1EQXdNREF3V2hjTk1UZ3dOakkxTWpNMU9UVTVXakNCanpFTE1Ba0cKQTFVRUJoTUNRa1V4SURBZUJnTlZCQWdURjBKeWRYTnpaV3h6TFVOaGNHbDBZV3dnVW1WbmFXOXVNUkV3RHdZRFZRUUhFd2hDY25WegpjMlZzY3pFUk1BOEdBMVVFQ2hNSVJHVnNiMmwwZEdVeE9EQTJCZ05WQkFNVEwwbERRVTVPSUZSTlEwZ2dRWFYwYUc5eWFYcGxaQ0JVCmNtRmtaVzFoY21zZ1VHbHNiM1FnVm1Gc2FXUmhkRzl5TUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUEKeGxwM0twWUhYM1d5QXNGaFNrM0x3V2ZuR2x4blVERnFGWkEzVW91TVlqL1hpZ2JNa05lRVhJamxrUk9LVDRPUEdmUngvTEF5UmxRUQpqQ012NHFoYmtjWDFwN2FyNjNmbHE0U1pOVmNsMTVsN2gwdVQ1OEZ6U2ZubHowdTVya0hmSkltRDQzK21hUC84Z3YzNkZSMjdqVzhSCjl3WTRoaytXczRJQjBpRlNkOFNYdjFLcjh3L0ptTVFTRGtpdUcrUmZJaXVid1EvZnk3RWtqNVFXaFBadyttTXhOS25IVUx5M3hZejIKTHdWZmZ0andVdWVhY3ZxTlJDa01YbENsT0FEcWZUOG9TWm9lRFhlaEh2bFBzTENlbUdCb1RLdXJza0lTNjlGMHlQRUg1Z3plMEgrZgo4RlJPc0lvS1NzVlEzNEI0Uy9qb0U2N25wc0pQVGRLc05QSlR5UUlEQVFBQm80SUJoekNDQVlNd0RBWURWUjBUQVFIL0JBSXdBREFkCkJnTlZIUTRFRmdRVW9GcFk3NnA1eW9ORFJHdFFwelZ1UjgxVVdRMHdnY1lHQTFVZEl3U0J2akNCdTRBVXc2MCtwdFlSQUVXQVhEcFgKU29wdDNERU5ubkdoZ1lDa2ZqQjhNUXN3Q1FZRFZRUUdFd0pWVXpFOE1Eb0dBMVVFQ2hNelNXNTBaWEp1WlhRZ1EyOXljRzl5WVhScApiMjRnWm05eUlFRnpjMmxuYm1Wa0lFNWhiV1Z6SUdGdVpDQk9kVzFpWlhKek1TOHdMUVlEVlFRREV5WkpRMEZPVGlCVWNtRmtaVzFoCmNtc2dRMnhsWVhKcGJtZG9iM1Z6WlNCUWFXeHZkQ0JEUVlJZ0xyQWJldm9hZTUyeTNmNkMydEIwU24zcDdYSm0wVDAyRm9neEtDZk4KaFhrd0RnWURWUjBQQVFIL0JBUURBZ2VBTURRR0ExVWRId1F0TUNzd0thQW5vQ1dHSTJoMGRIQTZMeTlqY213dWFXTmhibTR1YjNKbgpMM1J0WTJoZmNHbHNiM1F1WTNKc01FVUdBMVVkSUFRK01Ed3dPZ1lES2dNRU1ETXdNUVlJS3dZQkJRVUhBZ0VXSldoMGRIQTZMeTkzCmQzY3VhV05oYm00dWIzSm5MM0JwYkc5MFgzSmxjRzl6YVhSdmNua3dEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBSWVEWVlKcjYwVzMKeTlRcyszelJWSTlrZWtLb201dmtIT2FsQjN3SGFaSWFBRllwSTk4dFkwYVZOOWFHT04wdjZXUUYrbnZ6MUtSWlFiQXowMUJYdGFSSgo0bVBrYXJoaHVMbjlOa0J4cDhIUjVxY2MrS0g3Z3Y2ci9jMGlHM2JDTkorUVNyN1FmKzVNbE1vNnpMNVVkZFUvVDJqaWJNWENqL2YyCjFRdzN4OVFnb3lYTEZKOW96YUxnUTlSTWtMbE9temtDQWlYTjVBYjQzYUo5ZjdOMmdFMk5uUmpOS21tQzlBQlEwVFJ3RUtWTGhWbDEKVUdxQ0hKM0FsQlhXSVhONXNqUFFjRC8rbkhlRVhNeFl2bEF5cXhYb0QzTVd0UVZqN2oyb3FsYWtPQk1nRzgrcTJxWWxtQnRzNEZOaQp3NzQ4SWw1ODZIS0JScXhIdFpkUktXMlZxYVE9PC9kczpYNTA5Q2VydGlmaWNhdGU+PC9kczpYNTA5RGF0YT48L2RzOktleUluZm8+PC9kczpTaWduYXR1cmU+PC9zbWQ6c2lnbmVkTWFyaz4=
+ %SMD%
diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_registration_encoded_signed_mark_allocationtoken.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_registration_encoded_signed_mark_allocationtoken.xml
index d17fcdad6..caf227758 100644
--- a/core/src/test/resources/google/registry/flows/domain/domain_create_registration_encoded_signed_mark_allocationtoken.xml
+++ b/core/src/test/resources/google/registry/flows/domain/domain_create_registration_encoded_signed_mark_allocationtoken.xml
@@ -27,7 +27,7 @@
sunrise
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHhtbG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il8zOGFjNTg2ZC05OTg5LTQ4MTctYjcwOC1kOGU4MzQ0NzZkOTUiPgogIDxzbWQ6aWQ+MDAwMDAwMTc2MTM3NjA0Mjc1OTEzNi02NTUzNTwvc21kOmlkPgogIDxzbWQ6aXNzdWVySW5mbyBpc3N1ZXJJRD0iNjU1MzUiPgogICAgPHNtZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz4KICAgIDxzbWQ6ZW1haWw+bm90YXZhaWxhYmxlQGV4YW1wbGUuY29tPC9zbWQ6ZW1haWw+CiAgICA8c21kOnVybD5odHRwOi8vd3d3LmV4YW1wbGUuY29tPC9zbWQ6dXJsPgogICAgPHNtZDp2b2ljZT4rMzIuMDAwMDAwPC9zbWQ6dm9pY2U+CiAgPC9zbWQ6aXNzdWVySW5mbz4KICA8c21kOm5vdEJlZm9yZT4yMDEzLTA4LTA5VDEwOjA1OjU5LjEzNlo8L3NtZDpub3RCZWZvcmU+CiAgPHNtZDpub3RBZnRlcj4yMDE3LTA3LTIzVDIyOjAwOjAwLjAwMFo8L3NtZDpub3RBZnRlcj4KICA8bWFyazptYXJrIHhtbG5zOm1hcms9InVybjppZXRmOnBhcmFtczp4bWw6bnM6bWFyay0xLjAiPgogICAgPG1hcms6Y291cnQ+CiAgICAgIDxtYXJrOmlkPjAwMDUyMDEzNzM0NjkxNjkxMzczNDY5MTY5LTY1NTM1PC9tYXJrOmlkPgogICAgICA8bWFyazptYXJrTmFtZT5UZXN0ICZhbXA7IFZhbGlkYXRlPC9tYXJrOm1hcmtOYW1lPgogICAgICA8bWFyazpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj4KICAgICAgICA8bWFyazpvcmc+QWcgY29ycG9yYXRpb248L21hcms6b3JnPgogICAgICAgIDxtYXJrOmFkZHI+CiAgICAgICAgICA8bWFyazpzdHJlZXQ+MTMwNSBCcmlnaHQgQXZlbnVlPC9tYXJrOnN0cmVldD4KICAgICAgICAgIDxtYXJrOmNpdHk+QXJjYWRpYTwvbWFyazpjaXR5PgogICAgICAgICAgPG1hcms6c3A+Q0E8L21hcms6c3A+CiAgICAgICAgICA8bWFyazpwYz45MDAyODwvbWFyazpwYz4KICAgICAgICAgIDxtYXJrOmNjPlVTPC9tYXJrOmNjPgogICAgICAgIDwvbWFyazphZGRyPgogICAgICA8L21hcms6aG9sZGVyPgogICAgICA8bWFyazpjb250YWN0IHR5cGU9ImFnZW50Ij4KICAgICAgICA8bWFyazpuYW1lPlRvbnkgSG9sbGFuZDwvbWFyazpuYW1lPgogICAgICAgIDxtYXJrOm9yZz5BZyBjb3Jwb3JhdGlvbjwvbWFyazpvcmc+CiAgICAgICAgPG1hcms6YWRkcj4KICAgICAgICAgIDxtYXJrOnN0cmVldD4xMzA1IEJyaWdodCBBdmVudWU8L21hcms6c3RyZWV0PgogICAgICAgICAgPG1hcms6Y2l0eT5BcmNhZGlhPC9tYXJrOmNpdHk+CiAgICAgICAgICA8bWFyazpzcD5DQTwvbWFyazpzcD4KICAgICAgICAgIDxtYXJrOnBjPjkwMDI4PC9tYXJrOnBjPgogICAgICAgICAgPG1hcms6Y2M+VVM8L21hcms6Y2M+CiAgICAgICAgPC9tYXJrOmFkZHI+CiAgICAgICAgPG1hcms6dm9pY2U+KzEuMjAyNTU2MjMwMjwvbWFyazp2b2ljZT4KICAgICAgICA8bWFyazpmYXg+KzEuMjAyNTU2MjMwMTwvbWFyazpmYXg+CiAgICAgICAgPG1hcms6ZW1haWw+aW5mb0BhZ2NvcnBvcmF0aW9uLmNvbTwvbWFyazplbWFpbD4KICAgICAgPC9tYXJrOmNvbnRhY3Q+CiAgICAgIDxtYXJrOmxhYmVsPnRlc3RhbmR2YWxpZGF0ZTwvbWFyazpsYWJlbD4KICAgICAgPG1hcms6bGFiZWw+dGVzdC0tLXZhbGlkYXRlPC9tYXJrOmxhYmVsPgogICAgICA8bWFyazpsYWJlbD50ZXN0YW5kLXZhbGlkYXRlPC9tYXJrOmxhYmVsPgogICAgICA8bWFyazpsYWJlbD50ZXN0LXZhbGlkYXRlPC9tYXJrOmxhYmVsPgogICAgICA8bWFyazpsYWJlbD50ZXN0LWFuZHZhbGlkYXRlPC9tYXJrOmxhYmVsPgogICAgICA8bWFyazpsYWJlbD50ZXN0LS12YWxpZGF0ZTwvbWFyazpsYWJlbD4KICAgICAgPG1hcms6bGFiZWw+dGVzdHZhbGlkYXRlPC9tYXJrOmxhYmVsPgogICAgICA8bWFyazpsYWJlbD50ZXN0LWFuZC12YWxpZGF0ZTwvbWFyazpsYWJlbD4KICAgICAgPG1hcms6Z29vZHNBbmRTZXJ2aWNlcz5NdXNpY2FsIGluc3RydW1lbnRzPC9tYXJrOmdvb2RzQW5kU2VydmljZXM+CiAgICAgIDxtYXJrOnJlZk51bT4xMjM0PC9tYXJrOnJlZk51bT4KICAgICAgPG1hcms6cHJvRGF0ZT4yMDEyLTEyLTMxVDIzOjAwOjAwLjAwMFo8L21hcms6cHJvRGF0ZT4KICAgICAgPG1hcms6Y2M+VVM8L21hcms6Y2M+CiAgICAgIDxtYXJrOmNvdXJ0TmFtZT5Ib3ZlPC9tYXJrOmNvdXJ0TmFtZT4KICAgIDwvbWFyazpjb3VydD4KICA8L21hcms6bWFyaz4KPGRzOlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyIgSWQ9Il9mZDBmMTM0Ni03MTM4LTRiMGMtODRkNy0yZTdlYmY2YTExNmMiPjxkczpTaWduZWRJbmZvPjxkczpDYW5vbmljYWxpemF0aW9uTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PGRzOlNpZ25hdHVyZU1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZHNpZy1tb3JlI3JzYS1zaGEyNTYiLz48ZHM6UmVmZXJlbmNlIFVSST0iI18zOGFjNTg2ZC05OTg5LTQ4MTctYjcwOC1kOGU4MzQ0NzZkOTUiPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjZW52ZWxvcGVkLXNpZ25hdHVyZSIvPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1ZT55WDRLTWgrUDJ2OVUxNnh0eTl2ZGU5S0JTZmZFTjRHbTVVa2tLblI5cDdZPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PGRzOlJlZmVyZW5jZSBVUkk9IiNfYjg5MjI1NWItMWJjOC00MTdiLWE0NGYtZWE5OGJjMzQ5OWE0Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+dDNuNkFBTHdiaUhNbGRyZkpEQjNYQ3FkSlFzOEhjeU5pK1lXT3ZoV1krdz08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNlPjwvZHM6U2lnbmVkSW5mbz48ZHM6U2lnbmF0dXJlVmFsdWUgSWQ9Il82OWQzMDRlNC04NzlmLTRmNzEtYmMxMi02ZjJhZDlmOTM5OGYiPmJSVFIzTzUxM0dnTkExS2pxb0g0VXE3cUlhN2NJaTljaXZmZmFyVmE0VVQyVEUzdzEzc2xsUDFXbkdYYjcyYUw0dXhkbDFUaTZZbFoKVnVjSC92ZU5zUnlWZFZwSFF0eEJNTDFLU0tZbXc3ZjdPNnVsYWtrYnFrTkdYVmFZdEVsa1dBZnZFSDBsNURkNkFZT0k2UGN5SzBCWgo2VEl3cWZhQ1luVk5DdTFpdDIzMm9EREtiWU9RNk02YnhmU3BvVFYvaTVVdEVyak0vZWFFanp4MXFxZzlFZmxOcm1obmRtZW42Q2JYCjVrNmZ4Y1o0V2NtWkM4V0Ruc0t0VWVjaGtmbko4L0Jwc2ppM1Foekg4YzFiL0RqTmR5UFFyOGlndXBqR2dlU0JmMHhRRUtoK3pRT2oKYTNvMEhRWjZ1UlUvejdWN2RoNU9qUEhmV2lLc0pqRjVwc2ppRlE9PTwvZHM6U2lnbmF0dXJlVmFsdWU+PGRzOktleUluZm8gSWQ9Il9iODkyMjU1Yi0xYmM4LTQxN2ItYTQ0Zi1lYTk4YmMzNDk5YTQiPjxkczpYNTA5RGF0YT48ZHM6WDUwOUNlcnRpZmljYXRlPk1JSUZMekNDQkJlZ0F3SUJBZ0lnTHJBYmV2b2FlNTJ5M2Y2QzJ0QjBTbjNwN1hKbTBUMDJGb2d4S0NmTmhYb3dEUVlKS29aSWh2Y04KQVFFTEJRQXdmREVMTUFrR0ExVUVCaE1DVlZNeFBEQTZCZ05WQkFvVE0wbHVkR1Z5Ym1WMElFTnZjbkJ2Y21GMGFXOXVJR1p2Y2lCQgpjM05wWjI1bFpDQk9ZVzFsY3lCaGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF4TW1TVU5CVGs0Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5CmFXNW5hRzkxYzJVZ1VHbHNiM1FnUTBFd0hoY05NVE13TmpJMk1EQXdNREF3V2hjTk1UZ3dOakkxTWpNMU9UVTVXakNCanpFTE1Ba0cKQTFVRUJoTUNRa1V4SURBZUJnTlZCQWdURjBKeWRYTnpaV3h6TFVOaGNHbDBZV3dnVW1WbmFXOXVNUkV3RHdZRFZRUUhFd2hDY25WegpjMlZzY3pFUk1BOEdBMVVFQ2hNSVJHVnNiMmwwZEdVeE9EQTJCZ05WQkFNVEwwbERRVTVPSUZSTlEwZ2dRWFYwYUc5eWFYcGxaQ0JVCmNtRmtaVzFoY21zZ1VHbHNiM1FnVm1Gc2FXUmhkRzl5TUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUEKeGxwM0twWUhYM1d5QXNGaFNrM0x3V2ZuR2x4blVERnFGWkEzVW91TVlqL1hpZ2JNa05lRVhJamxrUk9LVDRPUEdmUngvTEF5UmxRUQpqQ012NHFoYmtjWDFwN2FyNjNmbHE0U1pOVmNsMTVsN2gwdVQ1OEZ6U2ZubHowdTVya0hmSkltRDQzK21hUC84Z3YzNkZSMjdqVzhSCjl3WTRoaytXczRJQjBpRlNkOFNYdjFLcjh3L0ptTVFTRGtpdUcrUmZJaXVid1EvZnk3RWtqNVFXaFBadyttTXhOS25IVUx5M3hZejIKTHdWZmZ0andVdWVhY3ZxTlJDa01YbENsT0FEcWZUOG9TWm9lRFhlaEh2bFBzTENlbUdCb1RLdXJza0lTNjlGMHlQRUg1Z3plMEgrZgo4RlJPc0lvS1NzVlEzNEI0Uy9qb0U2N25wc0pQVGRLc05QSlR5UUlEQVFBQm80SUJoekNDQVlNd0RBWURWUjBUQVFIL0JBSXdBREFkCkJnTlZIUTRFRmdRVW9GcFk3NnA1eW9ORFJHdFFwelZ1UjgxVVdRMHdnY1lHQTFVZEl3U0J2akNCdTRBVXc2MCtwdFlSQUVXQVhEcFgKU29wdDNERU5ubkdoZ1lDa2ZqQjhNUXN3Q1FZRFZRUUdFd0pWVXpFOE1Eb0dBMVVFQ2hNelNXNTBaWEp1WlhRZ1EyOXljRzl5WVhScApiMjRnWm05eUlFRnpjMmxuYm1Wa0lFNWhiV1Z6SUdGdVpDQk9kVzFpWlhKek1TOHdMUVlEVlFRREV5WkpRMEZPVGlCVWNtRmtaVzFoCmNtc2dRMnhsWVhKcGJtZG9iM1Z6WlNCUWFXeHZkQ0JEUVlJZ0xyQWJldm9hZTUyeTNmNkMydEIwU24zcDdYSm0wVDAyRm9neEtDZk4KaFhrd0RnWURWUjBQQVFIL0JBUURBZ2VBTURRR0ExVWRId1F0TUNzd0thQW5vQ1dHSTJoMGRIQTZMeTlqY213dWFXTmhibTR1YjNKbgpMM1J0WTJoZmNHbHNiM1F1WTNKc01FVUdBMVVkSUFRK01Ed3dPZ1lES2dNRU1ETXdNUVlJS3dZQkJRVUhBZ0VXSldoMGRIQTZMeTkzCmQzY3VhV05oYm00dWIzSm5MM0JwYkc5MFgzSmxjRzl6YVhSdmNua3dEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBSWVEWVlKcjYwVzMKeTlRcyszelJWSTlrZWtLb201dmtIT2FsQjN3SGFaSWFBRllwSTk4dFkwYVZOOWFHT04wdjZXUUYrbnZ6MUtSWlFiQXowMUJYdGFSSgo0bVBrYXJoaHVMbjlOa0J4cDhIUjVxY2MrS0g3Z3Y2ci9jMGlHM2JDTkorUVNyN1FmKzVNbE1vNnpMNVVkZFUvVDJqaWJNWENqL2YyCjFRdzN4OVFnb3lYTEZKOW96YUxnUTlSTWtMbE9temtDQWlYTjVBYjQzYUo5ZjdOMmdFMk5uUmpOS21tQzlBQlEwVFJ3RUtWTGhWbDEKVUdxQ0hKM0FsQlhXSVhONXNqUFFjRC8rbkhlRVhNeFl2bEF5cXhYb0QzTVd0UVZqN2oyb3FsYWtPQk1nRzgrcTJxWWxtQnRzNEZOaQp3NzQ4SWw1ODZIS0JScXhIdFpkUktXMlZxYVE9PC9kczpYNTA5Q2VydGlmaWNhdGU+PC9kczpYNTA5RGF0YT48L2RzOktleUluZm8+PC9kczpTaWduYXR1cmU+PC9zbWQ6c2lnbmVkTWFyaz4=
+ %SMD%
diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_response_encoded_signed_mark_name.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_response_encoded_signed_mark_name.xml
index ee99da762..2c31ae3ff 100644
--- a/core/src/test/resources/google/registry/flows/domain/domain_create_response_encoded_signed_mark_name.xml
+++ b/core/src/test/resources/google/registry/flows/domain/domain_create_response_encoded_signed_mark_name.xml
@@ -6,8 +6,8 @@
%DOMAIN%
- 2014-09-09T09:09:09Z
- 2016-09-09T09:09:09Z
+ %CREATE_TIME%
+ %EXPIRATION_TIME%
diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_sunrise_encoded_signed_mark_no_type.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_sunrise_encoded_signed_mark_no_type.xml
index c5117c2b5..4075e2631 100644
--- a/core/src/test/resources/google/registry/flows/domain/domain_create_sunrise_encoded_signed_mark_no_type.xml
+++ b/core/src/test/resources/google/registry/flows/domain/domain_create_sunrise_encoded_signed_mark_no_type.xml
@@ -22,7 +22,7 @@
sunrise
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHhtbG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il8zOGFjNTg2ZC05OTg5LTQ4MTctYjcwOC1kOGU4MzQ0NzZkOTUiPgogIDxzbWQ6aWQ+MDAwMDAwMTc2MTM3NjA0Mjc1OTEzNi02NTUzNTwvc21kOmlkPgogIDxzbWQ6aXNzdWVySW5mbyBpc3N1ZXJJRD0iNjU1MzUiPgogICAgPHNtZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz4KICAgIDxzbWQ6ZW1haWw+bm90YXZhaWxhYmxlQGV4YW1wbGUuY29tPC9zbWQ6ZW1haWw+CiAgICA8c21kOnVybD5odHRwOi8vd3d3LmV4YW1wbGUuY29tPC9zbWQ6dXJsPgogICAgPHNtZDp2b2ljZT4rMzIuMDAwMDAwPC9zbWQ6dm9pY2U+CiAgPC9zbWQ6aXNzdWVySW5mbz4KICA8c21kOm5vdEJlZm9yZT4yMDEzLTA4LTA5VDEwOjA1OjU5LjEzNlo8L3NtZDpub3RCZWZvcmU+CiAgPHNtZDpub3RBZnRlcj4yMDE3LTA3LTIzVDIyOjAwOjAwLjAwMFo8L3NtZDpub3RBZnRlcj4KICA8bWFyazptYXJrIHhtbG5zOm1hcms9InVybjppZXRmOnBhcmFtczp4bWw6bnM6bWFyay0xLjAiPgogICAgPG1hcms6Y291cnQ+CiAgICAgIDxtYXJrOmlkPjAwMDUyMDEzNzM0NjkxNjkxMzczNDY5MTY5LTY1NTM1PC9tYXJrOmlkPgogICAgICA8bWFyazptYXJrTmFtZT5UZXN0ICZhbXA7IFZhbGlkYXRlPC9tYXJrOm1hcmtOYW1lPgogICAgICA8bWFyazpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj4KICAgICAgICA8bWFyazpvcmc+QWcgY29ycG9yYXRpb248L21hcms6b3JnPgogICAgICAgIDxtYXJrOmFkZHI+CiAgICAgICAgICA8bWFyazpzdHJlZXQ+MTMwNSBCcmlnaHQgQXZlbnVlPC9tYXJrOnN0cmVldD4KICAgICAgICAgIDxtYXJrOmNpdHk+QXJjYWRpYTwvbWFyazpjaXR5PgogICAgICAgICAgPG1hcms6c3A+Q0E8L21hcms6c3A+CiAgICAgICAgICA8bWFyazpwYz45MDAyODwvbWFyazpwYz4KICAgICAgICAgIDxtYXJrOmNjPlVTPC9tYXJrOmNjPgogICAgICAgIDwvbWFyazphZGRyPgogICAgICA8L21hcms6aG9sZGVyPgogICAgICA8bWFyazpjb250YWN0IHR5cGU9ImFnZW50Ij4KICAgICAgICA8bWFyazpuYW1lPlRvbnkgSG9sbGFuZDwvbWFyazpuYW1lPgogICAgICAgIDxtYXJrOm9yZz5BZyBjb3Jwb3JhdGlvbjwvbWFyazpvcmc+CiAgICAgICAgPG1hcms6YWRkcj4KICAgICAgICAgIDxtYXJrOnN0cmVldD4xMzA1IEJyaWdodCBBdmVudWU8L21hcms6c3RyZWV0PgogICAgICAgICAgPG1hcms6Y2l0eT5BcmNhZGlhPC9tYXJrOmNpdHk+CiAgICAgICAgICA8bWFyazpzcD5DQTwvbWFyazpzcD4KICAgICAgICAgIDxtYXJrOnBjPjkwMDI4PC9tYXJrOnBjPgogICAgICAgICAgPG1hcms6Y2M+VVM8L21hcms6Y2M+CiAgICAgICAgPC9tYXJrOmFkZHI+CiAgICAgICAgPG1hcms6dm9pY2U+KzEuMjAyNTU2MjMwMjwvbWFyazp2b2ljZT4KICAgICAgICA8bWFyazpmYXg+KzEuMjAyNTU2MjMwMTwvbWFyazpmYXg+CiAgICAgICAgPG1hcms6ZW1haWw+aW5mb0BhZ2NvcnBvcmF0aW9uLmNvbTwvbWFyazplbWFpbD4KICAgICAgPC9tYXJrOmNvbnRhY3Q+CiAgICAgIDxtYXJrOmxhYmVsPnRlc3RhbmR2YWxpZGF0ZTwvbWFyazpsYWJlbD4KICAgICAgPG1hcms6bGFiZWw+dGVzdC0tLXZhbGlkYXRlPC9tYXJrOmxhYmVsPgogICAgICA8bWFyazpsYWJlbD50ZXN0YW5kLXZhbGlkYXRlPC9tYXJrOmxhYmVsPgogICAgICA8bWFyazpsYWJlbD50ZXN0LXZhbGlkYXRlPC9tYXJrOmxhYmVsPgogICAgICA8bWFyazpsYWJlbD50ZXN0LWFuZHZhbGlkYXRlPC9tYXJrOmxhYmVsPgogICAgICA8bWFyazpsYWJlbD50ZXN0LS12YWxpZGF0ZTwvbWFyazpsYWJlbD4KICAgICAgPG1hcms6bGFiZWw+dGVzdHZhbGlkYXRlPC9tYXJrOmxhYmVsPgogICAgICA8bWFyazpsYWJlbD50ZXN0LWFuZC12YWxpZGF0ZTwvbWFyazpsYWJlbD4KICAgICAgPG1hcms6Z29vZHNBbmRTZXJ2aWNlcz5NdXNpY2FsIGluc3RydW1lbnRzPC9tYXJrOmdvb2RzQW5kU2VydmljZXM+CiAgICAgIDxtYXJrOnJlZk51bT4xMjM0PC9tYXJrOnJlZk51bT4KICAgICAgPG1hcms6cHJvRGF0ZT4yMDEyLTEyLTMxVDIzOjAwOjAwLjAwMFo8L21hcms6cHJvRGF0ZT4KICAgICAgPG1hcms6Y2M+VVM8L21hcms6Y2M+CiAgICAgIDxtYXJrOmNvdXJ0TmFtZT5Ib3ZlPC9tYXJrOmNvdXJ0TmFtZT4KICAgIDwvbWFyazpjb3VydD4KICA8L21hcms6bWFyaz4KPGRzOlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyIgSWQ9Il9mZDBmMTM0Ni03MTM4LTRiMGMtODRkNy0yZTdlYmY2YTExNmMiPjxkczpTaWduZWRJbmZvPjxkczpDYW5vbmljYWxpemF0aW9uTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PGRzOlNpZ25hdHVyZU1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZHNpZy1tb3JlI3JzYS1zaGEyNTYiLz48ZHM6UmVmZXJlbmNlIFVSST0iI18zOGFjNTg2ZC05OTg5LTQ4MTctYjcwOC1kOGU4MzQ0NzZkOTUiPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjZW52ZWxvcGVkLXNpZ25hdHVyZSIvPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1ZT55WDRLTWgrUDJ2OVUxNnh0eTl2ZGU5S0JTZmZFTjRHbTVVa2tLblI5cDdZPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PGRzOlJlZmVyZW5jZSBVUkk9IiNfYjg5MjI1NWItMWJjOC00MTdiLWE0NGYtZWE5OGJjMzQ5OWE0Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+dDNuNkFBTHdiaUhNbGRyZkpEQjNYQ3FkSlFzOEhjeU5pK1lXT3ZoV1krdz08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNlPjwvZHM6U2lnbmVkSW5mbz48ZHM6U2lnbmF0dXJlVmFsdWUgSWQ9Il82OWQzMDRlNC04NzlmLTRmNzEtYmMxMi02ZjJhZDlmOTM5OGYiPmJSVFIzTzUxM0dnTkExS2pxb0g0VXE3cUlhN2NJaTljaXZmZmFyVmE0VVQyVEUzdzEzc2xsUDFXbkdYYjcyYUw0dXhkbDFUaTZZbFoKVnVjSC92ZU5zUnlWZFZwSFF0eEJNTDFLU0tZbXc3ZjdPNnVsYWtrYnFrTkdYVmFZdEVsa1dBZnZFSDBsNURkNkFZT0k2UGN5SzBCWgo2VEl3cWZhQ1luVk5DdTFpdDIzMm9EREtiWU9RNk02YnhmU3BvVFYvaTVVdEVyak0vZWFFanp4MXFxZzlFZmxOcm1obmRtZW42Q2JYCjVrNmZ4Y1o0V2NtWkM4V0Ruc0t0VWVjaGtmbko4L0Jwc2ppM1Foekg4YzFiL0RqTmR5UFFyOGlndXBqR2dlU0JmMHhRRUtoK3pRT2oKYTNvMEhRWjZ1UlUvejdWN2RoNU9qUEhmV2lLc0pqRjVwc2ppRlE9PTwvZHM6U2lnbmF0dXJlVmFsdWU+PGRzOktleUluZm8gSWQ9Il9iODkyMjU1Yi0xYmM4LTQxN2ItYTQ0Zi1lYTk4YmMzNDk5YTQiPjxkczpYNTA5RGF0YT48ZHM6WDUwOUNlcnRpZmljYXRlPk1JSUZMekNDQkJlZ0F3SUJBZ0lnTHJBYmV2b2FlNTJ5M2Y2QzJ0QjBTbjNwN1hKbTBUMDJGb2d4S0NmTmhYb3dEUVlKS29aSWh2Y04KQVFFTEJRQXdmREVMTUFrR0ExVUVCaE1DVlZNeFBEQTZCZ05WQkFvVE0wbHVkR1Z5Ym1WMElFTnZjbkJ2Y21GMGFXOXVJR1p2Y2lCQgpjM05wWjI1bFpDQk9ZVzFsY3lCaGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF4TW1TVU5CVGs0Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5CmFXNW5hRzkxYzJVZ1VHbHNiM1FnUTBFd0hoY05NVE13TmpJMk1EQXdNREF3V2hjTk1UZ3dOakkxTWpNMU9UVTVXakNCanpFTE1Ba0cKQTFVRUJoTUNRa1V4SURBZUJnTlZCQWdURjBKeWRYTnpaV3h6TFVOaGNHbDBZV3dnVW1WbmFXOXVNUkV3RHdZRFZRUUhFd2hDY25WegpjMlZzY3pFUk1BOEdBMVVFQ2hNSVJHVnNiMmwwZEdVeE9EQTJCZ05WQkFNVEwwbERRVTVPSUZSTlEwZ2dRWFYwYUc5eWFYcGxaQ0JVCmNtRmtaVzFoY21zZ1VHbHNiM1FnVm1Gc2FXUmhkRzl5TUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUEKeGxwM0twWUhYM1d5QXNGaFNrM0x3V2ZuR2x4blVERnFGWkEzVW91TVlqL1hpZ2JNa05lRVhJamxrUk9LVDRPUEdmUngvTEF5UmxRUQpqQ012NHFoYmtjWDFwN2FyNjNmbHE0U1pOVmNsMTVsN2gwdVQ1OEZ6U2ZubHowdTVya0hmSkltRDQzK21hUC84Z3YzNkZSMjdqVzhSCjl3WTRoaytXczRJQjBpRlNkOFNYdjFLcjh3L0ptTVFTRGtpdUcrUmZJaXVid1EvZnk3RWtqNVFXaFBadyttTXhOS25IVUx5M3hZejIKTHdWZmZ0andVdWVhY3ZxTlJDa01YbENsT0FEcWZUOG9TWm9lRFhlaEh2bFBzTENlbUdCb1RLdXJza0lTNjlGMHlQRUg1Z3plMEgrZgo4RlJPc0lvS1NzVlEzNEI0Uy9qb0U2N25wc0pQVGRLc05QSlR5UUlEQVFBQm80SUJoekNDQVlNd0RBWURWUjBUQVFIL0JBSXdBREFkCkJnTlZIUTRFRmdRVW9GcFk3NnA1eW9ORFJHdFFwelZ1UjgxVVdRMHdnY1lHQTFVZEl3U0J2akNCdTRBVXc2MCtwdFlSQUVXQVhEcFgKU29wdDNERU5ubkdoZ1lDa2ZqQjhNUXN3Q1FZRFZRUUdFd0pWVXpFOE1Eb0dBMVVFQ2hNelNXNTBaWEp1WlhRZ1EyOXljRzl5WVhScApiMjRnWm05eUlFRnpjMmxuYm1Wa0lFNWhiV1Z6SUdGdVpDQk9kVzFpWlhKek1TOHdMUVlEVlFRREV5WkpRMEZPVGlCVWNtRmtaVzFoCmNtc2dRMnhsWVhKcGJtZG9iM1Z6WlNCUWFXeHZkQ0JEUVlJZ0xyQWJldm9hZTUyeTNmNkMydEIwU24zcDdYSm0wVDAyRm9neEtDZk4KaFhrd0RnWURWUjBQQVFIL0JBUURBZ2VBTURRR0ExVWRId1F0TUNzd0thQW5vQ1dHSTJoMGRIQTZMeTlqY213dWFXTmhibTR1YjNKbgpMM1J0WTJoZmNHbHNiM1F1WTNKc01FVUdBMVVkSUFRK01Ed3dPZ1lES2dNRU1ETXdNUVlJS3dZQkJRVUhBZ0VXSldoMGRIQTZMeTkzCmQzY3VhV05oYm00dWIzSm5MM0JwYkc5MFgzSmxjRzl6YVhSdmNua3dEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBSWVEWVlKcjYwVzMKeTlRcyszelJWSTlrZWtLb201dmtIT2FsQjN3SGFaSWFBRllwSTk4dFkwYVZOOWFHT04wdjZXUUYrbnZ6MUtSWlFiQXowMUJYdGFSSgo0bVBrYXJoaHVMbjlOa0J4cDhIUjVxY2MrS0g3Z3Y2ci9jMGlHM2JDTkorUVNyN1FmKzVNbE1vNnpMNVVkZFUvVDJqaWJNWENqL2YyCjFRdzN4OVFnb3lYTEZKOW96YUxnUTlSTWtMbE9temtDQWlYTjVBYjQzYUo5ZjdOMmdFMk5uUmpOS21tQzlBQlEwVFJ3RUtWTGhWbDEKVUdxQ0hKM0FsQlhXSVhONXNqUFFjRC8rbkhlRVhNeFl2bEF5cXhYb0QzTVd0UVZqN2oyb3FsYWtPQk1nRzgrcTJxWWxtQnRzNEZOaQp3NzQ4SWw1ODZIS0JScXhIdFpkUktXMlZxYVE9PC9kczpYNTA5Q2VydGlmaWNhdGU+PC9kczpYNTA5RGF0YT48L2RzOktleUluZm8+PC9kczpTaWduYXR1cmU+PC9zbWQ6c2lnbmVkTWFyaz4=
+ %SMD%
diff --git a/core/src/test/resources/google/registry/flows/domain_create_start_date_sunrise_encoded_mark_no_type.xml b/core/src/test/resources/google/registry/flows/domain_create_start_date_sunrise_encoded_mark_no_type.xml
index 12498cf0e..a2c996f2f 100644
--- a/core/src/test/resources/google/registry/flows/domain_create_start_date_sunrise_encoded_mark_no_type.xml
+++ b/core/src/test/resources/google/registry/flows/domain_create_start_date_sunrise_encoded_mark_no_type.xml
@@ -24,7 +24,7 @@
sunrise
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHhtbG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il8zOGFjNTg2ZC05OTg5LTQ4MTctYjcwOC1kOGU4MzQ0NzZkOTUiPgogIDxzbWQ6aWQ+MDAwMDAwMTc2MTM3NjA0Mjc1OTEzNi02NTUzNTwvc21kOmlkPgogIDxzbWQ6aXNzdWVySW5mbyBpc3N1ZXJJRD0iNjU1MzUiPgogICAgPHNtZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz4KICAgIDxzbWQ6ZW1haWw+bm90YXZhaWxhYmxlQGV4YW1wbGUuY29tPC9zbWQ6ZW1haWw+CiAgICA8c21kOnVybD5odHRwOi8vd3d3LmV4YW1wbGUuY29tPC9zbWQ6dXJsPgogICAgPHNtZDp2b2ljZT4rMzIuMDAwMDAwPC9zbWQ6dm9pY2U+CiAgPC9zbWQ6aXNzdWVySW5mbz4KICA8c21kOm5vdEJlZm9yZT4yMDEzLTA4LTA5VDEwOjA1OjU5LjEzNlo8L3NtZDpub3RCZWZvcmU+CiAgPHNtZDpub3RBZnRlcj4yMDE3LTA3LTIzVDIyOjAwOjAwLjAwMFo8L3NtZDpub3RBZnRlcj4KICA8bWFyazptYXJrIHhtbG5zOm1hcms9InVybjppZXRmOnBhcmFtczp4bWw6bnM6bWFyay0xLjAiPgogICAgPG1hcms6Y291cnQ+CiAgICAgIDxtYXJrOmlkPjAwMDUyMDEzNzM0NjkxNjkxMzczNDY5MTY5LTY1NTM1PC9tYXJrOmlkPgogICAgICA8bWFyazptYXJrTmFtZT5UZXN0ICZhbXA7IFZhbGlkYXRlPC9tYXJrOm1hcmtOYW1lPgogICAgICA8bWFyazpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj4KICAgICAgICA8bWFyazpvcmc+QWcgY29ycG9yYXRpb248L21hcms6b3JnPgogICAgICAgIDxtYXJrOmFkZHI+CiAgICAgICAgICA8bWFyazpzdHJlZXQ+MTMwNSBCcmlnaHQgQXZlbnVlPC9tYXJrOnN0cmVldD4KICAgICAgICAgIDxtYXJrOmNpdHk+QXJjYWRpYTwvbWFyazpjaXR5PgogICAgICAgICAgPG1hcms6c3A+Q0E8L21hcms6c3A+CiAgICAgICAgICA8bWFyazpwYz45MDAyODwvbWFyazpwYz4KICAgICAgICAgIDxtYXJrOmNjPlVTPC9tYXJrOmNjPgogICAgICAgIDwvbWFyazphZGRyPgogICAgICA8L21hcms6aG9sZGVyPgogICAgICA8bWFyazpjb250YWN0IHR5cGU9ImFnZW50Ij4KICAgICAgICA8bWFyazpuYW1lPlRvbnkgSG9sbGFuZDwvbWFyazpuYW1lPgogICAgICAgIDxtYXJrOm9yZz5BZyBjb3Jwb3JhdGlvbjwvbWFyazpvcmc+CiAgICAgICAgPG1hcms6YWRkcj4KICAgICAgICAgIDxtYXJrOnN0cmVldD4xMzA1IEJyaWdodCBBdmVudWU8L21hcms6c3RyZWV0PgogICAgICAgICAgPG1hcms6Y2l0eT5BcmNhZGlhPC9tYXJrOmNpdHk+CiAgICAgICAgICA8bWFyazpzcD5DQTwvbWFyazpzcD4KICAgICAgICAgIDxtYXJrOnBjPjkwMDI4PC9tYXJrOnBjPgogICAgICAgICAgPG1hcms6Y2M+VVM8L21hcms6Y2M+CiAgICAgICAgPC9tYXJrOmFkZHI+CiAgICAgICAgPG1hcms6dm9pY2U+KzEuMjAyNTU2MjMwMjwvbWFyazp2b2ljZT4KICAgICAgICA8bWFyazpmYXg+KzEuMjAyNTU2MjMwMTwvbWFyazpmYXg+CiAgICAgICAgPG1hcms6ZW1haWw+aW5mb0BhZ2NvcnBvcmF0aW9uLmNvbTwvbWFyazplbWFpbD4KICAgICAgPC9tYXJrOmNvbnRhY3Q+CiAgICAgIDxtYXJrOmxhYmVsPnRlc3RhbmR2YWxpZGF0ZTwvbWFyazpsYWJlbD4KICAgICAgPG1hcms6bGFiZWw+dGVzdC0tLXZhbGlkYXRlPC9tYXJrOmxhYmVsPgogICAgICA8bWFyazpsYWJlbD50ZXN0YW5kLXZhbGlkYXRlPC9tYXJrOmxhYmVsPgogICAgICA8bWFyazpsYWJlbD50ZXN0LXZhbGlkYXRlPC9tYXJrOmxhYmVsPgogICAgICA8bWFyazpsYWJlbD50ZXN0LWFuZHZhbGlkYXRlPC9tYXJrOmxhYmVsPgogICAgICA8bWFyazpsYWJlbD50ZXN0LS12YWxpZGF0ZTwvbWFyazpsYWJlbD4KICAgICAgPG1hcms6bGFiZWw+dGVzdHZhbGlkYXRlPC9tYXJrOmxhYmVsPgogICAgICA8bWFyazpsYWJlbD50ZXN0LWFuZC12YWxpZGF0ZTwvbWFyazpsYWJlbD4KICAgICAgPG1hcms6Z29vZHNBbmRTZXJ2aWNlcz5NdXNpY2FsIGluc3RydW1lbnRzPC9tYXJrOmdvb2RzQW5kU2VydmljZXM+CiAgICAgIDxtYXJrOnJlZk51bT4xMjM0PC9tYXJrOnJlZk51bT4KICAgICAgPG1hcms6cHJvRGF0ZT4yMDEyLTEyLTMxVDIzOjAwOjAwLjAwMFo8L21hcms6cHJvRGF0ZT4KICAgICAgPG1hcms6Y2M+VVM8L21hcms6Y2M+CiAgICAgIDxtYXJrOmNvdXJ0TmFtZT5Ib3ZlPC9tYXJrOmNvdXJ0TmFtZT4KICAgIDwvbWFyazpjb3VydD4KICA8L21hcms6bWFyaz4KPGRzOlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyIgSWQ9Il9mZDBmMTM0Ni03MTM4LTRiMGMtODRkNy0yZTdlYmY2YTExNmMiPjxkczpTaWduZWRJbmZvPjxkczpDYW5vbmljYWxpemF0aW9uTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PGRzOlNpZ25hdHVyZU1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZHNpZy1tb3JlI3JzYS1zaGEyNTYiLz48ZHM6UmVmZXJlbmNlIFVSST0iI18zOGFjNTg2ZC05OTg5LTQ4MTctYjcwOC1kOGU4MzQ0NzZkOTUiPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjZW52ZWxvcGVkLXNpZ25hdHVyZSIvPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1ZT55WDRLTWgrUDJ2OVUxNnh0eTl2ZGU5S0JTZmZFTjRHbTVVa2tLblI5cDdZPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PGRzOlJlZmVyZW5jZSBVUkk9IiNfYjg5MjI1NWItMWJjOC00MTdiLWE0NGYtZWE5OGJjMzQ5OWE0Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+dDNuNkFBTHdiaUhNbGRyZkpEQjNYQ3FkSlFzOEhjeU5pK1lXT3ZoV1krdz08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNlPjwvZHM6U2lnbmVkSW5mbz48ZHM6U2lnbmF0dXJlVmFsdWUgSWQ9Il82OWQzMDRlNC04NzlmLTRmNzEtYmMxMi02ZjJhZDlmOTM5OGYiPmJSVFIzTzUxM0dnTkExS2pxb0g0VXE3cUlhN2NJaTljaXZmZmFyVmE0VVQyVEUzdzEzc2xsUDFXbkdYYjcyYUw0dXhkbDFUaTZZbFoKVnVjSC92ZU5zUnlWZFZwSFF0eEJNTDFLU0tZbXc3ZjdPNnVsYWtrYnFrTkdYVmFZdEVsa1dBZnZFSDBsNURkNkFZT0k2UGN5SzBCWgo2VEl3cWZhQ1luVk5DdTFpdDIzMm9EREtiWU9RNk02YnhmU3BvVFYvaTVVdEVyak0vZWFFanp4MXFxZzlFZmxOcm1obmRtZW42Q2JYCjVrNmZ4Y1o0V2NtWkM4V0Ruc0t0VWVjaGtmbko4L0Jwc2ppM1Foekg4YzFiL0RqTmR5UFFyOGlndXBqR2dlU0JmMHhRRUtoK3pRT2oKYTNvMEhRWjZ1UlUvejdWN2RoNU9qUEhmV2lLc0pqRjVwc2ppRlE9PTwvZHM6U2lnbmF0dXJlVmFsdWU+PGRzOktleUluZm8gSWQ9Il9iODkyMjU1Yi0xYmM4LTQxN2ItYTQ0Zi1lYTk4YmMzNDk5YTQiPjxkczpYNTA5RGF0YT48ZHM6WDUwOUNlcnRpZmljYXRlPk1JSUZMekNDQkJlZ0F3SUJBZ0lnTHJBYmV2b2FlNTJ5M2Y2QzJ0QjBTbjNwN1hKbTBUMDJGb2d4S0NmTmhYb3dEUVlKS29aSWh2Y04KQVFFTEJRQXdmREVMTUFrR0ExVUVCaE1DVlZNeFBEQTZCZ05WQkFvVE0wbHVkR1Z5Ym1WMElFTnZjbkJ2Y21GMGFXOXVJR1p2Y2lCQgpjM05wWjI1bFpDQk9ZVzFsY3lCaGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF4TW1TVU5CVGs0Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5CmFXNW5hRzkxYzJVZ1VHbHNiM1FnUTBFd0hoY05NVE13TmpJMk1EQXdNREF3V2hjTk1UZ3dOakkxTWpNMU9UVTVXakNCanpFTE1Ba0cKQTFVRUJoTUNRa1V4SURBZUJnTlZCQWdURjBKeWRYTnpaV3h6TFVOaGNHbDBZV3dnVW1WbmFXOXVNUkV3RHdZRFZRUUhFd2hDY25WegpjMlZzY3pFUk1BOEdBMVVFQ2hNSVJHVnNiMmwwZEdVeE9EQTJCZ05WQkFNVEwwbERRVTVPSUZSTlEwZ2dRWFYwYUc5eWFYcGxaQ0JVCmNtRmtaVzFoY21zZ1VHbHNiM1FnVm1Gc2FXUmhkRzl5TUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUEKeGxwM0twWUhYM1d5QXNGaFNrM0x3V2ZuR2x4blVERnFGWkEzVW91TVlqL1hpZ2JNa05lRVhJamxrUk9LVDRPUEdmUngvTEF5UmxRUQpqQ012NHFoYmtjWDFwN2FyNjNmbHE0U1pOVmNsMTVsN2gwdVQ1OEZ6U2ZubHowdTVya0hmSkltRDQzK21hUC84Z3YzNkZSMjdqVzhSCjl3WTRoaytXczRJQjBpRlNkOFNYdjFLcjh3L0ptTVFTRGtpdUcrUmZJaXVid1EvZnk3RWtqNVFXaFBadyttTXhOS25IVUx5M3hZejIKTHdWZmZ0andVdWVhY3ZxTlJDa01YbENsT0FEcWZUOG9TWm9lRFhlaEh2bFBzTENlbUdCb1RLdXJza0lTNjlGMHlQRUg1Z3plMEgrZgo4RlJPc0lvS1NzVlEzNEI0Uy9qb0U2N25wc0pQVGRLc05QSlR5UUlEQVFBQm80SUJoekNDQVlNd0RBWURWUjBUQVFIL0JBSXdBREFkCkJnTlZIUTRFRmdRVW9GcFk3NnA1eW9ORFJHdFFwelZ1UjgxVVdRMHdnY1lHQTFVZEl3U0J2akNCdTRBVXc2MCtwdFlSQUVXQVhEcFgKU29wdDNERU5ubkdoZ1lDa2ZqQjhNUXN3Q1FZRFZRUUdFd0pWVXpFOE1Eb0dBMVVFQ2hNelNXNTBaWEp1WlhRZ1EyOXljRzl5WVhScApiMjRnWm05eUlFRnpjMmxuYm1Wa0lFNWhiV1Z6SUdGdVpDQk9kVzFpWlhKek1TOHdMUVlEVlFRREV5WkpRMEZPVGlCVWNtRmtaVzFoCmNtc2dRMnhsWVhKcGJtZG9iM1Z6WlNCUWFXeHZkQ0JEUVlJZ0xyQWJldm9hZTUyeTNmNkMydEIwU24zcDdYSm0wVDAyRm9neEtDZk4KaFhrd0RnWURWUjBQQVFIL0JBUURBZ2VBTURRR0ExVWRId1F0TUNzd0thQW5vQ1dHSTJoMGRIQTZMeTlqY213dWFXTmhibTR1YjNKbgpMM1J0WTJoZmNHbHNiM1F1WTNKc01FVUdBMVVkSUFRK01Ed3dPZ1lES2dNRU1ETXdNUVlJS3dZQkJRVUhBZ0VXSldoMGRIQTZMeTkzCmQzY3VhV05oYm00dWIzSm5MM0JwYkc5MFgzSmxjRzl6YVhSdmNua3dEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBSWVEWVlKcjYwVzMKeTlRcyszelJWSTlrZWtLb201dmtIT2FsQjN3SGFaSWFBRllwSTk4dFkwYVZOOWFHT04wdjZXUUYrbnZ6MUtSWlFiQXowMUJYdGFSSgo0bVBrYXJoaHVMbjlOa0J4cDhIUjVxY2MrS0g3Z3Y2ci9jMGlHM2JDTkorUVNyN1FmKzVNbE1vNnpMNVVkZFUvVDJqaWJNWENqL2YyCjFRdzN4OVFnb3lYTEZKOW96YUxnUTlSTWtMbE9temtDQWlYTjVBYjQzYUo5ZjdOMmdFMk5uUmpOS21tQzlBQlEwVFJ3RUtWTGhWbDEKVUdxQ0hKM0FsQlhXSVhONXNqUFFjRC8rbkhlRVhNeFl2bEF5cXhYb0QzTVd0UVZqN2oyb3FsYWtPQk1nRzgrcTJxWWxtQnRzNEZOaQp3NzQ4SWw1ODZIS0JScXhIdFpkUktXMlZxYVE9PC9kczpYNTA5Q2VydGlmaWNhdGU+PC9kczpYNTA5RGF0YT48L2RzOktleUluZm8+PC9kczpTaWduYXR1cmU+PC9zbWQ6c2lnbmVkTWFyaz4=
+ %SMD%
diff --git a/core/src/test/resources/google/registry/flows/domain_create_start_date_sunrise_encoded_mark_wrong_phase.xml b/core/src/test/resources/google/registry/flows/domain_create_start_date_sunrise_encoded_mark_wrong_phase.xml
index a875994ce..151a1c8ba 100644
--- a/core/src/test/resources/google/registry/flows/domain_create_start_date_sunrise_encoded_mark_wrong_phase.xml
+++ b/core/src/test/resources/google/registry/flows/domain_create_start_date_sunrise_encoded_mark_wrong_phase.xml
@@ -25,7 +25,7 @@
open
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHhtbG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il8zOGFjNTg2ZC05OTg5LTQ4MTctYjcwOC1kOGU4MzQ0NzZkOTUiPgogIDxzbWQ6aWQ+MDAwMDAwMTc2MTM3NjA0Mjc1OTEzNi02NTUzNTwvc21kOmlkPgogIDxzbWQ6aXNzdWVySW5mbyBpc3N1ZXJJRD0iNjU1MzUiPgogICAgPHNtZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz4KICAgIDxzbWQ6ZW1haWw+bm90YXZhaWxhYmxlQGV4YW1wbGUuY29tPC9zbWQ6ZW1haWw+CiAgICA8c21kOnVybD5odHRwOi8vd3d3LmV4YW1wbGUuY29tPC9zbWQ6dXJsPgogICAgPHNtZDp2b2ljZT4rMzIuMDAwMDAwPC9zbWQ6dm9pY2U+CiAgPC9zbWQ6aXNzdWVySW5mbz4KICA8c21kOm5vdEJlZm9yZT4yMDEzLTA4LTA5VDEwOjA1OjU5LjEzNlo8L3NtZDpub3RCZWZvcmU+CiAgPHNtZDpub3RBZnRlcj4yMDE3LTA3LTIzVDIyOjAwOjAwLjAwMFo8L3NtZDpub3RBZnRlcj4KICA8bWFyazptYXJrIHhtbG5zOm1hcms9InVybjppZXRmOnBhcmFtczp4bWw6bnM6bWFyay0xLjAiPgogICAgPG1hcms6Y291cnQ+CiAgICAgIDxtYXJrOmlkPjAwMDUyMDEzNzM0NjkxNjkxMzczNDY5MTY5LTY1NTM1PC9tYXJrOmlkPgogICAgICA8bWFyazptYXJrTmFtZT5UZXN0ICZhbXA7IFZhbGlkYXRlPC9tYXJrOm1hcmtOYW1lPgogICAgICA8bWFyazpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj4KICAgICAgICA8bWFyazpvcmc+QWcgY29ycG9yYXRpb248L21hcms6b3JnPgogICAgICAgIDxtYXJrOmFkZHI+CiAgICAgICAgICA8bWFyazpzdHJlZXQ+MTMwNSBCcmlnaHQgQXZlbnVlPC9tYXJrOnN0cmVldD4KICAgICAgICAgIDxtYXJrOmNpdHk+QXJjYWRpYTwvbWFyazpjaXR5PgogICAgICAgICAgPG1hcms6c3A+Q0E8L21hcms6c3A+CiAgICAgICAgICA8bWFyazpwYz45MDAyODwvbWFyazpwYz4KICAgICAgICAgIDxtYXJrOmNjPlVTPC9tYXJrOmNjPgogICAgICAgIDwvbWFyazphZGRyPgogICAgICA8L21hcms6aG9sZGVyPgogICAgICA8bWFyazpjb250YWN0IHR5cGU9ImFnZW50Ij4KICAgICAgICA8bWFyazpuYW1lPlRvbnkgSG9sbGFuZDwvbWFyazpuYW1lPgogICAgICAgIDxtYXJrOm9yZz5BZyBjb3Jwb3JhdGlvbjwvbWFyazpvcmc+CiAgICAgICAgPG1hcms6YWRkcj4KICAgICAgICAgIDxtYXJrOnN0cmVldD4xMzA1IEJyaWdodCBBdmVudWU8L21hcms6c3RyZWV0PgogICAgICAgICAgPG1hcms6Y2l0eT5BcmNhZGlhPC9tYXJrOmNpdHk+CiAgICAgICAgICA8bWFyazpzcD5DQTwvbWFyazpzcD4KICAgICAgICAgIDxtYXJrOnBjPjkwMDI4PC9tYXJrOnBjPgogICAgICAgICAgPG1hcms6Y2M+VVM8L21hcms6Y2M+CiAgICAgICAgPC9tYXJrOmFkZHI+CiAgICAgICAgPG1hcms6dm9pY2U+KzEuMjAyNTU2MjMwMjwvbWFyazp2b2ljZT4KICAgICAgICA8bWFyazpmYXg+KzEuMjAyNTU2MjMwMTwvbWFyazpmYXg+CiAgICAgICAgPG1hcms6ZW1haWw+aW5mb0BhZ2NvcnBvcmF0aW9uLmNvbTwvbWFyazplbWFpbD4KICAgICAgPC9tYXJrOmNvbnRhY3Q+CiAgICAgIDxtYXJrOmxhYmVsPnRlc3RhbmR2YWxpZGF0ZTwvbWFyazpsYWJlbD4KICAgICAgPG1hcms6bGFiZWw+dGVzdC0tLXZhbGlkYXRlPC9tYXJrOmxhYmVsPgogICAgICA8bWFyazpsYWJlbD50ZXN0YW5kLXZhbGlkYXRlPC9tYXJrOmxhYmVsPgogICAgICA8bWFyazpsYWJlbD50ZXN0LXZhbGlkYXRlPC9tYXJrOmxhYmVsPgogICAgICA8bWFyazpsYWJlbD50ZXN0LWFuZHZhbGlkYXRlPC9tYXJrOmxhYmVsPgogICAgICA8bWFyazpsYWJlbD50ZXN0LS12YWxpZGF0ZTwvbWFyazpsYWJlbD4KICAgICAgPG1hcms6bGFiZWw+dGVzdHZhbGlkYXRlPC9tYXJrOmxhYmVsPgogICAgICA8bWFyazpsYWJlbD50ZXN0LWFuZC12YWxpZGF0ZTwvbWFyazpsYWJlbD4KICAgICAgPG1hcms6Z29vZHNBbmRTZXJ2aWNlcz5NdXNpY2FsIGluc3RydW1lbnRzPC9tYXJrOmdvb2RzQW5kU2VydmljZXM+CiAgICAgIDxtYXJrOnJlZk51bT4xMjM0PC9tYXJrOnJlZk51bT4KICAgICAgPG1hcms6cHJvRGF0ZT4yMDEyLTEyLTMxVDIzOjAwOjAwLjAwMFo8L21hcms6cHJvRGF0ZT4KICAgICAgPG1hcms6Y2M+VVM8L21hcms6Y2M+CiAgICAgIDxtYXJrOmNvdXJ0TmFtZT5Ib3ZlPC9tYXJrOmNvdXJ0TmFtZT4KICAgIDwvbWFyazpjb3VydD4KICA8L21hcms6bWFyaz4KPGRzOlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyIgSWQ9Il9mZDBmMTM0Ni03MTM4LTRiMGMtODRkNy0yZTdlYmY2YTExNmMiPjxkczpTaWduZWRJbmZvPjxkczpDYW5vbmljYWxpemF0aW9uTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PGRzOlNpZ25hdHVyZU1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZHNpZy1tb3JlI3JzYS1zaGEyNTYiLz48ZHM6UmVmZXJlbmNlIFVSST0iI18zOGFjNTg2ZC05OTg5LTQ4MTctYjcwOC1kOGU4MzQ0NzZkOTUiPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjZW52ZWxvcGVkLXNpZ25hdHVyZSIvPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1ZT55WDRLTWgrUDJ2OVUxNnh0eTl2ZGU5S0JTZmZFTjRHbTVVa2tLblI5cDdZPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PGRzOlJlZmVyZW5jZSBVUkk9IiNfYjg5MjI1NWItMWJjOC00MTdiLWE0NGYtZWE5OGJjMzQ5OWE0Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+dDNuNkFBTHdiaUhNbGRyZkpEQjNYQ3FkSlFzOEhjeU5pK1lXT3ZoV1krdz08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNlPjwvZHM6U2lnbmVkSW5mbz48ZHM6U2lnbmF0dXJlVmFsdWUgSWQ9Il82OWQzMDRlNC04NzlmLTRmNzEtYmMxMi02ZjJhZDlmOTM5OGYiPmJSVFIzTzUxM0dnTkExS2pxb0g0VXE3cUlhN2NJaTljaXZmZmFyVmE0VVQyVEUzdzEzc2xsUDFXbkdYYjcyYUw0dXhkbDFUaTZZbFoKVnVjSC92ZU5zUnlWZFZwSFF0eEJNTDFLU0tZbXc3ZjdPNnVsYWtrYnFrTkdYVmFZdEVsa1dBZnZFSDBsNURkNkFZT0k2UGN5SzBCWgo2VEl3cWZhQ1luVk5DdTFpdDIzMm9EREtiWU9RNk02YnhmU3BvVFYvaTVVdEVyak0vZWFFanp4MXFxZzlFZmxOcm1obmRtZW42Q2JYCjVrNmZ4Y1o0V2NtWkM4V0Ruc0t0VWVjaGtmbko4L0Jwc2ppM1Foekg4YzFiL0RqTmR5UFFyOGlndXBqR2dlU0JmMHhRRUtoK3pRT2oKYTNvMEhRWjZ1UlUvejdWN2RoNU9qUEhmV2lLc0pqRjVwc2ppRlE9PTwvZHM6U2lnbmF0dXJlVmFsdWU+PGRzOktleUluZm8gSWQ9Il9iODkyMjU1Yi0xYmM4LTQxN2ItYTQ0Zi1lYTk4YmMzNDk5YTQiPjxkczpYNTA5RGF0YT48ZHM6WDUwOUNlcnRpZmljYXRlPk1JSUZMekNDQkJlZ0F3SUJBZ0lnTHJBYmV2b2FlNTJ5M2Y2QzJ0QjBTbjNwN1hKbTBUMDJGb2d4S0NmTmhYb3dEUVlKS29aSWh2Y04KQVFFTEJRQXdmREVMTUFrR0ExVUVCaE1DVlZNeFBEQTZCZ05WQkFvVE0wbHVkR1Z5Ym1WMElFTnZjbkJ2Y21GMGFXOXVJR1p2Y2lCQgpjM05wWjI1bFpDQk9ZVzFsY3lCaGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF4TW1TVU5CVGs0Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5CmFXNW5hRzkxYzJVZ1VHbHNiM1FnUTBFd0hoY05NVE13TmpJMk1EQXdNREF3V2hjTk1UZ3dOakkxTWpNMU9UVTVXakNCanpFTE1Ba0cKQTFVRUJoTUNRa1V4SURBZUJnTlZCQWdURjBKeWRYTnpaV3h6TFVOaGNHbDBZV3dnVW1WbmFXOXVNUkV3RHdZRFZRUUhFd2hDY25WegpjMlZzY3pFUk1BOEdBMVVFQ2hNSVJHVnNiMmwwZEdVeE9EQTJCZ05WQkFNVEwwbERRVTVPSUZSTlEwZ2dRWFYwYUc5eWFYcGxaQ0JVCmNtRmtaVzFoY21zZ1VHbHNiM1FnVm1Gc2FXUmhkRzl5TUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUEKeGxwM0twWUhYM1d5QXNGaFNrM0x3V2ZuR2x4blVERnFGWkEzVW91TVlqL1hpZ2JNa05lRVhJamxrUk9LVDRPUEdmUngvTEF5UmxRUQpqQ012NHFoYmtjWDFwN2FyNjNmbHE0U1pOVmNsMTVsN2gwdVQ1OEZ6U2ZubHowdTVya0hmSkltRDQzK21hUC84Z3YzNkZSMjdqVzhSCjl3WTRoaytXczRJQjBpRlNkOFNYdjFLcjh3L0ptTVFTRGtpdUcrUmZJaXVid1EvZnk3RWtqNVFXaFBadyttTXhOS25IVUx5M3hZejIKTHdWZmZ0andVdWVhY3ZxTlJDa01YbENsT0FEcWZUOG9TWm9lRFhlaEh2bFBzTENlbUdCb1RLdXJza0lTNjlGMHlQRUg1Z3plMEgrZgo4RlJPc0lvS1NzVlEzNEI0Uy9qb0U2N25wc0pQVGRLc05QSlR5UUlEQVFBQm80SUJoekNDQVlNd0RBWURWUjBUQVFIL0JBSXdBREFkCkJnTlZIUTRFRmdRVW9GcFk3NnA1eW9ORFJHdFFwelZ1UjgxVVdRMHdnY1lHQTFVZEl3U0J2akNCdTRBVXc2MCtwdFlSQUVXQVhEcFgKU29wdDNERU5ubkdoZ1lDa2ZqQjhNUXN3Q1FZRFZRUUdFd0pWVXpFOE1Eb0dBMVVFQ2hNelNXNTBaWEp1WlhRZ1EyOXljRzl5WVhScApiMjRnWm05eUlFRnpjMmxuYm1Wa0lFNWhiV1Z6SUdGdVpDQk9kVzFpWlhKek1TOHdMUVlEVlFRREV5WkpRMEZPVGlCVWNtRmtaVzFoCmNtc2dRMnhsWVhKcGJtZG9iM1Z6WlNCUWFXeHZkQ0JEUVlJZ0xyQWJldm9hZTUyeTNmNkMydEIwU24zcDdYSm0wVDAyRm9neEtDZk4KaFhrd0RnWURWUjBQQVFIL0JBUURBZ2VBTURRR0ExVWRId1F0TUNzd0thQW5vQ1dHSTJoMGRIQTZMeTlqY213dWFXTmhibTR1YjNKbgpMM1J0WTJoZmNHbHNiM1F1WTNKc01FVUdBMVVkSUFRK01Ed3dPZ1lES2dNRU1ETXdNUVlJS3dZQkJRVUhBZ0VXSldoMGRIQTZMeTkzCmQzY3VhV05oYm00dWIzSm5MM0JwYkc5MFgzSmxjRzl6YVhSdmNua3dEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBSWVEWVlKcjYwVzMKeTlRcyszelJWSTlrZWtLb201dmtIT2FsQjN3SGFaSWFBRllwSTk4dFkwYVZOOWFHT04wdjZXUUYrbnZ6MUtSWlFiQXowMUJYdGFSSgo0bVBrYXJoaHVMbjlOa0J4cDhIUjVxY2MrS0g3Z3Y2ci9jMGlHM2JDTkorUVNyN1FmKzVNbE1vNnpMNVVkZFUvVDJqaWJNWENqL2YyCjFRdzN4OVFnb3lYTEZKOW96YUxnUTlSTWtMbE9temtDQWlYTjVBYjQzYUo5ZjdOMmdFMk5uUmpOS21tQzlBQlEwVFJ3RUtWTGhWbDEKVUdxQ0hKM0FsQlhXSVhONXNqUFFjRC8rbkhlRVhNeFl2bEF5cXhYb0QzTVd0UVZqN2oyb3FsYWtPQk1nRzgrcTJxWWxtQnRzNEZOaQp3NzQ4SWw1ODZIS0JScXhIdFpkUktXMlZxYVE9PC9kczpYNTA5Q2VydGlmaWNhdGU+PC9kczpYNTA5RGF0YT48L2RzOktleUluZm8+PC9kczpTaWduYXR1cmU+PC9zbWQ6c2lnbmVkTWFyaz4=
+ %SMD%
diff --git a/core/src/test/resources/google/registry/flows/domain_create_sunrise_encoded_mark.xml b/core/src/test/resources/google/registry/flows/domain_create_sunrise_encoded_mark.xml
index 42346ad72..43161f5be 100644
--- a/core/src/test/resources/google/registry/flows/domain_create_sunrise_encoded_mark.xml
+++ b/core/src/test/resources/google/registry/flows/domain_create_sunrise_encoded_mark.xml
@@ -25,7 +25,7 @@
sunrise
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHhtbG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il8zOGFjNTg2ZC05OTg5LTQ4MTctYjcwOC1kOGU4MzQ0NzZkOTUiPgogIDxzbWQ6aWQ+MDAwMDAwMTc2MTM3NjA0Mjc1OTEzNi02NTUzNTwvc21kOmlkPgogIDxzbWQ6aXNzdWVySW5mbyBpc3N1ZXJJRD0iNjU1MzUiPgogICAgPHNtZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz4KICAgIDxzbWQ6ZW1haWw+bm90YXZhaWxhYmxlQGV4YW1wbGUuY29tPC9zbWQ6ZW1haWw+CiAgICA8c21kOnVybD5odHRwOi8vd3d3LmV4YW1wbGUuY29tPC9zbWQ6dXJsPgogICAgPHNtZDp2b2ljZT4rMzIuMDAwMDAwPC9zbWQ6dm9pY2U+CiAgPC9zbWQ6aXNzdWVySW5mbz4KICA8c21kOm5vdEJlZm9yZT4yMDEzLTA4LTA5VDEwOjA1OjU5LjEzNlo8L3NtZDpub3RCZWZvcmU+CiAgPHNtZDpub3RBZnRlcj4yMDE3LTA3LTIzVDIyOjAwOjAwLjAwMFo8L3NtZDpub3RBZnRlcj4KICA8bWFyazptYXJrIHhtbG5zOm1hcms9InVybjppZXRmOnBhcmFtczp4bWw6bnM6bWFyay0xLjAiPgogICAgPG1hcms6Y291cnQ+CiAgICAgIDxtYXJrOmlkPjAwMDUyMDEzNzM0NjkxNjkxMzczNDY5MTY5LTY1NTM1PC9tYXJrOmlkPgogICAgICA8bWFyazptYXJrTmFtZT5UZXN0ICZhbXA7IFZhbGlkYXRlPC9tYXJrOm1hcmtOYW1lPgogICAgICA8bWFyazpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj4KICAgICAgICA8bWFyazpvcmc+QWcgY29ycG9yYXRpb248L21hcms6b3JnPgogICAgICAgIDxtYXJrOmFkZHI+CiAgICAgICAgICA8bWFyazpzdHJlZXQ+MTMwNSBCcmlnaHQgQXZlbnVlPC9tYXJrOnN0cmVldD4KICAgICAgICAgIDxtYXJrOmNpdHk+QXJjYWRpYTwvbWFyazpjaXR5PgogICAgICAgICAgPG1hcms6c3A+Q0E8L21hcms6c3A+CiAgICAgICAgICA8bWFyazpwYz45MDAyODwvbWFyazpwYz4KICAgICAgICAgIDxtYXJrOmNjPlVTPC9tYXJrOmNjPgogICAgICAgIDwvbWFyazphZGRyPgogICAgICA8L21hcms6aG9sZGVyPgogICAgICA8bWFyazpjb250YWN0IHR5cGU9ImFnZW50Ij4KICAgICAgICA8bWFyazpuYW1lPlRvbnkgSG9sbGFuZDwvbWFyazpuYW1lPgogICAgICAgIDxtYXJrOm9yZz5BZyBjb3Jwb3JhdGlvbjwvbWFyazpvcmc+CiAgICAgICAgPG1hcms6YWRkcj4KICAgICAgICAgIDxtYXJrOnN0cmVldD4xMzA1IEJyaWdodCBBdmVudWU8L21hcms6c3RyZWV0PgogICAgICAgICAgPG1hcms6Y2l0eT5BcmNhZGlhPC9tYXJrOmNpdHk+CiAgICAgICAgICA8bWFyazpzcD5DQTwvbWFyazpzcD4KICAgICAgICAgIDxtYXJrOnBjPjkwMDI4PC9tYXJrOnBjPgogICAgICAgICAgPG1hcms6Y2M+VVM8L21hcms6Y2M+CiAgICAgICAgPC9tYXJrOmFkZHI+CiAgICAgICAgPG1hcms6dm9pY2U+KzEuMjAyNTU2MjMwMjwvbWFyazp2b2ljZT4KICAgICAgICA8bWFyazpmYXg+KzEuMjAyNTU2MjMwMTwvbWFyazpmYXg+CiAgICAgICAgPG1hcms6ZW1haWw+aW5mb0BhZ2NvcnBvcmF0aW9uLmNvbTwvbWFyazplbWFpbD4KICAgICAgPC9tYXJrOmNvbnRhY3Q+CiAgICAgIDxtYXJrOmxhYmVsPnRlc3RhbmR2YWxpZGF0ZTwvbWFyazpsYWJlbD4KICAgICAgPG1hcms6bGFiZWw+dGVzdC0tLXZhbGlkYXRlPC9tYXJrOmxhYmVsPgogICAgICA8bWFyazpsYWJlbD50ZXN0YW5kLXZhbGlkYXRlPC9tYXJrOmxhYmVsPgogICAgICA8bWFyazpsYWJlbD50ZXN0LXZhbGlkYXRlPC9tYXJrOmxhYmVsPgogICAgICA8bWFyazpsYWJlbD50ZXN0LWFuZHZhbGlkYXRlPC9tYXJrOmxhYmVsPgogICAgICA8bWFyazpsYWJlbD50ZXN0LS12YWxpZGF0ZTwvbWFyazpsYWJlbD4KICAgICAgPG1hcms6bGFiZWw+dGVzdHZhbGlkYXRlPC9tYXJrOmxhYmVsPgogICAgICA8bWFyazpsYWJlbD50ZXN0LWFuZC12YWxpZGF0ZTwvbWFyazpsYWJlbD4KICAgICAgPG1hcms6Z29vZHNBbmRTZXJ2aWNlcz5NdXNpY2FsIGluc3RydW1lbnRzPC9tYXJrOmdvb2RzQW5kU2VydmljZXM+CiAgICAgIDxtYXJrOnJlZk51bT4xMjM0PC9tYXJrOnJlZk51bT4KICAgICAgPG1hcms6cHJvRGF0ZT4yMDEyLTEyLTMxVDIzOjAwOjAwLjAwMFo8L21hcms6cHJvRGF0ZT4KICAgICAgPG1hcms6Y2M+VVM8L21hcms6Y2M+CiAgICAgIDxtYXJrOmNvdXJ0TmFtZT5Ib3ZlPC9tYXJrOmNvdXJ0TmFtZT4KICAgIDwvbWFyazpjb3VydD4KICA8L21hcms6bWFyaz4KPGRzOlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyIgSWQ9Il9mZDBmMTM0Ni03MTM4LTRiMGMtODRkNy0yZTdlYmY2YTExNmMiPjxkczpTaWduZWRJbmZvPjxkczpDYW5vbmljYWxpemF0aW9uTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PGRzOlNpZ25hdHVyZU1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZHNpZy1tb3JlI3JzYS1zaGEyNTYiLz48ZHM6UmVmZXJlbmNlIFVSST0iI18zOGFjNTg2ZC05OTg5LTQ4MTctYjcwOC1kOGU4MzQ0NzZkOTUiPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjZW52ZWxvcGVkLXNpZ25hdHVyZSIvPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1ZT55WDRLTWgrUDJ2OVUxNnh0eTl2ZGU5S0JTZmZFTjRHbTVVa2tLblI5cDdZPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PGRzOlJlZmVyZW5jZSBVUkk9IiNfYjg5MjI1NWItMWJjOC00MTdiLWE0NGYtZWE5OGJjMzQ5OWE0Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+dDNuNkFBTHdiaUhNbGRyZkpEQjNYQ3FkSlFzOEhjeU5pK1lXT3ZoV1krdz08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNlPjwvZHM6U2lnbmVkSW5mbz48ZHM6U2lnbmF0dXJlVmFsdWUgSWQ9Il82OWQzMDRlNC04NzlmLTRmNzEtYmMxMi02ZjJhZDlmOTM5OGYiPmJSVFIzTzUxM0dnTkExS2pxb0g0VXE3cUlhN2NJaTljaXZmZmFyVmE0VVQyVEUzdzEzc2xsUDFXbkdYYjcyYUw0dXhkbDFUaTZZbFoKVnVjSC92ZU5zUnlWZFZwSFF0eEJNTDFLU0tZbXc3ZjdPNnVsYWtrYnFrTkdYVmFZdEVsa1dBZnZFSDBsNURkNkFZT0k2UGN5SzBCWgo2VEl3cWZhQ1luVk5DdTFpdDIzMm9EREtiWU9RNk02YnhmU3BvVFYvaTVVdEVyak0vZWFFanp4MXFxZzlFZmxOcm1obmRtZW42Q2JYCjVrNmZ4Y1o0V2NtWkM4V0Ruc0t0VWVjaGtmbko4L0Jwc2ppM1Foekg4YzFiL0RqTmR5UFFyOGlndXBqR2dlU0JmMHhRRUtoK3pRT2oKYTNvMEhRWjZ1UlUvejdWN2RoNU9qUEhmV2lLc0pqRjVwc2ppRlE9PTwvZHM6U2lnbmF0dXJlVmFsdWU+PGRzOktleUluZm8gSWQ9Il9iODkyMjU1Yi0xYmM4LTQxN2ItYTQ0Zi1lYTk4YmMzNDk5YTQiPjxkczpYNTA5RGF0YT48ZHM6WDUwOUNlcnRpZmljYXRlPk1JSUZMekNDQkJlZ0F3SUJBZ0lnTHJBYmV2b2FlNTJ5M2Y2QzJ0QjBTbjNwN1hKbTBUMDJGb2d4S0NmTmhYb3dEUVlKS29aSWh2Y04KQVFFTEJRQXdmREVMTUFrR0ExVUVCaE1DVlZNeFBEQTZCZ05WQkFvVE0wbHVkR1Z5Ym1WMElFTnZjbkJ2Y21GMGFXOXVJR1p2Y2lCQgpjM05wWjI1bFpDQk9ZVzFsY3lCaGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF4TW1TVU5CVGs0Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5CmFXNW5hRzkxYzJVZ1VHbHNiM1FnUTBFd0hoY05NVE13TmpJMk1EQXdNREF3V2hjTk1UZ3dOakkxTWpNMU9UVTVXakNCanpFTE1Ba0cKQTFVRUJoTUNRa1V4SURBZUJnTlZCQWdURjBKeWRYTnpaV3h6TFVOaGNHbDBZV3dnVW1WbmFXOXVNUkV3RHdZRFZRUUhFd2hDY25WegpjMlZzY3pFUk1BOEdBMVVFQ2hNSVJHVnNiMmwwZEdVeE9EQTJCZ05WQkFNVEwwbERRVTVPSUZSTlEwZ2dRWFYwYUc5eWFYcGxaQ0JVCmNtRmtaVzFoY21zZ1VHbHNiM1FnVm1Gc2FXUmhkRzl5TUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUEKeGxwM0twWUhYM1d5QXNGaFNrM0x3V2ZuR2x4blVERnFGWkEzVW91TVlqL1hpZ2JNa05lRVhJamxrUk9LVDRPUEdmUngvTEF5UmxRUQpqQ012NHFoYmtjWDFwN2FyNjNmbHE0U1pOVmNsMTVsN2gwdVQ1OEZ6U2ZubHowdTVya0hmSkltRDQzK21hUC84Z3YzNkZSMjdqVzhSCjl3WTRoaytXczRJQjBpRlNkOFNYdjFLcjh3L0ptTVFTRGtpdUcrUmZJaXVid1EvZnk3RWtqNVFXaFBadyttTXhOS25IVUx5M3hZejIKTHdWZmZ0andVdWVhY3ZxTlJDa01YbENsT0FEcWZUOG9TWm9lRFhlaEh2bFBzTENlbUdCb1RLdXJza0lTNjlGMHlQRUg1Z3plMEgrZgo4RlJPc0lvS1NzVlEzNEI0Uy9qb0U2N25wc0pQVGRLc05QSlR5UUlEQVFBQm80SUJoekNDQVlNd0RBWURWUjBUQVFIL0JBSXdBREFkCkJnTlZIUTRFRmdRVW9GcFk3NnA1eW9ORFJHdFFwelZ1UjgxVVdRMHdnY1lHQTFVZEl3U0J2akNCdTRBVXc2MCtwdFlSQUVXQVhEcFgKU29wdDNERU5ubkdoZ1lDa2ZqQjhNUXN3Q1FZRFZRUUdFd0pWVXpFOE1Eb0dBMVVFQ2hNelNXNTBaWEp1WlhRZ1EyOXljRzl5WVhScApiMjRnWm05eUlFRnpjMmxuYm1Wa0lFNWhiV1Z6SUdGdVpDQk9kVzFpWlhKek1TOHdMUVlEVlFRREV5WkpRMEZPVGlCVWNtRmtaVzFoCmNtc2dRMnhsWVhKcGJtZG9iM1Z6WlNCUWFXeHZkQ0JEUVlJZ0xyQWJldm9hZTUyeTNmNkMydEIwU24zcDdYSm0wVDAyRm9neEtDZk4KaFhrd0RnWURWUjBQQVFIL0JBUURBZ2VBTURRR0ExVWRId1F0TUNzd0thQW5vQ1dHSTJoMGRIQTZMeTlqY213dWFXTmhibTR1YjNKbgpMM1J0WTJoZmNHbHNiM1F1WTNKc01FVUdBMVVkSUFRK01Ed3dPZ1lES2dNRU1ETXdNUVlJS3dZQkJRVUhBZ0VXSldoMGRIQTZMeTkzCmQzY3VhV05oYm00dWIzSm5MM0JwYkc5MFgzSmxjRzl6YVhSdmNua3dEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBSWVEWVlKcjYwVzMKeTlRcyszelJWSTlrZWtLb201dmtIT2FsQjN3SGFaSWFBRllwSTk4dFkwYVZOOWFHT04wdjZXUUYrbnZ6MUtSWlFiQXowMUJYdGFSSgo0bVBrYXJoaHVMbjlOa0J4cDhIUjVxY2MrS0g3Z3Y2ci9jMGlHM2JDTkorUVNyN1FmKzVNbE1vNnpMNVVkZFUvVDJqaWJNWENqL2YyCjFRdzN4OVFnb3lYTEZKOW96YUxnUTlSTWtMbE9temtDQWlYTjVBYjQzYUo5ZjdOMmdFMk5uUmpOS21tQzlBQlEwVFJ3RUtWTGhWbDEKVUdxQ0hKM0FsQlhXSVhONXNqUFFjRC8rbkhlRVhNeFl2bEF5cXhYb0QzTVd0UVZqN2oyb3FsYWtPQk1nRzgrcTJxWWxtQnRzNEZOaQp3NzQ4SWw1ODZIS0JScXhIdFpkUktXMlZxYVE9PC9kczpYNTA5Q2VydGlmaWNhdGU+PC9kczpYNTA5RGF0YT48L2RzOktleUluZm8+PC9kczpTaWduYXR1cmU+PC9zbWQ6c2lnbmVkTWFyaz4=
+ %SMD%
diff --git a/core/src/test/resources/google/registry/tmch/active/Court-Agent-Arab-Active.smd b/core/src/test/resources/google/registry/tmch/active/Court-Agent-Arab-Active.smd
deleted file mode 100644
index 91189f611..000000000
--- a/core/src/test/resources/google/registry/tmch/active/Court-Agent-Arab-Active.smd
+++ /dev/null
@@ -1,99 +0,0 @@
-Marks: الاختبار & لتقييم
-smdID: 000000761526320373066-65535
-U-labels: xn------nzeaagpf7azb2ppajr3fa, xn-----btdaafne4a7azpoaiq8ea, xn----ymcaaeld1a4a6onahp3ea, xn--mgbaadjcy1a8mmago8da
-notBefore: 2018-05-14T17:52:53.066Z
-notAfter: 2022-08-18T14:27:18.209Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il82MzZi
-ZDEyYy02YzExLTRhOGYtYTVkZC01YmU0NzFhZGNiNWQiPjxzbWQ6aWQ+MDAwMDAwNzYxNTI2MzIw
-MzczMDY2LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo1Mjo1My4wNjZaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0xOFQxNDoyNzoxOC4yMDlaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazpj
-b3VydD48bWFyazppZD4wMDAxNDQxNTAzMDY2MDIyMTUwMzA2NjAyMi0xPC9tYXJrOmlkPjxtYXJr
-Om1hcmtOYW1lPtin2YTYp9iu2KrYqNin2LEgJmFtcDsg2YTYqtmC2YrZitmFPC9tYXJrOm1hcmtO
-YW1lPjxtYXJrOmhvbGRlciBlbnRpdGxlbWVudD0ib3duZXIiPjxtYXJrOm9yZz7ZiNmD2KfZhNip
-PC9tYXJrOm9yZz48bWFyazphZGRyPjxtYXJrOnN0cmVldD7YrNi52YHYsSDYp9io2YYg2LPZitmG
-2KfYoSA3NTwvbWFyazpzdHJlZXQ+PG1hcms6Y2l0eT7ZhdmD2YbYp9izPC9tYXJrOmNpdHk+PG1h
-cms6cGM+MjkwMDwvbWFyazpwYz48bWFyazpjYz5NQTwvbWFyazpjYz48L21hcms6YWRkcj48L21h
-cms6aG9sZGVyPjxtYXJrOmNvbnRhY3QgdHlwZT0iYWdlbnQiPjxtYXJrOm5hbWU+2YXZh9mG2K/Y
-syDYp9mE2YXYudmE2YjZhdin2KrZitipPC9tYXJrOm5hbWU+PG1hcms6b3JnPtmI2YPYp9mE2Kk8
-L21hcms6b3JnPjxtYXJrOmFkZHI+PG1hcms6c3RyZWV0Pti02KfYsdi5INis2LnZgdixINin2KjZ
-hiDYs9mK2YbYp9ihIDc1PC9tYXJrOnN0cmVldD48bWFyazpjaXR5PtmF2YPZhtin2LM8L21hcms6
-Y2l0eT48bWFyazpwYz4yOTAwPC9tYXJrOnBjPjxtYXJrOmNjPk1BPC9tYXJrOmNjPjwvbWFyazph
-ZGRyPjxtYXJrOnZvaWNlPisyMTIuNTIyNTM5MDQwPC9tYXJrOnZvaWNlPjxtYXJrOmZheD4rMjEy
-LjUyMjUzOTA0MTwvbWFyazpmYXg+PG1hcms6ZW1haWw+aW5mb0BhZ2VuY3ktbWFyb2Njby5jb208
-L21hcms6ZW1haWw+PC9tYXJrOmNvbnRhY3Q+PG1hcms6bGFiZWw+eG4tLS0tLS1uemVhYWdwZjdh
-emIycHBhanIzZmE8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLS0tLWJ0ZGFhZm5lNGE3YXpw
-b2FpcThlYTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tLS15bWNhYWVsZDFhNGE2b25haHAz
-ZWE8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLW1nYmFhZGpjeTFhOG1tYWdvOGRhPC9tYXJr
-OmxhYmVsPjxtYXJrOmdvb2RzQW5kU2VydmljZXM+2LrZitiq2KfYscKnPC9tYXJrOmdvb2RzQW5k
-U2VydmljZXM+PG1hcms6cmVmTnVtPjEyMzQ8L21hcms6cmVmTnVtPjxtYXJrOnByb0RhdGU+MjAx
-NC0wOS0wOFQwMDowMDowMC4wMDBaPC9tYXJrOnByb0RhdGU+PG1hcms6Y2M+VVM8L21hcms6Y2M+
-PG1hcms6Y291cnROYW1lPtin2YTYr9in2LEg2KfZhNio2YrYttin2KE8L21hcms6Y291cnROYW1l
-PjwvbWFyazpjb3VydD48L21hcms6bWFyaz48ZHM6U2lnbmF0dXJlIHhtbG5zOmRzPSJodHRwOi8v
-d3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjIiBJZD0iX2Y5YjhmY2I1LWIyNWMtNDEzOS1hZGE1
-LTRjOGVhNjEwY2NkOSI+PGRzOlNpZ25lZEluZm8+PGRzOkNhbm9uaWNhbGl6YXRpb25NZXRob2Qg
-QWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48ZHM6
-U2lnbmF0dXJlTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxk
-c2lnLW1vcmUjcnNhLXNoYTI1NiIvPjxkczpSZWZlcmVuY2UgVVJJPSIjXzYzNmJkMTJjLTZjMTEt
-NGE4Zi1hNWRkLTViZTQ3MWFkY2I1ZCI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdv
-cml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1sZHNpZyNlbnZlbG9wZWQtc2lnbmF0
-dXJlIi8+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAv
-eG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRo
-bT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxlbmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZh
-bHVlPnNzQldOUE1COFBFbVlPbGMzVlpNaFVlL1BZa2tmWm1tcCt1TXdWZGN4M3M9PC9kczpEaWdl
-c3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48ZHM6UmVmZXJlbmNlIFVSST0iI184OWIzYzk0YS0wMmE0
-LTRhNTMtOWI5Yi03MjFiN2NkMjMzNTUiPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxn
-b3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRy
-YW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIw
-MDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1ZT5YcXNTbW1BZUZBTnJxaGtwTFlG
-OE55UFZWUHFtcktYTmhmamFlUVVhRG9NPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+
-PC9kczpTaWduZWRJbmZvPjxkczpTaWduYXR1cmVWYWx1ZSBJZD0iXzQ3ZjgxY2I0LWNkMjktNDJj
-Mi1iZTdjLTFhNzI0ZTVhY2I4NSI+dm5pVCtid2xTTDJBTVh1TFNrV0kzVFExdDEwR1p1TFJRL1Vr
-bjZZNG9SUWRjc0RiTUlmcUFvRUdiT2FjbStvM2lEU1V4RTlwVGdzNwpjUDJaR1FsNk9zbmF3YzR0
-dEZVdmZVVEx1TGhPR2U5d0cvdXFJR1h5Q3RrZUNWcTJUZitjOGRzZlU2OGFHSkdqVHptZEJVUVR2
-ZWp6CkNFK2VzRjNFNTFUQ3RkUGxhek15Mm5uQ3Z1bWJzTHU1WnFRWlF2Q20xb25LMGRxMnF6a3k0
-UWFYSDA0WFpiU2FHcFVaUmp1dDkrTHQKUW9KZm5VeFNOa1MrRC9aWVl5b3lpb2RoWVdPQ1Z1Mk1a
-MUQvOGlHQUFWRGdmS1RwbXN6RXZsb1F1N2wxeUtIaU1SU2h1ZFY2RGRUKwpRRzBrdTRDbEhUWFdO
-RFBMQ0J0TUJELzhUakdldFJncGtFaXNQdz09PC9kczpTaWduYXR1cmVWYWx1ZT48ZHM6S2V5SW5m
-byBJZD0iXzg5YjNjOTRhLTAyYTQtNGE1My05YjliLTcyMWI3Y2QyMzM1NSI+PGRzOlg1MDlEYXRh
-PjxkczpYNTA5Q2VydGlmaWNhdGU+TUlJRk96Q0NCQ09nQXdJQkFnSWdMckFiZXZvYWU1MnkzZjZD
-MnRCMFNuM3A3WEptMFQwMkZvZ3hLQ2ZOaFpjd0RRWUpLb1pJaHZjTgpBUUVMQlFBd2ZERUxNQWtH
-QTFVRUJoTUNWVk14UERBNkJnTlZCQW9UTTBsdWRHVnlibVYwSUVOdmNuQnZjbUYwYVc5dUlHWnZj
-aUJCCmMzTnBaMjVsWkNCT1lXMWxjeUJoYm1RZ1RuVnRZbVZ5Y3pFdk1DMEdBMVVFQXhNbVNVTkJU
-azRnVkhKaFpHVnRZWEpySUVOc1pXRnkKYVc1bmFHOTFjMlVnVUdsc2IzUWdRMEV3SGhjTk1UZ3dN
-akk0TURBd01EQXdXaGNOTWpNd016QXhNak0xT1RVNVdqQ0JqekVMTUFrRwpBMVVFQmhNQ1FrVXhJ
-REFlQmdOVkJBZ1RGMEp5ZFhOelpXeHpMVU5oY0dsMFlXd2dVbVZuYVc5dU1SRXdEd1lEVlFRSEV3
-aENjblZ6CmMyVnNjekVSTUE4R0ExVUVDaE1JUkdWc2IybDBkR1V4T0RBMkJnTlZCQU1UTDBsRFFV
-NU9JRlJOUTBnZ1FYVjBhRzl5YVhwbFpDQlUKY21Ga1pXMWhjbXNnVUdsc2IzUWdWbUZzYVdSaGRH
-OXlNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQQp4bHAzS3BZSFgz
-V3lBc0ZoU2szTHdXZm5HbHhuVURGcUZaQTNVb3VNWWovWGlnYk1rTmVFWElqbGtST0tUNE9QR2ZS
-eC9MQXlSbFFRCmpDTXY0cWhia2NYMXA3YXI2M2ZscTRTWk5WY2wxNWw3aDB1VDU4RnpTZm5sejB1
-NXJrSGZKSW1ENDMrbWFQLzhndjM2RlIyN2pXOFIKOXdZNGhrK1dzNElCMGlGU2Q4U1h2MUtyOHcv
-Sm1NUVNEa2l1RytSZklpdWJ3US9meTdFa2o1UVdoUFp3K21NeE5LbkhVTHkzeFl6MgpMd1ZmZnRq
-d1V1ZWFjdnFOUkNrTVhsQ2xPQURxZlQ4b1Nab2VEWGVoSHZsUHNMQ2VtR0JvVEt1cnNrSVM2OUYw
-eVBFSDVnemUwSCtmCjhGUk9zSW9LU3NWUTM0QjRTL2pvRTY3bnBzSlBUZEtzTlBKVHlRSURBUUFC
-bzRJQmt6Q0NBWTh3REFZRFZSMFRBUUgvQkFJd0FEQWQKQmdOVkhRNEVGZ1FVb0ZwWTc2cDV5b05E
-Ukd0UXB6VnVSODFVV1Ewd2djWUdBMVVkSXdTQnZqQ0J1NEFVdzYwK3B0WVJBRVdBWERwWApTb3B0
-M0RFTm5uR2hnWUNrZmpCOE1Rc3dDUVlEVlFRR0V3SlZVekU4TURvR0ExVUVDaE16U1c1MFpYSnVa
-WFFnUTI5eWNHOXlZWFJwCmIyNGdabTl5SUVGemMybG5ibVZrSUU1aGJXVnpJR0Z1WkNCT2RXMWla
-WEp6TVM4d0xRWURWUVFERXlaSlEwRk9UaUJVY21Ga1pXMWgKY21zZ1EyeGxZWEpwYm1kb2IzVnpa
-U0JRYVd4dmRDQkRRWUlnTHJBYmV2b2FlNTJ5M2Y2QzJ0QjBTbjNwN1hKbTBUMDJGb2d4S0NmTgpo
-WGt3RGdZRFZSMFBBUUgvQkFRREFnZUFNRFFHQTFVZEh3UXRNQ3N3S2FBbm9DV0dJMmgwZEhBNkx5
-OWpjbXd1YVdOaGJtNHViM0puCkwzUnRZMmhmY0dsc2IzUXVZM0pzTUZFR0ExVWRJQVJLTUVnd0VB
-WU9Ld1lCQkFHQ3lSc0JCWU03REFvd05BWUlLd1lCQlFVSEFnRXcKS0RBbUJnZ3JCZ0VGQlFjQ0FS
-WWFhSFIwY0hNNkx5OWpZUzVwWTJGdWJpNXZjbWN2Y0dsc2IzUXdEUVlKS29aSWh2Y05BUUVMQlFB
-RApnZ0VCQUF1aloySWNSMkRWcnRhUnJBNTllTllDbDR4Y3NKTXU4RFFDSHYyOGZUZmkvQmlaWTRJ
-cjdGOWtGeTk2RDdPWjhvTFk1empmCjRkSHhGd0hQcUg4RGg2Sldzelh1SFcxWmEzWG1sMFBhSHhD
-V1JTMFhvbDhXc0hIcE55Z2pNQllmSjBvZFZNODg1VFoxRWw5U2l1RUgKbnluRkJnU21pRmM5OXVR
-ZC9ZRFJadUd2L0EwSHl2N3lSOXRrTEVkRDNBMXVOSkJXNFArSEpHcGRLa1lMMVE1clU3K29IVlB0
-TUtLSQozaUZrVUVzYk80NUFWZDd2UC9qLzdKdEFaUGI2a29PVjVsWmkySDFSTGNjR3d6ZGV6bmhK
-Z2QwTjlvYmIwdm5FNDEvVVNXYWZkV1JaClZHa3dQdXFUaGw3c0N0enJKSDhYWTB4Y3VtK2NmTHgy
-RUFJd1VuT2NhYjQ9PC9kczpYNTA5Q2VydGlmaWNhdGU+PC9kczpYNTA5RGF0YT48L2RzOktleUlu
-Zm8+PC9kczpTaWduYXR1cmU+PC9zbWQ6c2lnbmVkTWFyaz4=
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/active/Court-Agent-Chinese-Active.smd b/core/src/test/resources/google/registry/tmch/active/Court-Agent-Chinese-Active.smd
deleted file mode 100644
index fa5412815..000000000
--- a/core/src/test/resources/google/registry/tmch/active/Court-Agent-Chinese-Active.smd
+++ /dev/null
@@ -1,97 +0,0 @@
-Marks: 标记&记录
-smdID: 000000791526320378900-65535
-U-labels: xn----kw3bu0xlr2bba, xn--and-vj3ft79a885cda, xn--w2t96qr64aa
-notBefore: 2018-05-14T17:52:58.900Z
-notAfter: 2022-08-18T14:36:50.931Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il8yOTg3
-MmViNi0xY2JiLTQzYjMtYmIzMy1kZjA2MzhmZmQ0MjciPjxzbWQ6aWQ+MDAwMDAwNzkxNTI2MzIw
-Mzc4OTAwLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo1Mjo1OC45MDBaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0xOFQxNDozNjo1MC45MzFaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazpj
-b3VydD48bWFyazppZD4wMDAxNDYxNTAzMDY2NjMxMTUwMzA2NjYzMS0xPC9tYXJrOmlkPjxtYXJr
-Om1hcmtOYW1lPuagh+iusCZhbXA76K6w5b2VPC9tYXJrOm1hcmtOYW1lPjxtYXJrOmhvbGRlciBl
-bnRpdGxlbWVudD0ib3duZXIiPjxtYXJrOm9yZz7lt6XnqIvlpIQ8L21hcms6b3JnPjxtYXJrOmFk
-ZHI+PG1hcms6c3RyZWV0Pummmea4r+S4nOi3rzblj7fvvIw15Y+35qW877yMOOWPt+WupDwvbWFy
-azpzdHJlZXQ+PG1hcms6Y2l0eT7pnZLlspvluII8L21hcms6Y2l0eT48bWFyazpwYz4zNTAwPC9t
-YXJrOnBjPjxtYXJrOmNjPkNOPC9tYXJrOmNjPjwvbWFyazphZGRyPjwvbWFyazpob2xkZXI+PG1h
-cms6Y29udGFjdCB0eXBlPSJhZ2VudCI+PG1hcms6bmFtZT7mnY7lsI/mlrk8L21hcms6bmFtZT48
-bWFyazpvcmc+5bel56iL5aSEPC9tYXJrOm9yZz48bWFyazphZGRyPjxtYXJrOnN0cmVldD7pppnm
-uK/kuJzot6825Y+377yMNeWPt+alvO+8jDjlj7flrqQ8L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+
-6Z2S5bKb5biCPC9tYXJrOmNpdHk+PG1hcms6cGM+MzUwMDwvbWFyazpwYz48bWFyazpjYz5DTjwv
-bWFyazpjYz48L21hcms6YWRkcj48bWFyazp2b2ljZT4rODYuMTA4NDY1NzE3MzwvbWFyazp2b2lj
-ZT48bWFyazpmYXg+Kzg2LjEwODQ2NTcxNzU8L21hcms6ZmF4PjxtYXJrOmVtYWlsPmluZm9AY2hp
-bmVzZS1hZ2VuY3kuY29tPC9tYXJrOmVtYWlsPjwvbWFyazpjb250YWN0PjxtYXJrOmxhYmVsPnhu
-LS0tLWt3M2J1MHhscjJiYmE8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLWFuZC12ajNmdDc5
-YTg4NWNkYTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tdzJ0OTZxcjY0YWE8L21hcms6bGFi
-ZWw+PG1hcms6Z29vZHNBbmRTZXJ2aWNlcz4g5ZCJ5LuWPC9tYXJrOmdvb2RzQW5kU2VydmljZXM+
-PG1hcms6cmVmTnVtPjEyMzQ8L21hcms6cmVmTnVtPjxtYXJrOnByb0RhdGU+MjAxMy0wMS0wMVQw
-MDowMDowMC4wMDBaPC9tYXJrOnByb0RhdGU+PG1hcms6Y2M+VVM8L21hcms6Y2M+PG1hcms6Y291
-cnROYW1lPkhvdmU8L21hcms6Y291cnROYW1lPjwvbWFyazpjb3VydD48L21hcms6bWFyaz48ZHM6
-U2lnbmF0dXJlIHhtbG5zOmRzPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjIiBJ
-ZD0iXzI3ZDI4YTJhLTIyOGMtNDMxNS04YTQ0LTY5NDU1ODdhYjkwYSI+PGRzOlNpZ25lZEluZm8+
-PGRzOkNhbm9uaWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8y
-MDAxLzEwL3htbC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJlTWV0aG9kIEFsZ29yaXRobT0iaHR0
-cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxkc2lnLW1vcmUjcnNhLXNoYTI1NiIvPjxkczpSZWZl
-cmVuY2UgVVJJPSIjXzI5ODcyZWI2LTFjYmItNDNiMy1iYjMzLWRmMDYzOGZmZDQyNyI+PGRzOlRy
-YW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDAv
-MDkveG1sZHNpZyNlbnZlbG9wZWQtc2lnbmF0dXJlIi8+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09
-Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jt
-cz48ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94
-bWxlbmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPmYwdWNzMUZjM2VwSGxHaldVa3ZVaG4vM0p2
-V0pMUjl3d2tWSjZkMXRSdXc9PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48ZHM6UmVm
-ZXJlbmNlIFVSST0iI19mMGVlZmI2NS00Zjg5LTQ4OTktYWQ3Ny04ZGI2MGY3M2UzMDAiPjxkczpU
-cmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAx
-LzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdv
-cml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdl
-c3RWYWx1ZT5WalVhVnhGM0dGNkwzYWUvNGJOUHl0VWRoVE1RZFNNS09mMURaY1lsN3VRPTwvZHM6
-RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PC9kczpTaWduZWRJbmZvPjxkczpTaWduYXR1cmVW
-YWx1ZSBJZD0iXzhmNzZhNTEwLThjYmUtNDI0OS05M2FjLTM4MTM2YTc5NTg2YyI+RUltei9JSWZ4
-OG5zbVc3TExONXRCbi9NN2VYUDN3QXZVSmNyY2xJaTVCMVBXcldmd2lhbGVvd1lPVGFnWE15cnN5
-RWMycklETEpQRAprNStZMWxjSnVRaWd6aTd4YlFkaTQveGswRUVJRjJ0TUNDYkgxU0Nua1VoRGkv
-c096RVJKeXdncWlhbTN2bmE5UE5YaWEzaCs2bU5ICkpOVVZvWWQ3bW4xbHBHOTNkQzA5cVdIbWRT
-MHRrRVZZQkgyTDlldHJFNjhBMEROWDRaa0NJL05YdzRvQVVlWGtUNUZIWlpJSHRRek4KTlNzUGRX
-Ujl5a0hMRWZ4NFo5YThES0YzU2JtUnJKVktNbzNLRlhCNzQyVjFRcldsc2xsSmtHMGpBR3Freklw
-UGxyTm52M2hWUlFrZgpEUUs5QXZ2QlhCSm94UEpFYTFDYzRBKysxQUFqZXBkVVp6ZlV6QT09PC9k
-czpTaWduYXR1cmVWYWx1ZT48ZHM6S2V5SW5mbyBJZD0iX2YwZWVmYjY1LTRmODktNDg5OS1hZDc3
-LThkYjYwZjczZTMwMCI+PGRzOlg1MDlEYXRhPjxkczpYNTA5Q2VydGlmaWNhdGU+TUlJRk96Q0NC
-Q09nQXdJQkFnSWdMckFiZXZvYWU1MnkzZjZDMnRCMFNuM3A3WEptMFQwMkZvZ3hLQ2ZOaFpjd0RR
-WUpLb1pJaHZjTgpBUUVMQlFBd2ZERUxNQWtHQTFVRUJoTUNWVk14UERBNkJnTlZCQW9UTTBsdWRH
-VnlibVYwSUVOdmNuQnZjbUYwYVc5dUlHWnZjaUJCCmMzTnBaMjVsWkNCT1lXMWxjeUJoYm1RZ1Ru
-VnRZbVZ5Y3pFdk1DMEdBMVVFQXhNbVNVTkJUazRnVkhKaFpHVnRZWEpySUVOc1pXRnkKYVc1bmFH
-OTFjMlVnVUdsc2IzUWdRMEV3SGhjTk1UZ3dNakk0TURBd01EQXdXaGNOTWpNd016QXhNak0xT1RV
-NVdqQ0JqekVMTUFrRwpBMVVFQmhNQ1FrVXhJREFlQmdOVkJBZ1RGMEp5ZFhOelpXeHpMVU5oY0ds
-MFlXd2dVbVZuYVc5dU1SRXdEd1lEVlFRSEV3aENjblZ6CmMyVnNjekVSTUE4R0ExVUVDaE1JUkdW
-c2IybDBkR1V4T0RBMkJnTlZCQU1UTDBsRFFVNU9JRlJOUTBnZ1FYVjBhRzl5YVhwbFpDQlUKY21G
-a1pXMWhjbXNnVUdsc2IzUWdWbUZzYVdSaGRHOXlNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9D
-QVE4QU1JSUJDZ0tDQVFFQQp4bHAzS3BZSFgzV3lBc0ZoU2szTHdXZm5HbHhuVURGcUZaQTNVb3VN
-WWovWGlnYk1rTmVFWElqbGtST0tUNE9QR2ZSeC9MQXlSbFFRCmpDTXY0cWhia2NYMXA3YXI2M2Zs
-cTRTWk5WY2wxNWw3aDB1VDU4RnpTZm5sejB1NXJrSGZKSW1ENDMrbWFQLzhndjM2RlIyN2pXOFIK
-OXdZNGhrK1dzNElCMGlGU2Q4U1h2MUtyOHcvSm1NUVNEa2l1RytSZklpdWJ3US9meTdFa2o1UVdo
-UFp3K21NeE5LbkhVTHkzeFl6MgpMd1ZmZnRqd1V1ZWFjdnFOUkNrTVhsQ2xPQURxZlQ4b1Nab2VE
-WGVoSHZsUHNMQ2VtR0JvVEt1cnNrSVM2OUYweVBFSDVnemUwSCtmCjhGUk9zSW9LU3NWUTM0QjRT
-L2pvRTY3bnBzSlBUZEtzTlBKVHlRSURBUUFCbzRJQmt6Q0NBWTh3REFZRFZSMFRBUUgvQkFJd0FE
-QWQKQmdOVkhRNEVGZ1FVb0ZwWTc2cDV5b05EUkd0UXB6VnVSODFVV1Ewd2djWUdBMVVkSXdTQnZq
-Q0J1NEFVdzYwK3B0WVJBRVdBWERwWApTb3B0M0RFTm5uR2hnWUNrZmpCOE1Rc3dDUVlEVlFRR0V3
-SlZVekU4TURvR0ExVUVDaE16U1c1MFpYSnVaWFFnUTI5eWNHOXlZWFJwCmIyNGdabTl5SUVGemMy
-bG5ibVZrSUU1aGJXVnpJR0Z1WkNCT2RXMWlaWEp6TVM4d0xRWURWUVFERXlaSlEwRk9UaUJVY21G
-a1pXMWgKY21zZ1EyeGxZWEpwYm1kb2IzVnpaU0JRYVd4dmRDQkRRWUlnTHJBYmV2b2FlNTJ5M2Y2
-QzJ0QjBTbjNwN1hKbTBUMDJGb2d4S0NmTgpoWGt3RGdZRFZSMFBBUUgvQkFRREFnZUFNRFFHQTFV
-ZEh3UXRNQ3N3S2FBbm9DV0dJMmgwZEhBNkx5OWpjbXd1YVdOaGJtNHViM0puCkwzUnRZMmhmY0ds
-c2IzUXVZM0pzTUZFR0ExVWRJQVJLTUVnd0VBWU9Ld1lCQkFHQ3lSc0JCWU03REFvd05BWUlLd1lC
-QlFVSEFnRXcKS0RBbUJnZ3JCZ0VGQlFjQ0FSWWFhSFIwY0hNNkx5OWpZUzVwWTJGdWJpNXZjbWN2
-Y0dsc2IzUXdEUVlKS29aSWh2Y05BUUVMQlFBRApnZ0VCQUF1aloySWNSMkRWcnRhUnJBNTllTllD
-bDR4Y3NKTXU4RFFDSHYyOGZUZmkvQmlaWTRJcjdGOWtGeTk2RDdPWjhvTFk1empmCjRkSHhGd0hQ
-cUg4RGg2Sldzelh1SFcxWmEzWG1sMFBhSHhDV1JTMFhvbDhXc0hIcE55Z2pNQllmSjBvZFZNODg1
-VFoxRWw5U2l1RUgKbnluRkJnU21pRmM5OXVRZC9ZRFJadUd2L0EwSHl2N3lSOXRrTEVkRDNBMXVO
-SkJXNFArSEpHcGRLa1lMMVE1clU3K29IVlB0TUtLSQozaUZrVUVzYk80NUFWZDd2UC9qLzdKdEFa
-UGI2a29PVjVsWmkySDFSTGNjR3d6ZGV6bmhKZ2QwTjlvYmIwdm5FNDEvVVNXYWZkV1JaClZHa3dQ
-dXFUaGw3c0N0enJKSDhYWTB4Y3VtK2NmTHgyRUFJd1VuT2NhYjQ9PC9kczpYNTA5Q2VydGlmaWNh
-dGU+PC9kczpYNTA5RGF0YT48L2RzOktleUluZm8+PC9kczpTaWduYXR1cmU+PC9zbWQ6c2lnbmVk
-TWFyaz4=
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/active/Court-Agent-English-Active.smd b/core/src/test/resources/google/registry/tmch/active/Court-Agent-English-Active.smd
deleted file mode 100644
index 6baab1567..000000000
--- a/core/src/test/resources/google/registry/tmch/active/Court-Agent-English-Active.smd
+++ /dev/null
@@ -1,100 +0,0 @@
-Marks: Test & Validate
-smdID: 000000851526320390595-65535
-U-labels: test---validate, test--validate, test-and-validate, test-andvalidate, test-validate, testand-validate, testandvalidate, testvalidate
-notBefore: 2018-05-14T17:53:10.595Z
-notAfter: 2022-08-18T14:57:36.681Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il8wYjlj
-YTI5My0yYjExLTQ4M2MtYjZjMi0xYTk5MGIyMTdlYjgiPjxzbWQ6aWQ+MDAwMDAwODUxNTI2MzIw
-MzkwNTk1LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo1MzoxMC41OTVaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0xOFQxNDo1NzozNi42ODFaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazpj
-b3VydD48bWFyazppZD4wMDAxMzcxNTAzMDY3ODY4MTUwMzA2Nzg2OC0xPC9tYXJrOmlkPjxtYXJr
-Om1hcmtOYW1lPlRlc3QgJmFtcDsgVmFsaWRhdGU8L21hcms6bWFya05hbWU+PG1hcms6aG9sZGVy
-IGVudGl0bGVtZW50PSJvd25lciI+PG1hcms6bmFtZT5Ub255IEhvbGxhbmQ8L21hcms6bmFtZT48
-bWFyazpvcmc+QWcgY29ycG9yYXRpb248L21hcms6b3JnPjxtYXJrOmFkZHI+PG1hcms6c3RyZWV0
-PjEzMDUgQnJpZ2h0IEF2ZW51ZTwvbWFyazpzdHJlZXQ+PG1hcms6Y2l0eT5BcmNhZGlhPC9tYXJr
-OmNpdHk+PG1hcms6cGM+OTAwMjg8L21hcms6cGM+PG1hcms6Y2M+VVM8L21hcms6Y2M+PC9tYXJr
-OmFkZHI+PC9tYXJrOmhvbGRlcj48bWFyazpjb250YWN0IHR5cGU9ImFnZW50Ij48bWFyazpuYW1l
-PlRvbnkgSG9sbGFuZDwvbWFyazpuYW1lPjxtYXJrOm9yZz5BZyBjb3Jwb3JhdGlvbjwvbWFyazpv
-cmc+PG1hcms6YWRkcj48bWFyazpzdHJlZXQ+QnJpZ2h0IEF2ZW51ZSAxMzA1IDwvbWFyazpzdHJl
-ZXQ+PG1hcms6Y2l0eT5BcmNhZGlhPC9tYXJrOmNpdHk+PG1hcms6c3A+Q0E8L21hcms6c3A+PG1h
-cms6cGM+OTAwMjg8L21hcms6cGM+PG1hcms6Y2M+VVM8L21hcms6Y2M+PC9tYXJrOmFkZHI+PG1h
-cms6dm9pY2U+KzEuMjAyNTU2MjMwMjwvbWFyazp2b2ljZT48bWFyazpmYXg+KzEuMjAyNTU2MjMw
-MTwvbWFyazpmYXg+PG1hcms6ZW1haWw+aW5mb0BhZ2NvcnBvcmF0aW9uLmNvbTwvbWFyazplbWFp
-bD48L21hcms6Y29udGFjdD48bWFyazpsYWJlbD50ZXN0LS0tdmFsaWRhdGU8L21hcms6bGFiZWw+
-PG1hcms6bGFiZWw+dGVzdC0tdmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+dGVzdC1h
-bmQtdmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+dGVzdC1hbmR2YWxpZGF0ZTwvbWFy
-azpsYWJlbD48bWFyazpsYWJlbD50ZXN0LXZhbGlkYXRlPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVs
-PnRlc3RhbmQtdmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+dGVzdGFuZHZhbGlkYXRl
-PC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnRlc3R2YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazpn
-b29kc0FuZFNlcnZpY2VzPmd1aXRhcjwvbWFyazpnb29kc0FuZFNlcnZpY2VzPjxtYXJrOnJlZk51
-bT4xMjM0PC9tYXJrOnJlZk51bT48bWFyazpwcm9EYXRlPjIwMTMtMDEtMDFUMDA6MDA6MDAuMDAw
-WjwvbWFyazpwcm9EYXRlPjxtYXJrOmNjPlVTPC9tYXJrOmNjPjxtYXJrOmNvdXJ0TmFtZT5Ib3Zl
-PC9tYXJrOmNvdXJ0TmFtZT48L21hcms6Y291cnQ+PC9tYXJrOm1hcms+PGRzOlNpZ25hdHVyZSB4
-bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyIgSWQ9Il83NzViYTgx
-YS1mMWYzLTQ3OTgtODE4NS1hODkzNmYyZTI4MTkiPjxkczpTaWduZWRJbmZvPjxkczpDYW5vbmlj
-YWxpemF0aW9uTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwt
-ZXhjLWMxNG4jIi8+PGRzOlNpZ25hdHVyZU1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMu
-b3JnLzIwMDEvMDQveG1sZHNpZy1tb3JlI3JzYS1zaGEyNTYiLz48ZHM6UmVmZXJlbmNlIFVSST0i
-I18wYjljYTI5My0yYjExLTQ4M2MtYjZjMi0xYTk5MGIyMTdlYjgiPjxkczpUcmFuc2Zvcm1zPjxk
-czpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcj
-ZW52ZWxvcGVkLXNpZ25hdHVyZSIvPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3
-LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2Vz
-dE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1
-NiIvPjxkczpEaWdlc3RWYWx1ZT5xYVZhY2gxNFNkbHd1R0JBNk0xV0ZFdUJuQnM1RW01QjExWDg5
-YndGR1E4PTwvZHM6RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PGRzOlJlZmVyZW5jZSBVUkk9
-IiNfY2I3YjUxMWUtNjdiNC00ZTlhLTlmODAtZDdkYjg2MjY4ZGRmIj48ZHM6VHJhbnNmb3Jtcz48
-ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhj
-LWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRw
-Oi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+cEND
-NVlpakJXUWFmM0J3VWVzbEh2TVNFNjcyZ1NUWVNqencxN3VLZDdmOD08L2RzOkRpZ2VzdFZhbHVl
-PjwvZHM6UmVmZXJlbmNlPjwvZHM6U2lnbmVkSW5mbz48ZHM6U2lnbmF0dXJlVmFsdWUgSWQ9Il84
-MTkyMTFkOS02ZDUzLTQwMzgtOTBiYi01MDAxYTk5MDE0MDgiPmxZNjBKZEpoMGs1MElTWm4yYzAz
-VFRGc1c4bURxaVNDTUFKeDkwNlVEb2FUM2tndUh6cXM0c1V5VXRobEdWOXhMMlNkNmQwNkVrcTUK
-aVFnVnFKNGN2ZldlVjlJN2hxSk16NldjOHpNdXBFZ2ZlUGVLWkNYL2JlaGtGM3RSRHJ4NGdqbFBR
-RDVhV0MveURjWEJjWGo1QU4xNwpMY0pnVjVDMmUxSzVNWjV6amFzWExTaHJnMEtuZ1Y5S094RXl3
-Zm9LZWtTWWRzZWpJYTRCYjVnVzgzMG1uMEtKWjdOaUVqclB1TTU5CklqbTExYTNyY2Q1L2hGNGln
-TTQ3RWI0YVg4WG1NRDU1N0xnVy9FWStHbGpKNWFFRlJrN1hMZ2ZTM2VPcGptUGlyNGpCZGIwSDBJ
-NkYKRkNHM0pua0F6UWxUeFo3RUZ6L0Zqa2VnREVoSXhIMHBLTW1LM1E9PTwvZHM6U2lnbmF0dXJl
-VmFsdWU+PGRzOktleUluZm8gSWQ9Il9jYjdiNTExZS02N2I0LTRlOWEtOWY4MC1kN2RiODYyNjhk
-ZGYiPjxkczpYNTA5RGF0YT48ZHM6WDUwOUNlcnRpZmljYXRlPk1JSUZPekNDQkNPZ0F3SUJBZ0ln
-THJBYmV2b2FlNTJ5M2Y2QzJ0QjBTbjNwN1hKbTBUMDJGb2d4S0NmTmhaY3dEUVlKS29aSWh2Y04K
-QVFFTEJRQXdmREVMTUFrR0ExVUVCaE1DVlZNeFBEQTZCZ05WQkFvVE0wbHVkR1Z5Ym1WMElFTnZj
-bkJ2Y21GMGFXOXVJR1p2Y2lCQgpjM05wWjI1bFpDQk9ZVzFsY3lCaGJtUWdUblZ0WW1WeWN6RXZN
-QzBHQTFVRUF4TW1TVU5CVGs0Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5CmFXNW5hRzkxYzJVZ1VHbHNi
-M1FnUTBFd0hoY05NVGd3TWpJNE1EQXdNREF3V2hjTk1qTXdNekF4TWpNMU9UVTVXakNCanpFTE1B
-a0cKQTFVRUJoTUNRa1V4SURBZUJnTlZCQWdURjBKeWRYTnpaV3h6TFVOaGNHbDBZV3dnVW1WbmFX
-OXVNUkV3RHdZRFZRUUhFd2hDY25WegpjMlZzY3pFUk1BOEdBMVVFQ2hNSVJHVnNiMmwwZEdVeE9E
-QTJCZ05WQkFNVEwwbERRVTVPSUZSTlEwZ2dRWFYwYUc5eWFYcGxaQ0JVCmNtRmtaVzFoY21zZ1VH
-bHNiM1FnVm1Gc2FXUmhkRzl5TUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dL
-Q0FRRUEKeGxwM0twWUhYM1d5QXNGaFNrM0x3V2ZuR2x4blVERnFGWkEzVW91TVlqL1hpZ2JNa05l
-RVhJamxrUk9LVDRPUEdmUngvTEF5UmxRUQpqQ012NHFoYmtjWDFwN2FyNjNmbHE0U1pOVmNsMTVs
-N2gwdVQ1OEZ6U2ZubHowdTVya0hmSkltRDQzK21hUC84Z3YzNkZSMjdqVzhSCjl3WTRoaytXczRJ
-QjBpRlNkOFNYdjFLcjh3L0ptTVFTRGtpdUcrUmZJaXVid1EvZnk3RWtqNVFXaFBadyttTXhOS25I
-VUx5M3hZejIKTHdWZmZ0andVdWVhY3ZxTlJDa01YbENsT0FEcWZUOG9TWm9lRFhlaEh2bFBzTENl
-bUdCb1RLdXJza0lTNjlGMHlQRUg1Z3plMEgrZgo4RlJPc0lvS1NzVlEzNEI0Uy9qb0U2N25wc0pQ
-VGRLc05QSlR5UUlEQVFBQm80SUJrekNDQVk4d0RBWURWUjBUQVFIL0JBSXdBREFkCkJnTlZIUTRF
-RmdRVW9GcFk3NnA1eW9ORFJHdFFwelZ1UjgxVVdRMHdnY1lHQTFVZEl3U0J2akNCdTRBVXc2MCtw
-dFlSQUVXQVhEcFgKU29wdDNERU5ubkdoZ1lDa2ZqQjhNUXN3Q1FZRFZRUUdFd0pWVXpFOE1Eb0dB
-MVVFQ2hNelNXNTBaWEp1WlhRZ1EyOXljRzl5WVhScApiMjRnWm05eUlFRnpjMmxuYm1Wa0lFNWhi
-V1Z6SUdGdVpDQk9kVzFpWlhKek1TOHdMUVlEVlFRREV5WkpRMEZPVGlCVWNtRmtaVzFoCmNtc2dR
-MnhsWVhKcGJtZG9iM1Z6WlNCUWFXeHZkQ0JEUVlJZ0xyQWJldm9hZTUyeTNmNkMydEIwU24zcDdY
-Sm0wVDAyRm9neEtDZk4KaFhrd0RnWURWUjBQQVFIL0JBUURBZ2VBTURRR0ExVWRId1F0TUNzd0th
-QW5vQ1dHSTJoMGRIQTZMeTlqY213dWFXTmhibTR1YjNKbgpMM1J0WTJoZmNHbHNiM1F1WTNKc01G
-RUdBMVVkSUFSS01FZ3dFQVlPS3dZQkJBR0N5UnNCQllNN0RBb3dOQVlJS3dZQkJRVUhBZ0V3CktE
-QW1CZ2dyQmdFRkJRY0NBUllhYUhSMGNITTZMeTlqWVM1cFkyRnViaTV2Y21jdmNHbHNiM1F3RFFZ
-SktvWklodmNOQVFFTEJRQUQKZ2dFQkFBdWpaMkljUjJEVnJ0YVJyQTU5ZU5ZQ2w0eGNzSk11OERR
-Q0h2MjhmVGZpL0JpWlk0SXI3RjlrRnk5NkQ3T1o4b0xZNXpqZgo0ZEh4RndIUHFIOERoNkpXc3pY
-dUhXMVphM1htbDBQYUh4Q1dSUzBYb2w4V3NISHBOeWdqTUJZZkowb2RWTTg4NVRaMUVsOVNpdUVI
-Cm55bkZCZ1NtaUZjOTl1UWQvWURSWnVHdi9BMEh5djd5Ujl0a0xFZEQzQTF1TkpCVzRQK0hKR3Bk
-S2tZTDFRNXJVNytvSFZQdE1LS0kKM2lGa1VFc2JPNDVBVmQ3dlAvai83SnRBWlBiNmtvT1Y1bFpp
-MkgxUkxjY0d3emRlem5oSmdkME45b2JiMHZuRTQxL1VTV2FmZFdSWgpWR2t3UHVxVGhsN3NDdHpy
-Skg4WFkweGN1bStjZkx4MkVBSXdVbk9jYWI0PTwvZHM6WDUwOUNlcnRpZmljYXRlPjwvZHM6WDUw
-OURhdGE+PC9kczpLZXlJbmZvPjwvZHM6U2lnbmF0dXJlPjwvc21kOnNpZ25lZE1hcms+
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/active/Court-Agent-French-Active.smd b/core/src/test/resources/google/registry/tmch/active/Court-Agent-French-Active.smd
deleted file mode 100644
index 00b564a69..000000000
--- a/core/src/test/resources/google/registry/tmch/active/Court-Agent-French-Active.smd
+++ /dev/null
@@ -1,101 +0,0 @@
-Marks: Essai & évaluation
-smdID: 000000821526320384749-65535
-U-labels: xn--essai---valuation-itb, xn--essai--valuation-hqb, xn--essai-et-valuation-jwb, xn--essai-etvaluation-itb, xn--essai-valuation-gnb, xn--essaiet-valuation-itb, xn--essaietvaluation-hqb, xn--essaivaluation-fkb
-notBefore: 2018-05-14T17:53:04.749Z
-notAfter: 2022-08-18T14:46:53.013Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il84MGIx
-NGY4MS1mODA0LTQwYjMtOGRjZC1iOTNhNjVhNTc5MTgiPjxzbWQ6aWQ+MDAwMDAwODIxNTI2MzIw
-Mzg0NzQ5LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo1MzowNC43NDlaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0xOFQxNDo0Njo1My4wMTNaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazpj
-b3VydD48bWFyazppZD4wMDAxMzkxNTAzMDY3MTg5MTUwMzA2NzE4OS0xPC9tYXJrOmlkPjxtYXJr
-Om1hcmtOYW1lPkVzc2FpICZhbXA7IMOpdmFsdWF0aW9uPC9tYXJrOm1hcmtOYW1lPjxtYXJrOmhv
-bGRlciBlbnRpdGxlbWVudD0ib3duZXIiPjxtYXJrOm9yZz5BZ2VuY2UgZW4gRnJhbmNlPC9tYXJr
-Om9yZz48bWFyazphZGRyPjxtYXJrOnN0cmVldD4xMCBBdmVudWUgUm91c3NlYXV4PC9tYXJrOnN0
-cmVldD48bWFyazpjaXR5PlZlcnNhaWxsZXM8L21hcms6Y2l0eT48bWFyazpwYz4zMzA4MTwvbWFy
-azpwYz48bWFyazpjYz5GUjwvbWFyazpjYz48L21hcms6YWRkcj48L21hcms6aG9sZGVyPjxtYXJr
-OmNvbnRhY3QgdHlwZT0iYWdlbnQiPjxtYXJrOm5hbWU+RnJhbmMgTGVicnVuPC9tYXJrOm5hbWU+
-PG1hcms6b3JnPkFnZW5jZSBlbiBGcmFuY2U8L21hcms6b3JnPjxtYXJrOmFkZHI+PG1hcms6c3Ry
-ZWV0PkF2ZW51ZSBSb3Vzc2VhdXggMTAgPC9tYXJrOnN0cmVldD48bWFyazpjaXR5PlZlcnNhaWxs
-ZXM8L21hcms6Y2l0eT48bWFyazpwYz4zMzA4MTwvbWFyazpwYz48bWFyazpjYz5GUjwvbWFyazpj
-Yz48L21hcms6YWRkcj48bWFyazp2b2ljZT4rMzMuMTI1NzgxMjUwPC9tYXJrOnZvaWNlPjxtYXJr
-OmZheD4rMzMuMTI1NzgxMjUxPC9tYXJrOmZheD48bWFyazplbWFpbD5pbmZvQGFnZW5jZS1lbi1m
-cmFuY2UuZnI8L21hcms6ZW1haWw+PC9tYXJrOmNvbnRhY3Q+PG1hcms6bGFiZWw+eG4tLWVzc2Fp
-LS0tdmFsdWF0aW9uLWl0YjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tZXNzYWktLXZhbHVh
-dGlvbi1ocWI8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLWVzc2FpLWV0LXZhbHVhdGlvbi1q
-d2I8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLWVzc2FpLWV0dmFsdWF0aW9uLWl0YjwvbWFy
-azpsYWJlbD48bWFyazpsYWJlbD54bi0tZXNzYWktdmFsdWF0aW9uLWduYjwvbWFyazpsYWJlbD48
-bWFyazpsYWJlbD54bi0tZXNzYWlldC12YWx1YXRpb24taXRiPC9tYXJrOmxhYmVsPjxtYXJrOmxh
-YmVsPnhuLS1lc3NhaWV0dmFsdWF0aW9uLWhxYjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0t
-ZXNzYWl2YWx1YXRpb24tZmtiPC9tYXJrOmxhYmVsPjxtYXJrOmdvb2RzQW5kU2VydmljZXM+Z3Vp
-dGFyPC9tYXJrOmdvb2RzQW5kU2VydmljZXM+PG1hcms6cmVmTnVtPjEyMzQ8L21hcms6cmVmTnVt
-PjxtYXJrOnByb0RhdGU+MjAxMy0wMS0wMVQwMDowMDowMC4wMDBaPC9tYXJrOnByb0RhdGU+PG1h
-cms6Y2M+RlI8L21hcms6Y2M+PG1hcms6Y291cnROYW1lPmd1aXRhcmU8L21hcms6Y291cnROYW1l
-PjwvbWFyazpjb3VydD48L21hcms6bWFyaz48ZHM6U2lnbmF0dXJlIHhtbG5zOmRzPSJodHRwOi8v
-d3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjIiBJZD0iX2E0YTNhZTUyLTgwODQtNGVlYi04M2M5
-LTc1ZTQ1ZDQzMDBhMiI+PGRzOlNpZ25lZEluZm8+PGRzOkNhbm9uaWNhbGl6YXRpb25NZXRob2Qg
-QWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48ZHM6
-U2lnbmF0dXJlTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxk
-c2lnLW1vcmUjcnNhLXNoYTI1NiIvPjxkczpSZWZlcmVuY2UgVVJJPSIjXzgwYjE0ZjgxLWY4MDQt
-NDBiMy04ZGNkLWI5M2E2NWE1NzkxOCI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdv
-cml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1sZHNpZyNlbnZlbG9wZWQtc2lnbmF0
-dXJlIi8+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAv
-eG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRo
-bT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxlbmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZh
-bHVlPnpKaDgwMDVSTmtXL3F4YmNHZHUrVXlEaUFaQ1VNRWkwT0xnUW9jZ0FCc1E9PC9kczpEaWdl
-c3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48ZHM6UmVmZXJlbmNlIFVSST0iI18wNzdjNzM1OS03YWI2
-LTQyNDUtOGJiNi0xOWUyNTdmNmU3MTciPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxn
-b3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRy
-YW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIw
-MDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1ZT5CTzloVkJUa3dVbDBxZHhUNTl5
-aXpjV3VDN1ZIMjIreGovRDZPZitVbnRZPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+
-PC9kczpTaWduZWRJbmZvPjxkczpTaWduYXR1cmVWYWx1ZSBJZD0iXzA2OTE3YzM0LTZiMmMtNDdi
-ZS04YzA3LWNmMTJhZDkzZDYxNSI+bnRFbHMwT2h4bEFDL0MxVWZwemhRR2xkNHlXZkxRZTdFdDd1
-b3JiY0dRTldOOERGZjBNbVpqUnFmaTZWVzYwM2Fwd3dZZWlaTTdDVwpvRi93REhsMkc2a0d1eTBG
-QnoyakhPVnVQdG1RNGZJcVdQU24xZUUxQkZSbHpURDlPRm5VTWxPRW9ONDFxMHdGVzQwdTRnMVd0
-bU5YCmpWVFJEY1BmejMwWUxCT29lSUFMUHhJSHEwTkRQRmpSNExTNWtzY2J2eGU4d0h3RWNHeGJq
-b0tnU0xUTklNeDVTbkwwNFpYSHd0eGgKMGJ5eWRBanFnMU9ja2JhdEVaQ0U0MHFpZ0kwRmdRb0hm
-M0tjVkY3UXEwbTFIdXlNS3lwRUVLSFBmejNWcmw1N24wUFVWU1FJd0VpTgpxaEVVMkxhRy8zQndp
-YWw1M29GdVZpcTd3VUZyNzVmR2ZQcm14QT09PC9kczpTaWduYXR1cmVWYWx1ZT48ZHM6S2V5SW5m
-byBJZD0iXzA3N2M3MzU5LTdhYjYtNDI0NS04YmI2LTE5ZTI1N2Y2ZTcxNyI+PGRzOlg1MDlEYXRh
-PjxkczpYNTA5Q2VydGlmaWNhdGU+TUlJRk96Q0NCQ09nQXdJQkFnSWdMckFiZXZvYWU1MnkzZjZD
-MnRCMFNuM3A3WEptMFQwMkZvZ3hLQ2ZOaFpjd0RRWUpLb1pJaHZjTgpBUUVMQlFBd2ZERUxNQWtH
-QTFVRUJoTUNWVk14UERBNkJnTlZCQW9UTTBsdWRHVnlibVYwSUVOdmNuQnZjbUYwYVc5dUlHWnZj
-aUJCCmMzTnBaMjVsWkNCT1lXMWxjeUJoYm1RZ1RuVnRZbVZ5Y3pFdk1DMEdBMVVFQXhNbVNVTkJU
-azRnVkhKaFpHVnRZWEpySUVOc1pXRnkKYVc1bmFHOTFjMlVnVUdsc2IzUWdRMEV3SGhjTk1UZ3dN
-akk0TURBd01EQXdXaGNOTWpNd016QXhNak0xT1RVNVdqQ0JqekVMTUFrRwpBMVVFQmhNQ1FrVXhJ
-REFlQmdOVkJBZ1RGMEp5ZFhOelpXeHpMVU5oY0dsMFlXd2dVbVZuYVc5dU1SRXdEd1lEVlFRSEV3
-aENjblZ6CmMyVnNjekVSTUE4R0ExVUVDaE1JUkdWc2IybDBkR1V4T0RBMkJnTlZCQU1UTDBsRFFV
-NU9JRlJOUTBnZ1FYVjBhRzl5YVhwbFpDQlUKY21Ga1pXMWhjbXNnVUdsc2IzUWdWbUZzYVdSaGRH
-OXlNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQQp4bHAzS3BZSFgz
-V3lBc0ZoU2szTHdXZm5HbHhuVURGcUZaQTNVb3VNWWovWGlnYk1rTmVFWElqbGtST0tUNE9QR2ZS
-eC9MQXlSbFFRCmpDTXY0cWhia2NYMXA3YXI2M2ZscTRTWk5WY2wxNWw3aDB1VDU4RnpTZm5sejB1
-NXJrSGZKSW1ENDMrbWFQLzhndjM2RlIyN2pXOFIKOXdZNGhrK1dzNElCMGlGU2Q4U1h2MUtyOHcv
-Sm1NUVNEa2l1RytSZklpdWJ3US9meTdFa2o1UVdoUFp3K21NeE5LbkhVTHkzeFl6MgpMd1ZmZnRq
-d1V1ZWFjdnFOUkNrTVhsQ2xPQURxZlQ4b1Nab2VEWGVoSHZsUHNMQ2VtR0JvVEt1cnNrSVM2OUYw
-eVBFSDVnemUwSCtmCjhGUk9zSW9LU3NWUTM0QjRTL2pvRTY3bnBzSlBUZEtzTlBKVHlRSURBUUFC
-bzRJQmt6Q0NBWTh3REFZRFZSMFRBUUgvQkFJd0FEQWQKQmdOVkhRNEVGZ1FVb0ZwWTc2cDV5b05E
-Ukd0UXB6VnVSODFVV1Ewd2djWUdBMVVkSXdTQnZqQ0J1NEFVdzYwK3B0WVJBRVdBWERwWApTb3B0
-M0RFTm5uR2hnWUNrZmpCOE1Rc3dDUVlEVlFRR0V3SlZVekU4TURvR0ExVUVDaE16U1c1MFpYSnVa
-WFFnUTI5eWNHOXlZWFJwCmIyNGdabTl5SUVGemMybG5ibVZrSUU1aGJXVnpJR0Z1WkNCT2RXMWla
-WEp6TVM4d0xRWURWUVFERXlaSlEwRk9UaUJVY21Ga1pXMWgKY21zZ1EyeGxZWEpwYm1kb2IzVnpa
-U0JRYVd4dmRDQkRRWUlnTHJBYmV2b2FlNTJ5M2Y2QzJ0QjBTbjNwN1hKbTBUMDJGb2d4S0NmTgpo
-WGt3RGdZRFZSMFBBUUgvQkFRREFnZUFNRFFHQTFVZEh3UXRNQ3N3S2FBbm9DV0dJMmgwZEhBNkx5
-OWpjbXd1YVdOaGJtNHViM0puCkwzUnRZMmhmY0dsc2IzUXVZM0pzTUZFR0ExVWRJQVJLTUVnd0VB
-WU9Ld1lCQkFHQ3lSc0JCWU03REFvd05BWUlLd1lCQlFVSEFnRXcKS0RBbUJnZ3JCZ0VGQlFjQ0FS
-WWFhSFIwY0hNNkx5OWpZUzVwWTJGdWJpNXZjbWN2Y0dsc2IzUXdEUVlKS29aSWh2Y05BUUVMQlFB
-RApnZ0VCQUF1aloySWNSMkRWcnRhUnJBNTllTllDbDR4Y3NKTXU4RFFDSHYyOGZUZmkvQmlaWTRJ
-cjdGOWtGeTk2RDdPWjhvTFk1empmCjRkSHhGd0hQcUg4RGg2Sldzelh1SFcxWmEzWG1sMFBhSHhD
-V1JTMFhvbDhXc0hIcE55Z2pNQllmSjBvZFZNODg1VFoxRWw5U2l1RUgKbnluRkJnU21pRmM5OXVR
-ZC9ZRFJadUd2L0EwSHl2N3lSOXRrTEVkRDNBMXVOSkJXNFArSEpHcGRLa1lMMVE1clU3K29IVlB0
-TUtLSQozaUZrVUVzYk80NUFWZDd2UC9qLzdKdEFaUGI2a29PVjVsWmkySDFSTGNjR3d6ZGV6bmhK
-Z2QwTjlvYmIwdm5FNDEvVVNXYWZkV1JaClZHa3dQdXFUaGw3c0N0enJKSDhYWTB4Y3VtK2NmTHgy
-RUFJd1VuT2NhYjQ9PC9kczpYNTA5Q2VydGlmaWNhdGU+PC9kczpYNTA5RGF0YT48L2RzOktleUlu
-Zm8+PC9kczpTaWduYXR1cmU+PC9zbWQ6c2lnbmVkTWFyaz4=
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/active/Court-Agent-Russian-Active.smd b/core/src/test/resources/google/registry/tmch/active/Court-Agent-Russian-Active.smd
deleted file mode 100644
index e2a02dd54..000000000
--- a/core/src/test/resources/google/registry/tmch/active/Court-Agent-Russian-Active.smd
+++ /dev/null
@@ -1,102 +0,0 @@
-Marks: Марк & записи
-smdID: 000000731526320367222-65535
-U-labels: xn------5cdd5bials4bfv, xn-----6kcc8ahakq0bft, xn---and--3vef9ckanw2cfz, xn---and-43de2cjamu8bfx, xn----7sbb1agajo6afr, xn--and--43de2cjamu8bfx, xn--and-5cdd5bials4bfv, xn--80aaufaim2afp
-notBefore: 2018-05-14T17:52:47.222Z
-notAfter: 2022-08-18T14:16:55.554Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il81ZWZi
-ZWYxMy0zYjRkLTQ4NDctOGRkMi1hMGRkMzMwM2RkMDEiPjxzbWQ6aWQ+MDAwMDAwNzMxNTI2MzIw
-MzY3MjIyLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo1Mjo0Ny4yMjJaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0xOFQxNDoxNjo1NS41NTRaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazpj
-b3VydD48bWFyazppZD4wMDAxNDExNTAzMDY1MzU1MTUwMzA2NTM1NS0xPC9tYXJrOmlkPjxtYXJr
-Om1hcmtOYW1lPtCc0LDRgNC6ICZhbXA7INC30LDQv9C40YHQuDwvbWFyazptYXJrTmFtZT48bWFy
-azpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpvcmc+0JDQs9C10L3RgtGB0YLQstC+
-PC9tYXJrOm9yZz48bWFyazphZGRyPjxtYXJrOnN0cmVldD7Qn9GA0L7RgdC/0LXQutGCINCS0LXR
-gNC90LDQtNGB0LrQvtCz0L4gMTU8L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+0JzQvtGB0LrQstCw
-PC9tYXJrOmNpdHk+PG1hcms6cGM+MTE3NDg1PC9tYXJrOnBjPjxtYXJrOmNjPlJVPC9tYXJrOmNj
-PjwvbWFyazphZGRyPjwvbWFyazpob2xkZXI+PG1hcms6Y29udGFjdCB0eXBlPSJhZ2VudCI+PG1h
-cms6bmFtZT7QndCw0YLQsNC70YzRjyDQkNC90YLQvtC90L7QstCwPC9tYXJrOm5hbWU+PG1hcms6
-b3JnPtCQ0LPQtdC90YLRgdGC0LLQvjwvbWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpzdHJlZXQ+
-0J/RgNC+0YHQv9C10LrRgiDQktC10YDQvdCw0LTRgdC60L7Qs9C+IDE1PC9tYXJrOnN0cmVldD48
-bWFyazpjaXR5PtCc0L7RgdC60LLQsDwvbWFyazpjaXR5PjxtYXJrOnBjPjExNzQ4NTwvbWFyazpw
-Yz48bWFyazpjYz5SVTwvbWFyazpjYz48L21hcms6YWRkcj48bWFyazp2b2ljZT4rNy45MTg4MjIx
-Njc0PC9tYXJrOnZvaWNlPjxtYXJrOmZheD4rNy45MTg4MjIxNjczPC9tYXJrOmZheD48bWFyazpl
-bWFpbD5pbmZvQGFnZW5jeS5ydTwvbWFyazplbWFpbD48L21hcms6Y29udGFjdD48bWFyazpsYWJl
-bD54bi0tLS0tLTVjZGQ1YmlhbHM0YmZ2PC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS0tLS02
-a2NjOGFoYWtxMGJmdDwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tLWFuZC0tM3ZlZjlja2Fu
-dzJjZno8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLS1hbmQtNDNkZTJjamFtdThiZng8L21h
-cms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLS0tN3NiYjFhZ2FqbzZhZnI8L21hcms6bGFiZWw+PG1h
-cms6bGFiZWw+eG4tLWFuZC0tNDNkZTJjamFtdThiZng8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+
-eG4tLWFuZC01Y2RkNWJpYWxzNGJmdjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tODBhYXVm
-YWltMmFmcDwvbWFyazpsYWJlbD48bWFyazpnb29kc0FuZFNlcnZpY2VzPtCz0LjRgtCw0YDQsCA8
-L21hcms6Z29vZHNBbmRTZXJ2aWNlcz48bWFyazpyZWZOdW0+MTIzNDwvbWFyazpyZWZOdW0+PG1h
-cms6cHJvRGF0ZT4yMDEzLTAxLTAxVDAwOjAwOjAwLjAwMFo8L21hcms6cHJvRGF0ZT48bWFyazpj
-Yz5VUzwvbWFyazpjYz48bWFyazpjb3VydE5hbWU+SG92ZTwvbWFyazpjb3VydE5hbWU+PC9tYXJr
-OmNvdXJ0PjwvbWFyazptYXJrPjxkczpTaWduYXR1cmUgeG1sbnM6ZHM9Imh0dHA6Ly93d3cudzMu
-b3JnLzIwMDAvMDkveG1sZHNpZyMiIElkPSJfZmQyNjk0MDktMGVhMy00ODJiLWIyMDktMDNlZmFm
-MTVhMTQ3Ij48ZHM6U2lnbmVkSW5mbz48ZHM6Q2Fub25pY2FsaXphdGlvbk1ldGhvZCBBbGdvcml0
-aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjxkczpTaWduYXR1
-cmVNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGRzaWctbW9y
-ZSNyc2Etc2hhMjU2Ii8+PGRzOlJlZmVyZW5jZSBVUkk9IiNfNWVmYmVmMTMtM2I0ZC00ODQ3LThk
-ZDItYTBkZDMzMDNkZDAxIj48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0i
-aHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48
-ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhj
-LWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRw
-Oi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+bEpl
-RHVaWDVIalB1VGZZRm9iOXMxdXNTVU96d2cvUGVaaDc4cjQ1V1Bjaz08L2RzOkRpZ2VzdFZhbHVl
-PjwvZHM6UmVmZXJlbmNlPjxkczpSZWZlcmVuY2UgVVJJPSIjXzM2ZmY4ODQ5LTAzMTQtNDgwZC1i
-YTg4LWFiNWI4NGU2OGU2MiI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09
-Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jt
-cz48ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94
-bWxlbmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPlJGWmZtb3ZVeW9qaDJTSU0rQXI0Snl6bkgw
-MGpPMkI0aGlNWnNyVFhtODA9PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48L2RzOlNp
-Z25lZEluZm8+PGRzOlNpZ25hdHVyZVZhbHVlIElkPSJfNTRiMmQ4MDctZGZmNC00MDY5LTg2NWQt
-NWU1YjdiOGQ5OGVmIj5GK1o0V3RZcjlCYk5WWHJlViswSzBpWDVQbnFPWjg3OHRhU0xDNjdzQ1ht
-OWFINVRDNFhHTnBxVjlUK2RrbU9tVUNJQ0lmTE5PVlZxCkhWMlNZNTR4T2U2NFNUaEtKK3pWOXJo
-RUVBK1NvZVFLSHVib3VMY0dMK3BYUmpWMVBETnBWeHdrUE45QnhGT21HbEh6anVxTHhtcXQKSCtT
-M1J4OFdmT0tXc3lURTdwMTJhd0g2dFVoYXBqV1A3U29PVTVxOExLUU9hdWJaaW4vYklPUHN1RTcy
-bmZIOTRKZnQ5REdLb0doUgpSaE81bVRUcUdSQlJIQjFqbU5sK1hmUGdSNHM0OGc0Uk01WTEydnIx
-NmRFMk14RDV4TEczZUVlVk9zS1p1OWpnVytPMXd3djZxbDZlClBYdFVyU0o4dTVKWjYrem5RNmdI
-bm5oMVp6V0xYVGZYYlhYa293PT08L2RzOlNpZ25hdHVyZVZhbHVlPjxkczpLZXlJbmZvIElkPSJf
-MzZmZjg4NDktMDMxNC00ODBkLWJhODgtYWI1Yjg0ZTY4ZTYyIj48ZHM6WDUwOURhdGE+PGRzOlg1
-MDlDZXJ0aWZpY2F0ZT5NSUlGT3pDQ0JDT2dBd0lCQWdJZ0xyQWJldm9hZTUyeTNmNkMydEIwU24z
-cDdYSm0wVDAyRm9neEtDZk5oWmN3RFFZSktvWklodmNOCkFRRUxCUUF3ZkRFTE1Ba0dBMVVFQmhN
-Q1ZWTXhQREE2QmdOVkJBb1RNMGx1ZEdWeWJtVjBJRU52Y25CdmNtRjBhVzl1SUdadmNpQkIKYzNO
-cFoyNWxaQ0JPWVcxbGN5QmhibVFnVG5WdFltVnljekV2TUMwR0ExVUVBeE1tU1VOQlRrNGdWSEpo
-WkdWdFlYSnJJRU5zWldGeQphVzVuYUc5MWMyVWdVR2xzYjNRZ1EwRXdIaGNOTVRnd01qSTRNREF3
-TURBd1doY05Nak13TXpBeE1qTTFPVFU1V2pDQmp6RUxNQWtHCkExVUVCaE1DUWtVeElEQWVCZ05W
-QkFnVEYwSnlkWE56Wld4ekxVTmhjR2wwWVd3Z1VtVm5hVzl1TVJFd0R3WURWUVFIRXdoQ2NuVnoK
-YzJWc2N6RVJNQThHQTFVRUNoTUlSR1ZzYjJsMGRHVXhPREEyQmdOVkJBTVRMMGxEUVU1T0lGUk5R
-MGdnUVhWMGFHOXlhWHBsWkNCVQpjbUZrWlcxaGNtc2dVR2xzYjNRZ1ZtRnNhV1JoZEc5eU1JSUJJ
-akFOQmdrcWhraUc5dzBCQVFFRkFBT0NBUThBTUlJQkNnS0NBUUVBCnhscDNLcFlIWDNXeUFzRmhT
-azNMd1dmbkdseG5VREZxRlpBM1VvdU1Zai9YaWdiTWtOZUVYSWpsa1JPS1Q0T1BHZlJ4L0xBeVJs
-UVEKakNNdjRxaGJrY1gxcDdhcjYzZmxxNFNaTlZjbDE1bDdoMHVUNThGelNmbmx6MHU1cmtIZkpJ
-bUQ0MyttYVAvOGd2MzZGUjI3alc4Ugo5d1k0aGsrV3M0SUIwaUZTZDhTWHYxS3I4dy9KbU1RU0Rr
-aXVHK1JmSWl1YndRL2Z5N0VrajVRV2hQWncrbU14TktuSFVMeTN4WXoyCkx3VmZmdGp3VXVlYWN2
-cU5SQ2tNWGxDbE9BRHFmVDhvU1pvZURYZWhIdmxQc0xDZW1HQm9US3Vyc2tJUzY5RjB5UEVINWd6
-ZTBIK2YKOEZST3NJb0tTc1ZRMzRCNFMvam9FNjducHNKUFRkS3NOUEpUeVFJREFRQUJvNElCa3pD
-Q0FZOHdEQVlEVlIwVEFRSC9CQUl3QURBZApCZ05WSFE0RUZnUVVvRnBZNzZwNXlvTkRSR3RRcHpW
-dVI4MVVXUTB3Z2NZR0ExVWRJd1NCdmpDQnU0QVV3NjArcHRZUkFFV0FYRHBYClNvcHQzREVObm5H
-aGdZQ2tmakI4TVFzd0NRWURWUVFHRXdKVlV6RThNRG9HQTFVRUNoTXpTVzUwWlhKdVpYUWdRMjl5
-Y0c5eVlYUnAKYjI0Z1ptOXlJRUZ6YzJsbmJtVmtJRTVoYldWeklHRnVaQ0JPZFcxaVpYSnpNUzh3
-TFFZRFZRUURFeVpKUTBGT1RpQlVjbUZrWlcxaApjbXNnUTJ4bFlYSnBibWRvYjNWelpTQlFhV3h2
-ZENCRFFZSWdMckFiZXZvYWU1MnkzZjZDMnRCMFNuM3A3WEptMFQwMkZvZ3hLQ2ZOCmhYa3dEZ1lE
-VlIwUEFRSC9CQVFEQWdlQU1EUUdBMVVkSHdRdE1Dc3dLYUFub0NXR0kyaDBkSEE2THk5amNtd3Vh
-V05oYm00dWIzSm4KTDNSdFkyaGZjR2xzYjNRdVkzSnNNRkVHQTFVZElBUktNRWd3RUFZT0t3WUJC
-QUdDeVJzQkJZTTdEQW93TkFZSUt3WUJCUVVIQWdFdwpLREFtQmdnckJnRUZCUWNDQVJZYWFIUjBj
-SE02THk5allTNXBZMkZ1Ymk1dmNtY3ZjR2xzYjNRd0RRWUpLb1pJaHZjTkFRRUxCUUFECmdnRUJB
-QXVqWjJJY1IyRFZydGFSckE1OWVOWUNsNHhjc0pNdThEUUNIdjI4ZlRmaS9CaVpZNElyN0Y5a0Z5
-OTZEN09aOG9MWTV6amYKNGRIeEZ3SFBxSDhEaDZKV3N6WHVIVzFaYTNYbWwwUGFIeENXUlMwWG9s
-OFdzSEhwTnlnak1CWWZKMG9kVk04ODVUWjFFbDlTaXVFSApueW5GQmdTbWlGYzk5dVFkL1lEUlp1
-R3YvQTBIeXY3eVI5dGtMRWREM0ExdU5KQlc0UCtISkdwZEtrWUwxUTVyVTcrb0hWUHRNS0tJCjNp
-RmtVRXNiTzQ1QVZkN3ZQL2ovN0p0QVpQYjZrb09WNWxaaTJIMVJMY2NHd3pkZXpuaEpnZDBOOW9i
-YjB2bkU0MS9VU1dhZmRXUloKVkdrd1B1cVRobDdzQ3R6ckpIOFhZMHhjdW0rY2ZMeDJFQUl3VW5P
-Y2FiND08L2RzOlg1MDlDZXJ0aWZpY2F0ZT48L2RzOlg1MDlEYXRhPjwvZHM6S2V5SW5mbz48L2Rz
-OlNpZ25hdHVyZT48L3NtZDpzaWduZWRNYXJrPg==
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/active/Court-Holder-Arab-Active.smd b/core/src/test/resources/google/registry/tmch/active/Court-Holder-Arab-Active.smd
deleted file mode 100644
index d2967197f..000000000
--- a/core/src/test/resources/google/registry/tmch/active/Court-Holder-Arab-Active.smd
+++ /dev/null
@@ -1,95 +0,0 @@
-Marks: الاختبار & لتقييم
-smdID: 000000911526320398360-65535
-U-labels: xn------nzeaagpf7azb2ppajr3fa, xn-----btdaafne4a7azpoaiq8ea, xn----ymcaaeld1a4a6onahp3ea, xn--mgbaadjcy1a8mmago8da
-notBefore: 2018-05-14T17:53:18.360Z
-notAfter: 2022-08-21T08:59:34.305Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il9mN2Zm
-YTA1ZC1lZTkwLTQ3OWMtOTkzNC1hZmI2MWY5MTMxNWUiPjxzbWQ6aWQ+MDAwMDAwOTExNTI2MzIw
-Mzk4MzYwLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo1MzoxOC4zNjBaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0yMVQwODo1OTozNC4zMDVaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazpj
-b3VydD48bWFyazppZD4wMDAxNDIxNTAzMzA1NTg0MTUwMzMwNTU4NC0xPC9tYXJrOmlkPjxtYXJr
-Om1hcmtOYW1lPtin2YTYp9iu2KrYqNin2LEgJmFtcDsg2YTYqtmC2YrZitmFPC9tYXJrOm1hcmtO
-YW1lPjxtYXJrOmhvbGRlciBlbnRpdGxlbWVudD0ib3duZXIiPjxtYXJrOm5hbWU+2YXZh9mG2K/Y
-syDYp9mE2YXYudmE2YjZhdin2KrZitipPC9tYXJrOm5hbWU+PG1hcms6b3JnPtin2K7Yqtio2KfY
-sTwvbWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpzdHJlZXQ+2KzYudmB2LEg2KfYqNmGINiz2YrZ
-htin2KEgNzU8L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+2YXZg9mG2KfYszwvbWFyazpjaXR5Pjxt
-YXJrOnBjPjI5MDA8L21hcms6cGM+PG1hcms6Y2M+TUE8L21hcms6Y2M+PC9tYXJrOmFkZHI+PG1h
-cms6dm9pY2U+KzIxMi41MjI1MzkwNDA8L21hcms6dm9pY2U+PG1hcms6ZmF4PisyMTIuNTIyNTM5
-MDQxPC9tYXJrOmZheD48bWFyazplbWFpbD5pbmZvQGV4YW1wbGUuZXhhbXBsZTwvbWFyazplbWFp
-bD48L21hcms6aG9sZGVyPjxtYXJrOmxhYmVsPnhuLS0tLS0tbnplYWFncGY3YXpiMnBwYWpyM2Zh
-PC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS0tLS1idGRhYWZuZTRhN2F6cG9haXE4ZWE8L21h
-cms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLS0teW1jYWFlbGQxYTRhNm9uYWhwM2VhPC9tYXJrOmxh
-YmVsPjxtYXJrOmxhYmVsPnhuLS1tZ2JhYWRqY3kxYThtbWFnbzhkYTwvbWFyazpsYWJlbD48bWFy
-azpnb29kc0FuZFNlcnZpY2VzPti62YrYqtin2LE8L21hcms6Z29vZHNBbmRTZXJ2aWNlcz48bWFy
-azpyZWZOdW0+MTk4PC9tYXJrOnJlZk51bT48bWFyazpwcm9EYXRlPjIwMTUtMDktMTVUMDA6MDA6
-MDAuMDAwWjwvbWFyazpwcm9EYXRlPjxtYXJrOmNjPk1BPC9tYXJrOmNjPjxtYXJrOmNvdXJ0TmFt
-ZT7Yp9mE2K/Yp9ixINin2YTYqNmK2LbYp9ihPC9tYXJrOmNvdXJ0TmFtZT48L21hcms6Y291cnQ+
-PC9tYXJrOm1hcms+PGRzOlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAw
-MC8wOS94bWxkc2lnIyIgSWQ9Il9jZjNkMjI3Yy1kNmU4LTQzZGEtYmM4NC02MGViNzRiOWQ5YjUi
-PjxkczpTaWduZWRJbmZvPjxkczpDYW5vbmljYWxpemF0aW9uTWV0aG9kIEFsZ29yaXRobT0iaHR0
-cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PGRzOlNpZ25hdHVyZU1ldGhv
-ZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZHNpZy1tb3JlI3JzYS1z
-aGEyNTYiLz48ZHM6UmVmZXJlbmNlIFVSST0iI19mN2ZmYTA1ZC1lZTkwLTQ3OWMtOTkzNC1hZmI2
-MWY5MTMxNWUiPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8v
-d3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjZW52ZWxvcGVkLXNpZ25hdHVyZSIvPjxkczpUcmFu
-c2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMi
-Lz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cu
-dzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1ZT53UTFJeXFUMTdk
-MStoTkg3aHBKUVQxUVRzS05QWHNUaC85TVJVb0E4a09nPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpS
-ZWZlcmVuY2U+PGRzOlJlZmVyZW5jZSBVUkk9IiNfMjM4MDNmMTUtZWZiOS00NTM5LTg3ZjYtZGFj
-MDNhYjg3NTZlIj48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDov
-L3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpE
-aWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNz
-aGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+OGh2S3BCNkVLeEZMbWU5QThKMnJqVmVmU0FBcGpZcmdh
-Y29ORm4wNnlFbz08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNlPjwvZHM6U2lnbmVkSW5m
-bz48ZHM6U2lnbmF0dXJlVmFsdWUgSWQ9Il8zZWZkNjM4MS1hYTAxLTQ3ZDYtODZkNy0wNzIzYTJm
-MDYxYTciPmd3NVA3OFY5Sm9acmFBWk5kMEpmVEo2d2s3Qnp0YXAyREJmSzl3cng4YStJT3c4MVNl
-a3ZBZU9MTU5aRE84LzFBY0xjVjdZVXRxRDkKMG4yUC9BYzdiOG9FdmdMcHgyTlA5eWNLNHNVekJi
-WUZRb2Y3VHIvZHIzZmRFN3J1Ymx1cStaRWR0QlFuck9KUk9rakZsMkxOU01JNQp6Nlk2NDZsVnVx
-dy9IQWpPalB1ZithUVQ5S3VGTkFFMi9mTTg0cWFDNkx1ZE9EWmpHVlkreWRzUHo3eUlXa1ZWaUNl
-OGtMV1h3cWYzCktXZWwyQ0dYSjg3c3FJb3dtV1EvQ3hKWnJ3SXRKRk43djhLNmlWTG1Tam1zQldq
-QlE3UHNHaHR3bkk1ck1yaFVycXFkRE9JUzNGUmoKdlBCSDJlRktna0pEK1E5ZTFPaEtOQlZySGFU
-WHZSTkRkUXlOdmc9PTwvZHM6U2lnbmF0dXJlVmFsdWU+PGRzOktleUluZm8gSWQ9Il8yMzgwM2Yx
-NS1lZmI5LTQ1MzktODdmNi1kYWMwM2FiODc1NmUiPjxkczpYNTA5RGF0YT48ZHM6WDUwOUNlcnRp
-ZmljYXRlPk1JSUZPekNDQkNPZ0F3SUJBZ0lnTHJBYmV2b2FlNTJ5M2Y2QzJ0QjBTbjNwN1hKbTBU
-MDJGb2d4S0NmTmhaY3dEUVlKS29aSWh2Y04KQVFFTEJRQXdmREVMTUFrR0ExVUVCaE1DVlZNeFBE
-QTZCZ05WQkFvVE0wbHVkR1Z5Ym1WMElFTnZjbkJ2Y21GMGFXOXVJR1p2Y2lCQgpjM05wWjI1bFpD
-Qk9ZVzFsY3lCaGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF4TW1TVU5CVGs0Z1ZISmhaR1Z0WVhK
-cklFTnNaV0Z5CmFXNW5hRzkxYzJVZ1VHbHNiM1FnUTBFd0hoY05NVGd3TWpJNE1EQXdNREF3V2hj
-Tk1qTXdNekF4TWpNMU9UVTVXakNCanpFTE1Ba0cKQTFVRUJoTUNRa1V4SURBZUJnTlZCQWdURjBK
-eWRYTnpaV3h6TFVOaGNHbDBZV3dnVW1WbmFXOXVNUkV3RHdZRFZRUUhFd2hDY25WegpjMlZzY3pF
-Uk1BOEdBMVVFQ2hNSVJHVnNiMmwwZEdVeE9EQTJCZ05WQkFNVEwwbERRVTVPSUZSTlEwZ2dRWFYw
-YUc5eWFYcGxaQ0JVCmNtRmtaVzFoY21zZ1VHbHNiM1FnVm1Gc2FXUmhkRzl5TUlJQklqQU5CZ2tx
-aGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUEKeGxwM0twWUhYM1d5QXNGaFNrM0x3V2Zu
-R2x4blVERnFGWkEzVW91TVlqL1hpZ2JNa05lRVhJamxrUk9LVDRPUEdmUngvTEF5UmxRUQpqQ012
-NHFoYmtjWDFwN2FyNjNmbHE0U1pOVmNsMTVsN2gwdVQ1OEZ6U2ZubHowdTVya0hmSkltRDQzK21h
-UC84Z3YzNkZSMjdqVzhSCjl3WTRoaytXczRJQjBpRlNkOFNYdjFLcjh3L0ptTVFTRGtpdUcrUmZJ
-aXVid1EvZnk3RWtqNVFXaFBadyttTXhOS25IVUx5M3hZejIKTHdWZmZ0andVdWVhY3ZxTlJDa01Y
-bENsT0FEcWZUOG9TWm9lRFhlaEh2bFBzTENlbUdCb1RLdXJza0lTNjlGMHlQRUg1Z3plMEgrZgo4
-RlJPc0lvS1NzVlEzNEI0Uy9qb0U2N25wc0pQVGRLc05QSlR5UUlEQVFBQm80SUJrekNDQVk4d0RB
-WURWUjBUQVFIL0JBSXdBREFkCkJnTlZIUTRFRmdRVW9GcFk3NnA1eW9ORFJHdFFwelZ1UjgxVVdR
-MHdnY1lHQTFVZEl3U0J2akNCdTRBVXc2MCtwdFlSQUVXQVhEcFgKU29wdDNERU5ubkdoZ1lDa2Zq
-QjhNUXN3Q1FZRFZRUUdFd0pWVXpFOE1Eb0dBMVVFQ2hNelNXNTBaWEp1WlhRZ1EyOXljRzl5WVhS
-cApiMjRnWm05eUlFRnpjMmxuYm1Wa0lFNWhiV1Z6SUdGdVpDQk9kVzFpWlhKek1TOHdMUVlEVlFR
-REV5WkpRMEZPVGlCVWNtRmtaVzFoCmNtc2dRMnhsWVhKcGJtZG9iM1Z6WlNCUWFXeHZkQ0JEUVlJ
-Z0xyQWJldm9hZTUyeTNmNkMydEIwU24zcDdYSm0wVDAyRm9neEtDZk4KaFhrd0RnWURWUjBQQVFI
-L0JBUURBZ2VBTURRR0ExVWRId1F0TUNzd0thQW5vQ1dHSTJoMGRIQTZMeTlqY213dWFXTmhibTR1
-YjNKbgpMM1J0WTJoZmNHbHNiM1F1WTNKc01GRUdBMVVkSUFSS01FZ3dFQVlPS3dZQkJBR0N5UnNC
-QllNN0RBb3dOQVlJS3dZQkJRVUhBZ0V3CktEQW1CZ2dyQmdFRkJRY0NBUllhYUhSMGNITTZMeTlq
-WVM1cFkyRnViaTV2Y21jdmNHbHNiM1F3RFFZSktvWklodmNOQVFFTEJRQUQKZ2dFQkFBdWpaMklj
-UjJEVnJ0YVJyQTU5ZU5ZQ2w0eGNzSk11OERRQ0h2MjhmVGZpL0JpWlk0SXI3RjlrRnk5NkQ3T1o4
-b0xZNXpqZgo0ZEh4RndIUHFIOERoNkpXc3pYdUhXMVphM1htbDBQYUh4Q1dSUzBYb2w4V3NISHBO
-eWdqTUJZZkowb2RWTTg4NVRaMUVsOVNpdUVICm55bkZCZ1NtaUZjOTl1UWQvWURSWnVHdi9BMEh5
-djd5Ujl0a0xFZEQzQTF1TkpCVzRQK0hKR3BkS2tZTDFRNXJVNytvSFZQdE1LS0kKM2lGa1VFc2JP
-NDVBVmQ3dlAvai83SnRBWlBiNmtvT1Y1bFppMkgxUkxjY0d3emRlem5oSmdkME45b2JiMHZuRTQx
-L1VTV2FmZFdSWgpWR2t3UHVxVGhsN3NDdHpySkg4WFkweGN1bStjZkx4MkVBSXdVbk9jYWI0PTwv
-ZHM6WDUwOUNlcnRpZmljYXRlPjwvZHM6WDUwOURhdGE+PC9kczpLZXlJbmZvPjwvZHM6U2lnbmF0
-dXJlPjwvc21kOnNpZ25lZE1hcms+
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/active/Court-Holder-Chinese-Active.smd b/core/src/test/resources/google/registry/tmch/active/Court-Holder-Chinese-Active.smd
deleted file mode 100644
index 9de41e31a..000000000
--- a/core/src/test/resources/google/registry/tmch/active/Court-Holder-Chinese-Active.smd
+++ /dev/null
@@ -1,93 +0,0 @@
-Marks: 证明&标志
-smdID: 000000701526320361385-65535
-U-labels: xn----z33bn7p06br59e, xn--and-qy3f87yx4cc34g, xn--m6t41lkubhz2e
-notBefore: 2018-05-14T17:52:41.385Z
-notAfter: 2022-08-21T08:12:01.925Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il8yNDI5
-NTA5NC0zN2U3LTQwOWQtODM1OS01ZTI1ZjFhNzkxYjQiPjxzbWQ6aWQ+MDAwMDAwNzAxNTI2MzIw
-MzYxMzg1LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo1Mjo0MS4zODVaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0yMVQwODoxMjowMS45MjVaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazpj
-b3VydD48bWFyazppZD4wMDAxNDUxNTAzMDY0NjA2MTUwMzA2NDYwNi0xPC9tYXJrOmlkPjxtYXJr
-Om1hcmtOYW1lPuivgeaYjiZhbXA75qCH5b+XPC9tYXJrOm1hcmtOYW1lPjxtYXJrOmhvbGRlciBl
-bnRpdGxlbWVudD0ib3duZXIiPjxtYXJrOm5hbWU+5p2O5bCP5pa5PC9tYXJrOm5hbWU+PG1hcms6
-b3JnPua1i+ivlTwvbWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpzdHJlZXQ+6aaZ5riv5Lic6Lev
-NuWPt++8jDXlj7fmpbzvvIw45Y+35a6kIDwvbWFyazpzdHJlZXQ+PG1hcms6Y2l0eT7pnZLlspvl
-uII8L21hcms6Y2l0eT48bWFyazpwYz4xMDAwPC9tYXJrOnBjPjxtYXJrOmNjPkNOPC9tYXJrOmNj
-PjwvbWFyazphZGRyPjxtYXJrOnZvaWNlPis4Ni4xMDg0NjU3MTczPC9tYXJrOnZvaWNlPjxtYXJr
-OmZheD4rODYuMTA4NDY1NzE3MzwvbWFyazpmYXg+PG1hcms6ZW1haWw+aW5mb0BleGFtcGxlLmV4
-YW1wbGU8L21hcms6ZW1haWw+PC9tYXJrOmhvbGRlcj48bWFyazpsYWJlbD54bi0tLS16MzNibjdw
-MDZicjU5ZTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tYW5kLXF5M2Y4N3l4NGNjMzRnPC9t
-YXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1tNnQ0MWxrdWJoejJlPC9tYXJrOmxhYmVsPjxtYXJr
-Omdvb2RzQW5kU2VydmljZXM+IOWQieS7ljwvbWFyazpnb29kc0FuZFNlcnZpY2VzPjxtYXJrOnJl
-Zk51bT4xMjM0PC9tYXJrOnJlZk51bT48bWFyazpwcm9EYXRlPjIwMTMtMDEtMDFUMDA6MDA6MDAu
-MDAwWjwvbWFyazpwcm9EYXRlPjxtYXJrOmNjPlVTPC9tYXJrOmNjPjxtYXJrOmNvdXJ0TmFtZT5U
-ZXN0IENvdXJ0PC9tYXJrOmNvdXJ0TmFtZT48L21hcms6Y291cnQ+PC9tYXJrOm1hcms+PGRzOlNp
-Z25hdHVyZSB4bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyIgSWQ9
-Il9hM2YzMjFiOC05OTQ3LTQ3OTItOWM4OS03ZTk5OTNkYTczNmIiPjxkczpTaWduZWRJbmZvPjxk
-czpDYW5vbmljYWxpemF0aW9uTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAw
-MS8xMC94bWwtZXhjLWMxNG4jIi8+PGRzOlNpZ25hdHVyZU1ldGhvZCBBbGdvcml0aG09Imh0dHA6
-Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZHNpZy1tb3JlI3JzYS1zaGEyNTYiLz48ZHM6UmVmZXJl
-bmNlIFVSST0iI18yNDI5NTA5NC0zN2U3LTQwOWQtODM1OS01ZTI1ZjFhNzkxYjQiPjxkczpUcmFu
-c2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5
-L3htbGRzaWcjZW52ZWxvcGVkLXNpZ25hdHVyZSIvPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJo
-dHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+
-PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1s
-ZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1ZT50Z1MwY293eFdGdTk4dVcrSjNydjd4WndXZVRC
-cDdja0lsaUJodUtNY20wPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PGRzOlJlZmVy
-ZW5jZSBVUkk9IiNfNTQ1MDk4N2YtNjYwYS00OTE3LWI3NTktM2ZhNDczYjhmNTBiIj48ZHM6VHJh
-bnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8x
-MC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3Jp
-dGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0
-VmFsdWU+UEZKUEN3ZGEraE9YYXl1ZStjbEM5VjYwaFNUS3Q1cDdNRGRzZzcram1Saz08L2RzOkRp
-Z2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNlPjwvZHM6U2lnbmVkSW5mbz48ZHM6U2lnbmF0dXJlVmFs
-dWUgSWQ9Il81ZjE3M2ZmNy1hY2JmLTRiM2MtOGUxYy1lNjNlYTFlODZjNDAiPlJKMWQ4L0V3Znd6
-cFJPYytsNTVVY0lKb2wwUEZIZnBuVEZDeXE4Y3NkVng0TUJjN1AwNXVuazlSbU5wVVF0ejJTekQ3
-NDArUWdGWnIKc2VUdTI4aWFqQTBNYnpDY2N3NThERlY0MkhBUkJMYjFJaVZnRHBBRWVtbVlRd3VO
-eFpjQzE3eHg3QkIzeXhrTXd0TDNnSnBmQkd3TApYMEdTamRBQjRSWkVVMDgrQnl5ajdmMGErdkFB
-NmZHdGU2MU1sUGhpdElic2JKMEZRUkVxSk1Mb28xTnRLSEM1ekJveENEc3dVQnFYClhmeDduamgy
-UmFRWGRTNmt0bjdNcW5PQko1eFRmTTJ4a2V0d2R3emkzY1FlN2ZNOXkvQy8wbytaU1VZOWRucmh6
-cUc5N2ZBL0R4UDgKY09Lekx3YTlrclVTOERXWVhQc1hUdTJjek5XNUdwcENrWlJPWWc9PTwvZHM6
-U2lnbmF0dXJlVmFsdWU+PGRzOktleUluZm8gSWQ9Il81NDUwOTg3Zi02NjBhLTQ5MTctYjc1OS0z
-ZmE0NzNiOGY1MGIiPjxkczpYNTA5RGF0YT48ZHM6WDUwOUNlcnRpZmljYXRlPk1JSUZPekNDQkNP
-Z0F3SUJBZ0lnTHJBYmV2b2FlNTJ5M2Y2QzJ0QjBTbjNwN1hKbTBUMDJGb2d4S0NmTmhaY3dEUVlK
-S29aSWh2Y04KQVFFTEJRQXdmREVMTUFrR0ExVUVCaE1DVlZNeFBEQTZCZ05WQkFvVE0wbHVkR1Z5
-Ym1WMElFTnZjbkJ2Y21GMGFXOXVJR1p2Y2lCQgpjM05wWjI1bFpDQk9ZVzFsY3lCaGJtUWdUblZ0
-WW1WeWN6RXZNQzBHQTFVRUF4TW1TVU5CVGs0Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5CmFXNW5hRzkx
-YzJVZ1VHbHNiM1FnUTBFd0hoY05NVGd3TWpJNE1EQXdNREF3V2hjTk1qTXdNekF4TWpNMU9UVTVX
-akNCanpFTE1Ba0cKQTFVRUJoTUNRa1V4SURBZUJnTlZCQWdURjBKeWRYTnpaV3h6TFVOaGNHbDBZ
-V3dnVW1WbmFXOXVNUkV3RHdZRFZRUUhFd2hDY25WegpjMlZzY3pFUk1BOEdBMVVFQ2hNSVJHVnNi
-MmwwZEdVeE9EQTJCZ05WQkFNVEwwbERRVTVPSUZSTlEwZ2dRWFYwYUc5eWFYcGxaQ0JVCmNtRmta
-VzFoY21zZ1VHbHNiM1FnVm1Gc2FXUmhkRzl5TUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FR
-OEFNSUlCQ2dLQ0FRRUEKeGxwM0twWUhYM1d5QXNGaFNrM0x3V2ZuR2x4blVERnFGWkEzVW91TVlq
-L1hpZ2JNa05lRVhJamxrUk9LVDRPUEdmUngvTEF5UmxRUQpqQ012NHFoYmtjWDFwN2FyNjNmbHE0
-U1pOVmNsMTVsN2gwdVQ1OEZ6U2ZubHowdTVya0hmSkltRDQzK21hUC84Z3YzNkZSMjdqVzhSCjl3
-WTRoaytXczRJQjBpRlNkOFNYdjFLcjh3L0ptTVFTRGtpdUcrUmZJaXVid1EvZnk3RWtqNVFXaFBa
-dyttTXhOS25IVUx5M3hZejIKTHdWZmZ0andVdWVhY3ZxTlJDa01YbENsT0FEcWZUOG9TWm9lRFhl
-aEh2bFBzTENlbUdCb1RLdXJza0lTNjlGMHlQRUg1Z3plMEgrZgo4RlJPc0lvS1NzVlEzNEI0Uy9q
-b0U2N25wc0pQVGRLc05QSlR5UUlEQVFBQm80SUJrekNDQVk4d0RBWURWUjBUQVFIL0JBSXdBREFk
-CkJnTlZIUTRFRmdRVW9GcFk3NnA1eW9ORFJHdFFwelZ1UjgxVVdRMHdnY1lHQTFVZEl3U0J2akNC
-dTRBVXc2MCtwdFlSQUVXQVhEcFgKU29wdDNERU5ubkdoZ1lDa2ZqQjhNUXN3Q1FZRFZRUUdFd0pW
-VXpFOE1Eb0dBMVVFQ2hNelNXNTBaWEp1WlhRZ1EyOXljRzl5WVhScApiMjRnWm05eUlFRnpjMmxu
-Ym1Wa0lFNWhiV1Z6SUdGdVpDQk9kVzFpWlhKek1TOHdMUVlEVlFRREV5WkpRMEZPVGlCVWNtRmta
-VzFoCmNtc2dRMnhsWVhKcGJtZG9iM1Z6WlNCUWFXeHZkQ0JEUVlJZ0xyQWJldm9hZTUyeTNmNkMy
-dEIwU24zcDdYSm0wVDAyRm9neEtDZk4KaFhrd0RnWURWUjBQQVFIL0JBUURBZ2VBTURRR0ExVWRI
-d1F0TUNzd0thQW5vQ1dHSTJoMGRIQTZMeTlqY213dWFXTmhibTR1YjNKbgpMM1J0WTJoZmNHbHNi
-M1F1WTNKc01GRUdBMVVkSUFSS01FZ3dFQVlPS3dZQkJBR0N5UnNCQllNN0RBb3dOQVlJS3dZQkJR
-VUhBZ0V3CktEQW1CZ2dyQmdFRkJRY0NBUllhYUhSMGNITTZMeTlqWVM1cFkyRnViaTV2Y21jdmNH
-bHNiM1F3RFFZSktvWklodmNOQVFFTEJRQUQKZ2dFQkFBdWpaMkljUjJEVnJ0YVJyQTU5ZU5ZQ2w0
-eGNzSk11OERRQ0h2MjhmVGZpL0JpWlk0SXI3RjlrRnk5NkQ3T1o4b0xZNXpqZgo0ZEh4RndIUHFI
-OERoNkpXc3pYdUhXMVphM1htbDBQYUh4Q1dSUzBYb2w4V3NISHBOeWdqTUJZZkowb2RWTTg4NVRa
-MUVsOVNpdUVICm55bkZCZ1NtaUZjOTl1UWQvWURSWnVHdi9BMEh5djd5Ujl0a0xFZEQzQTF1TkpC
-VzRQK0hKR3BkS2tZTDFRNXJVNytvSFZQdE1LS0kKM2lGa1VFc2JPNDVBVmQ3dlAvai83SnRBWlBi
-NmtvT1Y1bFppMkgxUkxjY0d3emRlem5oSmdkME45b2JiMHZuRTQxL1VTV2FmZFdSWgpWR2t3UHVx
-VGhsN3NDdHpySkg4WFkweGN1bStjZkx4MkVBSXdVbk9jYWI0PTwvZHM6WDUwOUNlcnRpZmljYXRl
-PjwvZHM6WDUwOURhdGE+PC9kczpLZXlJbmZvPjwvZHM6U2lnbmF0dXJlPjwvc21kOnNpZ25lZE1h
-cms+
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/active/Court-Holder-English-Active.smd b/core/src/test/resources/google/registry/tmch/active/Court-Holder-English-Active.smd
deleted file mode 100644
index 7c960d91b..000000000
--- a/core/src/test/resources/google/registry/tmch/active/Court-Holder-English-Active.smd
+++ /dev/null
@@ -1,96 +0,0 @@
-Marks: Test & Validate
-smdID: 000000501526320343199-65535
-U-labels: test---validate, test--validate, test-and-validate, test-andvalidate, test-validate, testand-validate, testandvalidate, testvalidate
-notBefore: 2018-05-14T17:52:23.199Z
-notAfter: 2022-08-21T08:12:19.525Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il81NmY5
-ZjZiMC1kZTAxLTQyYzctYTRlNS1mNTdiZmQ5M2Q5NDQiPjxzbWQ6aWQ+MDAwMDAwNTAxNTI2MzIw
-MzQzMTk5LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo1MjoyMy4xOTlaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0yMVQwODoxMjoxOS41MjVaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazpj
-b3VydD48bWFyazppZD4wMDAxMzYxNTAzMDU2NDc0MTUwMzA1NjQ3NC0xPC9tYXJrOmlkPjxtYXJr
-Om1hcmtOYW1lPlRlc3QgJmFtcDsgVmFsaWRhdGU8L21hcms6bWFya05hbWU+PG1hcms6aG9sZGVy
-IGVudGl0bGVtZW50PSJvd25lciI+PG1hcms6bmFtZT5GcmFuayBXaGl0ZTwvbWFyazpuYW1lPjxt
-YXJrOm9yZz5UZXN0IE9yZ2FuaXphdGlvbjwvbWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpzdHJl
-ZXQ+V2VzdCBBcnF1ZXMgQXZlbnVlIDEwMSA8L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+U3Vubnl2
-YWxlPC9tYXJrOmNpdHk+PG1hcms6c3A+Q0E8L21hcms6c3A+PG1hcms6cGM+MTAwMjMtMzI0MTwv
-bWFyazpwYz48bWFyazpjYz5VUzwvbWFyazpjYz48L21hcms6YWRkcj48bWFyazp2b2ljZT4rMS4z
-MDE0NTU2NjAwPC9tYXJrOnZvaWNlPjxtYXJrOmZheD4rMS4zMDE0NTU2NjAxPC9tYXJrOmZheD48
-bWFyazplbWFpbD5pbmZvQGV4YW1wbGUuZXhhbXBsZTwvbWFyazplbWFpbD48L21hcms6aG9sZGVy
-PjxtYXJrOmxhYmVsPnRlc3QtLS12YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0
-LS12YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0LWFuZC12YWxpZGF0ZTwvbWFy
-azpsYWJlbD48bWFyazpsYWJlbD50ZXN0LWFuZHZhbGlkYXRlPC9tYXJrOmxhYmVsPjxtYXJrOmxh
-YmVsPnRlc3QtdmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+dGVzdGFuZC12YWxpZGF0
-ZTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0YW5kdmFsaWRhdGU8L21hcms6bGFiZWw+PG1h
-cms6bGFiZWw+dGVzdHZhbGlkYXRlPC9tYXJrOmxhYmVsPjxtYXJrOmdvb2RzQW5kU2VydmljZXM+
-Z29sZDwvbWFyazpnb29kc0FuZFNlcnZpY2VzPjxtYXJrOnJlZk51bT4xMjM0PC9tYXJrOnJlZk51
-bT48bWFyazpwcm9EYXRlPjIwMTMtMDEtMDFUMDA6MDA6MDAuMDAwWjwvbWFyazpwcm9EYXRlPjxt
-YXJrOmNjPlVTPC9tYXJrOmNjPjxtYXJrOmNvdXJ0TmFtZT5Ib3ZlPC9tYXJrOmNvdXJ0TmFtZT48
-L21hcms6Y291cnQ+PC9tYXJrOm1hcms+PGRzOlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0cDovL3d3
-dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyIgSWQ9Il9mNTdiOTJiYi05ZjMzLTQ2MDAtODAwMi0z
-ZmIyODY5MmFlOGYiPjxkczpTaWduZWRJbmZvPjxkczpDYW5vbmljYWxpemF0aW9uTWV0aG9kIEFs
-Z29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PGRzOlNp
-Z25hdHVyZU1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZHNp
-Zy1tb3JlI3JzYS1zaGEyNTYiLz48ZHM6UmVmZXJlbmNlIFVSST0iI181NmY5ZjZiMC1kZTAxLTQy
-YzctYTRlNS1mNTdiZmQ5M2Q5NDQiPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3Jp
-dGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjZW52ZWxvcGVkLXNpZ25hdHVy
-ZSIvPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3ht
-bC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09
-Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1
-ZT5Qby90dDBlVzZzdVpBTjIyaWxocHc4YjZUdVVuNzJ1R0NGVFdnUm1OM21ZPTwvZHM6RGlnZXN0
-VmFsdWU+PC9kczpSZWZlcmVuY2U+PGRzOlJlZmVyZW5jZSBVUkk9IiNfYmUyZjIxYTYtZDA3NC00
-ZmI0LWE5NTktMmNhYmUxODMxY2Q1Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29y
-aXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFu
-c2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAx
-LzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+b3c1aVhYdHhlVW5QNEswWXdJa24y
-M2JWa0tHOVU1Q1FzSVoxbUZPZGFsWT08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNlPjwv
-ZHM6U2lnbmVkSW5mbz48ZHM6U2lnbmF0dXJlVmFsdWUgSWQ9Il84N2U2NGVmMy1kODMxLTQyMzkt
-Yjg3ZC05NjI2ZTIzNWQzNTUiPlUyWmgwR3Nnb1dtTUVkbEIvOTNDNmhKWUJ5Q3YyU3lKR0NEcDZw
-NzhKWWxsajA1N200YlRFUllOYURCQzduTnNsUHI3UzYrakJHQTUKczBmSzNGZ0V3UkVMK2VjRWdp
-WU1UMktaK1pza3VRMVIvQk0wMUZ3VTMvUDJZVzJtb1NEY0JGZ2VGNUgyaXFxeTdXY0N4NkI0OE5H
-cgpmdE05NHJ5Vmc3SFhXVFBvWUhCejVmNWFZUU9sQWcwU1ZQeWhieWtaUnBIZHJ4aXhsTmRYM3JU
-djArUDdSeks5clowbkpQdzdBTVI0CnZMZjNuY29RMVNpS2ZKMkVBRml4WmFLbTNoMFJUdStGNGZL
-K2FRUk1CTnpmdERNeEY2WTVjTGt4andPMGJ6TnJvTlVpN0QyTjhseDgKYWxmY3N1QjkzbjBydmtN
-UElEcW90YnZvM0ZDZ09FYXhMRlVFcFE9PTwvZHM6U2lnbmF0dXJlVmFsdWU+PGRzOktleUluZm8g
-SWQ9Il9iZTJmMjFhNi1kMDc0LTRmYjQtYTk1OS0yY2FiZTE4MzFjZDUiPjxkczpYNTA5RGF0YT48
-ZHM6WDUwOUNlcnRpZmljYXRlPk1JSUZPekNDQkNPZ0F3SUJBZ0lnTHJBYmV2b2FlNTJ5M2Y2QzJ0
-QjBTbjNwN1hKbTBUMDJGb2d4S0NmTmhaY3dEUVlKS29aSWh2Y04KQVFFTEJRQXdmREVMTUFrR0Ex
-VUVCaE1DVlZNeFBEQTZCZ05WQkFvVE0wbHVkR1Z5Ym1WMElFTnZjbkJ2Y21GMGFXOXVJR1p2Y2lC
-QgpjM05wWjI1bFpDQk9ZVzFsY3lCaGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF4TW1TVU5CVGs0
-Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5CmFXNW5hRzkxYzJVZ1VHbHNiM1FnUTBFd0hoY05NVGd3TWpJ
-NE1EQXdNREF3V2hjTk1qTXdNekF4TWpNMU9UVTVXakNCanpFTE1Ba0cKQTFVRUJoTUNRa1V4SURB
-ZUJnTlZCQWdURjBKeWRYTnpaV3h6TFVOaGNHbDBZV3dnVW1WbmFXOXVNUkV3RHdZRFZRUUhFd2hD
-Y25WegpjMlZzY3pFUk1BOEdBMVVFQ2hNSVJHVnNiMmwwZEdVeE9EQTJCZ05WQkFNVEwwbERRVTVP
-SUZSTlEwZ2dRWFYwYUc5eWFYcGxaQ0JVCmNtRmtaVzFoY21zZ1VHbHNiM1FnVm1Gc2FXUmhkRzl5
-TUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUEKeGxwM0twWUhYM1d5
-QXNGaFNrM0x3V2ZuR2x4blVERnFGWkEzVW91TVlqL1hpZ2JNa05lRVhJamxrUk9LVDRPUEdmUngv
-TEF5UmxRUQpqQ012NHFoYmtjWDFwN2FyNjNmbHE0U1pOVmNsMTVsN2gwdVQ1OEZ6U2ZubHowdTVy
-a0hmSkltRDQzK21hUC84Z3YzNkZSMjdqVzhSCjl3WTRoaytXczRJQjBpRlNkOFNYdjFLcjh3L0pt
-TVFTRGtpdUcrUmZJaXVid1EvZnk3RWtqNVFXaFBadyttTXhOS25IVUx5M3hZejIKTHdWZmZ0andV
-dWVhY3ZxTlJDa01YbENsT0FEcWZUOG9TWm9lRFhlaEh2bFBzTENlbUdCb1RLdXJza0lTNjlGMHlQ
-RUg1Z3plMEgrZgo4RlJPc0lvS1NzVlEzNEI0Uy9qb0U2N25wc0pQVGRLc05QSlR5UUlEQVFBQm80
-SUJrekNDQVk4d0RBWURWUjBUQVFIL0JBSXdBREFkCkJnTlZIUTRFRmdRVW9GcFk3NnA1eW9ORFJH
-dFFwelZ1UjgxVVdRMHdnY1lHQTFVZEl3U0J2akNCdTRBVXc2MCtwdFlSQUVXQVhEcFgKU29wdDNE
-RU5ubkdoZ1lDa2ZqQjhNUXN3Q1FZRFZRUUdFd0pWVXpFOE1Eb0dBMVVFQ2hNelNXNTBaWEp1WlhR
-Z1EyOXljRzl5WVhScApiMjRnWm05eUlFRnpjMmxuYm1Wa0lFNWhiV1Z6SUdGdVpDQk9kVzFpWlhK
-ek1TOHdMUVlEVlFRREV5WkpRMEZPVGlCVWNtRmtaVzFoCmNtc2dRMnhsWVhKcGJtZG9iM1Z6WlNC
-UWFXeHZkQ0JEUVlJZ0xyQWJldm9hZTUyeTNmNkMydEIwU24zcDdYSm0wVDAyRm9neEtDZk4KaFhr
-d0RnWURWUjBQQVFIL0JBUURBZ2VBTURRR0ExVWRId1F0TUNzd0thQW5vQ1dHSTJoMGRIQTZMeTlq
-Y213dWFXTmhibTR1YjNKbgpMM1J0WTJoZmNHbHNiM1F1WTNKc01GRUdBMVVkSUFSS01FZ3dFQVlP
-S3dZQkJBR0N5UnNCQllNN0RBb3dOQVlJS3dZQkJRVUhBZ0V3CktEQW1CZ2dyQmdFRkJRY0NBUllh
-YUhSMGNITTZMeTlqWVM1cFkyRnViaTV2Y21jdmNHbHNiM1F3RFFZSktvWklodmNOQVFFTEJRQUQK
-Z2dFQkFBdWpaMkljUjJEVnJ0YVJyQTU5ZU5ZQ2w0eGNzSk11OERRQ0h2MjhmVGZpL0JpWlk0SXI3
-RjlrRnk5NkQ3T1o4b0xZNXpqZgo0ZEh4RndIUHFIOERoNkpXc3pYdUhXMVphM1htbDBQYUh4Q1dS
-UzBYb2w4V3NISHBOeWdqTUJZZkowb2RWTTg4NVRaMUVsOVNpdUVICm55bkZCZ1NtaUZjOTl1UWQv
-WURSWnVHdi9BMEh5djd5Ujl0a0xFZEQzQTF1TkpCVzRQK0hKR3BkS2tZTDFRNXJVNytvSFZQdE1L
-S0kKM2lGa1VFc2JPNDVBVmQ3dlAvai83SnRBWlBiNmtvT1Y1bFppMkgxUkxjY0d3emRlem5oSmdk
-ME45b2JiMHZuRTQxL1VTV2FmZFdSWgpWR2t3UHVxVGhsN3NDdHpySkg4WFkweGN1bStjZkx4MkVB
-SXdVbk9jYWI0PTwvZHM6WDUwOUNlcnRpZmljYXRlPjwvZHM6WDUwOURhdGE+PC9kczpLZXlJbmZv
-PjwvZHM6U2lnbmF0dXJlPjwvc21kOnNpZ25lZE1hcms+
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/active/Court-Holder-French-Active.smd b/core/src/test/resources/google/registry/tmch/active/Court-Holder-French-Active.smd
deleted file mode 100644
index 729053bc0..000000000
--- a/core/src/test/resources/google/registry/tmch/active/Court-Holder-French-Active.smd
+++ /dev/null
@@ -1,99 +0,0 @@
-Marks: Essai & évaluation
-smdID: 000000631526320349683-65535
-U-labels: xn--essai---valuation-itb, xn--essai--valuation-hqb, xn--essai-and-valuation-kzb, xn--essai-andvaluation-jwb, xn--essai-valuation-gnb, xn--essaiand-valuation-jwb, xn--essaiandvaluation-itb, xn--essaiet-valuation-itb, xn--essaietvaluation-hqb, xn--essaivaluation-fkb
-notBefore: 2018-05-14T17:52:29.683Z
-notAfter: 2022-08-21T08:12:14.116Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il8wNDQ1
-ODM5Ni1hOTRlLTRlNzktYWQ1Zi1hZjMxYmE2NTIwNWEiPjxzbWQ6aWQ+MDAwMDAwNjMxNTI2MzIw
-MzQ5NjgzLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo1MjoyOS42ODNaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0yMVQwODoxMjoxNC4xMTZaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazpj
-b3VydD48bWFyazppZD4wMDAxMzgxNTAzMDYwNDk2MTUwMzA2MDQ5Ni0xPC9tYXJrOmlkPjxtYXJr
-Om1hcmtOYW1lPkVzc2FpICZhbXA7IMOpdmFsdWF0aW9uPC9tYXJrOm1hcmtOYW1lPjxtYXJrOmhv
-bGRlciBlbnRpdGxlbWVudD0ib3duZXIiPjxtYXJrOm5hbWU+SmVhbiBMZWJsYW5jPC9tYXJrOm5h
-bWU+PG1hcms6b3JnPk9yYW5pc2F0aW9uIGRlIHRlc3Q8L21hcms6b3JnPjxtYXJrOmFkZHI+PG1h
-cms6c3RyZWV0PlJVRSBST0dORSA0MCA8L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+QVJUT0lTPC9t
-YXJrOmNpdHk+PG1hcms6cGM+MjEzMDE8L21hcms6cGM+PG1hcms6Y2M+RlI8L21hcms6Y2M+PC9t
-YXJrOmFkZHI+PG1hcms6dm9pY2U+KzMzLjI2NDk5NTAzMjwvbWFyazp2b2ljZT48bWFyazpmYXg+
-KzMzLjI2NDk5NTAzMzwvbWFyazpmYXg+PG1hcms6ZW1haWw+aW5mb0BleGFtcGxlLmV4YW1wbGU8
-L21hcms6ZW1haWw+PC9tYXJrOmhvbGRlcj48bWFyazpsYWJlbD54bi0tZXNzYWktLS12YWx1YXRp
-b24taXRiPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1lc3NhaS0tdmFsdWF0aW9uLWhxYjwv
-bWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tZXNzYWktYW5kLXZhbHVhdGlvbi1remI8L21hcms6
-bGFiZWw+PG1hcms6bGFiZWw+eG4tLWVzc2FpLWFuZHZhbHVhdGlvbi1qd2I8L21hcms6bGFiZWw+
-PG1hcms6bGFiZWw+eG4tLWVzc2FpLXZhbHVhdGlvbi1nbmI8L21hcms6bGFiZWw+PG1hcms6bGFi
-ZWw+eG4tLWVzc2FpYW5kLXZhbHVhdGlvbi1qd2I8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4t
-LWVzc2FpYW5kdmFsdWF0aW9uLWl0YjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tZXNzYWll
-dC12YWx1YXRpb24taXRiPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1lc3NhaWV0dmFsdWF0
-aW9uLWhxYjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tZXNzYWl2YWx1YXRpb24tZmtiPC9t
-YXJrOmxhYmVsPjxtYXJrOmdvb2RzQW5kU2VydmljZXM+Z3VpdGFyZTwvbWFyazpnb29kc0FuZFNl
-cnZpY2VzPjxtYXJrOnJlZk51bT4xMjM0PC9tYXJrOnJlZk51bT48bWFyazpwcm9EYXRlPjIwMTMt
-MDEtMDFUMDA6MDA6MDAuMDAwWjwvbWFyazpwcm9EYXRlPjxtYXJrOmNjPlVTPC9tYXJrOmNjPjxt
-YXJrOmNvdXJ0TmFtZT5Ib3ZlPC9tYXJrOmNvdXJ0TmFtZT48L21hcms6Y291cnQ+PC9tYXJrOm1h
-cms+PGRzOlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxk
-c2lnIyIgSWQ9Il9mZWEwOTIwMS1kMzQ0LTQzNjQtOGQwYS05NmQzNjJlYjZkMTciPjxkczpTaWdu
-ZWRJbmZvPjxkczpDYW5vbmljYWxpemF0aW9uTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53
-My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PGRzOlNpZ25hdHVyZU1ldGhvZCBBbGdvcml0
-aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZHNpZy1tb3JlI3JzYS1zaGEyNTYiLz48
-ZHM6UmVmZXJlbmNlIFVSST0iI18wNDQ1ODM5Ni1hOTRlLTRlNzktYWQ1Zi1hZjMxYmE2NTIwNWEi
-PjxkczpUcmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9y
-Zy8yMDAwLzA5L3htbGRzaWcjZW52ZWxvcGVkLXNpZ25hdHVyZSIvPjxkczpUcmFuc2Zvcm0gQWxn
-b3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRy
-YW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIw
-MDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1ZT4vUjJRYUhFUEFDSzlvY3FJZ2Ri
-UVFuUlM1YzBTc0h4RjZYTUpGb1p0SytVPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+
-PGRzOlJlZmVyZW5jZSBVUkk9IiNfYWY4NmNiNmUtOTM0Yi00YTk3LThhYjgtNzBmNGU1NDI2OGNj
-Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5v
-cmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRo
-b2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48
-ZHM6RGlnZXN0VmFsdWU+c1NkY0tlbmlMQU5TOEJFcFVCUVU2bHBGS0F2MFJBT2RNRncwRFdoYzZF
-Yz08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNlPjwvZHM6U2lnbmVkSW5mbz48ZHM6U2ln
-bmF0dXJlVmFsdWUgSWQ9Il9jODQ2YWY0Ny04NjAwLTQwNjUtYWI3Ni0xMjU0MzhiZmUzMGIiPmRP
-Vm84amZMMS84YUdnQnhmTjVZeUNIZ240R3ByVFJyUFRqQVkzT2VkNnF6N2NNYmxFcTlUaU1aM2Nv
-eWRwbmY4Mm04UGp1cVJmcFUKODhLenBmVnZMSVhXcUlCTlp1Mm5sVGg5SDFUUFZ1R0xjUDVGZ0M2
-ZHVrV0VnQzJiUm1KZjhwazgzMWFHVElKOVJ3YkR0WHlvVmxRcQp3bWFGQzNLeDA0azlFaFFSdUs0
-UldXdW13K3VXZGc1djFxZjhOWU5uaVhBTFo0SWx3RGZYczV2THhjMCt1RTNOM09tMS80dUNBMjE1
-Cmlyb0Fzc2RqMm5nRk9ZUE1nVHNjanpuMGo3MnNIS3c4S0J4MUd6OUNOelpheFZpZFdiU1FxVnFV
-T1VnSXJiSFNHQ25NZjVRV2ppZG0KOGRqZDV6SUZ0VHBXT1hQNUdjbmg2bEVWa3FqdDBWaTJvazBT
-WWc9PTwvZHM6U2lnbmF0dXJlVmFsdWU+PGRzOktleUluZm8gSWQ9Il9hZjg2Y2I2ZS05MzRiLTRh
-OTctOGFiOC03MGY0ZTU0MjY4Y2MiPjxkczpYNTA5RGF0YT48ZHM6WDUwOUNlcnRpZmljYXRlPk1J
-SUZPekNDQkNPZ0F3SUJBZ0lnTHJBYmV2b2FlNTJ5M2Y2QzJ0QjBTbjNwN1hKbTBUMDJGb2d4S0Nm
-TmhaY3dEUVlKS29aSWh2Y04KQVFFTEJRQXdmREVMTUFrR0ExVUVCaE1DVlZNeFBEQTZCZ05WQkFv
-VE0wbHVkR1Z5Ym1WMElFTnZjbkJ2Y21GMGFXOXVJR1p2Y2lCQgpjM05wWjI1bFpDQk9ZVzFsY3lC
-aGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF4TW1TVU5CVGs0Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5
-CmFXNW5hRzkxYzJVZ1VHbHNiM1FnUTBFd0hoY05NVGd3TWpJNE1EQXdNREF3V2hjTk1qTXdNekF4
-TWpNMU9UVTVXakNCanpFTE1Ba0cKQTFVRUJoTUNRa1V4SURBZUJnTlZCQWdURjBKeWRYTnpaV3h6
-TFVOaGNHbDBZV3dnVW1WbmFXOXVNUkV3RHdZRFZRUUhFd2hDY25WegpjMlZzY3pFUk1BOEdBMVVF
-Q2hNSVJHVnNiMmwwZEdVeE9EQTJCZ05WQkFNVEwwbERRVTVPSUZSTlEwZ2dRWFYwYUc5eWFYcGxa
-Q0JVCmNtRmtaVzFoY21zZ1VHbHNiM1FnVm1Gc2FXUmhkRzl5TUlJQklqQU5CZ2txaGtpRzl3MEJB
-UUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUEKeGxwM0twWUhYM1d5QXNGaFNrM0x3V2ZuR2x4blVERnFG
-WkEzVW91TVlqL1hpZ2JNa05lRVhJamxrUk9LVDRPUEdmUngvTEF5UmxRUQpqQ012NHFoYmtjWDFw
-N2FyNjNmbHE0U1pOVmNsMTVsN2gwdVQ1OEZ6U2ZubHowdTVya0hmSkltRDQzK21hUC84Z3YzNkZS
-MjdqVzhSCjl3WTRoaytXczRJQjBpRlNkOFNYdjFLcjh3L0ptTVFTRGtpdUcrUmZJaXVid1EvZnk3
-RWtqNVFXaFBadyttTXhOS25IVUx5M3hZejIKTHdWZmZ0andVdWVhY3ZxTlJDa01YbENsT0FEcWZU
-OG9TWm9lRFhlaEh2bFBzTENlbUdCb1RLdXJza0lTNjlGMHlQRUg1Z3plMEgrZgo4RlJPc0lvS1Nz
-VlEzNEI0Uy9qb0U2N25wc0pQVGRLc05QSlR5UUlEQVFBQm80SUJrekNDQVk4d0RBWURWUjBUQVFI
-L0JBSXdBREFkCkJnTlZIUTRFRmdRVW9GcFk3NnA1eW9ORFJHdFFwelZ1UjgxVVdRMHdnY1lHQTFV
-ZEl3U0J2akNCdTRBVXc2MCtwdFlSQUVXQVhEcFgKU29wdDNERU5ubkdoZ1lDa2ZqQjhNUXN3Q1FZ
-RFZRUUdFd0pWVXpFOE1Eb0dBMVVFQ2hNelNXNTBaWEp1WlhRZ1EyOXljRzl5WVhScApiMjRnWm05
-eUlFRnpjMmxuYm1Wa0lFNWhiV1Z6SUdGdVpDQk9kVzFpWlhKek1TOHdMUVlEVlFRREV5WkpRMEZP
-VGlCVWNtRmtaVzFoCmNtc2dRMnhsWVhKcGJtZG9iM1Z6WlNCUWFXeHZkQ0JEUVlJZ0xyQWJldm9h
-ZTUyeTNmNkMydEIwU24zcDdYSm0wVDAyRm9neEtDZk4KaFhrd0RnWURWUjBQQVFIL0JBUURBZ2VB
-TURRR0ExVWRId1F0TUNzd0thQW5vQ1dHSTJoMGRIQTZMeTlqY213dWFXTmhibTR1YjNKbgpMM1J0
-WTJoZmNHbHNiM1F1WTNKc01GRUdBMVVkSUFSS01FZ3dFQVlPS3dZQkJBR0N5UnNCQllNN0RBb3dO
-QVlJS3dZQkJRVUhBZ0V3CktEQW1CZ2dyQmdFRkJRY0NBUllhYUhSMGNITTZMeTlqWVM1cFkyRnVi
-aTV2Y21jdmNHbHNiM1F3RFFZSktvWklodmNOQVFFTEJRQUQKZ2dFQkFBdWpaMkljUjJEVnJ0YVJy
-QTU5ZU5ZQ2w0eGNzSk11OERRQ0h2MjhmVGZpL0JpWlk0SXI3RjlrRnk5NkQ3T1o4b0xZNXpqZgo0
-ZEh4RndIUHFIOERoNkpXc3pYdUhXMVphM1htbDBQYUh4Q1dSUzBYb2w4V3NISHBOeWdqTUJZZkow
-b2RWTTg4NVRaMUVsOVNpdUVICm55bkZCZ1NtaUZjOTl1UWQvWURSWnVHdi9BMEh5djd5Ujl0a0xF
-ZEQzQTF1TkpCVzRQK0hKR3BkS2tZTDFRNXJVNytvSFZQdE1LS0kKM2lGa1VFc2JPNDVBVmQ3dlAv
-ai83SnRBWlBiNmtvT1Y1bFppMkgxUkxjY0d3emRlem5oSmdkME45b2JiMHZuRTQxL1VTV2FmZFdS
-WgpWR2t3UHVxVGhsN3NDdHpySkg4WFkweGN1bStjZkx4MkVBSXdVbk9jYWI0PTwvZHM6WDUwOUNl
-cnRpZmljYXRlPjwvZHM6WDUwOURhdGE+PC9kczpLZXlJbmZvPjwvZHM6U2lnbmF0dXJlPjwvc21k
-OnNpZ25lZE1hcms+
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/active/Court-Holder-Russian-Active.smd b/core/src/test/resources/google/registry/tmch/active/Court-Holder-Russian-Active.smd
deleted file mode 100644
index 68d94e8ce..000000000
--- a/core/src/test/resources/google/registry/tmch/active/Court-Holder-Russian-Active.smd
+++ /dev/null
@@ -1,99 +0,0 @@
-Marks: Сертификация & логотип
-smdID: 000000671526320355540-65535
-U-labels: xn------5cdshvabepr3bbqcpum2a9b4n, xn-----6kcogsabdop0bbpcotl1a7b8m, xn---and--3ve0aj1aabgrv9bbscrwo4a3c9n, xn---and-43dwiyabfqt6bbrcqvn3a1c0o, xn----7sbkfpabcnn7abocnsk0a5bzn, xn--and--43dwiyabfqt6bbrcqvn3a1c0o, xn--and-5cdshvabepr3bbqcpum2a9b4n, xn--80agemabbml4abncmrjz3b2m
-notBefore: 2018-05-14T17:52:35.540Z
-notAfter: 2022-08-21T08:12:08.921Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il82MDE3
-YWQxYy01NzE0LTRjMDEtOTg0OC1iZWYyZjVmYzc2NTUiPjxzbWQ6aWQ+MDAwMDAwNjcxNTI2MzIw
-MzU1NTQwLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo1MjozNS41NDBaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0yMVQwODoxMjowOC45MjFaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazpj
-b3VydD48bWFyazppZD4wMDAxNDAxNTAzMDYzMjQ3MTUwMzA2MzI0Ny0xPC9tYXJrOmlkPjxtYXJr
-Om1hcmtOYW1lPtCh0LXRgNGC0LjRhNC40LrQsNGG0LjRjyAmYW1wOyDQu9C+0LPQvtGC0LjQvzwv
-bWFyazptYXJrTmFtZT48bWFyazpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpuYW1l
-PtCd0LDRgtCw0LvRjNGPINCQ0L3RgtC+0L3QvtCy0LA8L21hcms6bmFtZT48bWFyazpvcmc+0JDQ
-vdGC0L7QvdC+0LLQsDwvbWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpzdHJlZXQ+0J/RgNC+0YHQ
-v9C10LrRgiDQktC10YDQvdCw0LTRgdC60L7Qs9C+IDE1PC9tYXJrOnN0cmVldD48bWFyazpjaXR5
-PtCc0L7RgdC60LLQsDwvbWFyazpjaXR5PjxtYXJrOnBjPjExNzQ4NTwvbWFyazpwYz48bWFyazpj
-Yz5SVTwvbWFyazpjYz48L21hcms6YWRkcj48bWFyazp2b2ljZT4rNy45MTg4MjIxNjc0PC9tYXJr
-OnZvaWNlPjxtYXJrOmVtYWlsPmluZm9AZXhhbXBsZS5leGFtcGxlPC9tYXJrOmVtYWlsPjwvbWFy
-azpob2xkZXI+PG1hcms6bGFiZWw+eG4tLS0tLS01Y2RzaHZhYmVwcjNiYnFjcHVtMmE5YjRuPC9t
-YXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS0tLS02a2NvZ3NhYmRvcDBiYnBjb3RsMWE3YjhtPC9t
-YXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS0tYW5kLS0zdmUwYWoxYWFiZ3J2OWJic2Nyd280YTNj
-OW48L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLS1hbmQtNDNkd2l5YWJmcXQ2YmJyY3F2bjNh
-MWMwbzwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tLS03c2JrZnBhYmNubjdhYm9jbnNrMGE1
-YnpuPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1hbmQtLTQzZHdpeWFiZnF0NmJicmNxdm4z
-YTFjMG88L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLWFuZC01Y2RzaHZhYmVwcjNiYnFjcHVt
-MmE5YjRuPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS04MGFnZW1hYmJtbDRhYm5jbXJqejNi
-Mm08L21hcms6bGFiZWw+PG1hcms6Z29vZHNBbmRTZXJ2aWNlcz5ndWl0YXI8L21hcms6Z29vZHNB
-bmRTZXJ2aWNlcz48bWFyazpyZWZOdW0+MTIzNDwvbWFyazpyZWZOdW0+PG1hcms6cHJvRGF0ZT4y
-MDEzLTAxLTAxVDAwOjAwOjAwLjAwMFo8L21hcms6cHJvRGF0ZT48bWFyazpjYz5VUzwvbWFyazpj
-Yz48bWFyazpjb3VydE5hbWU+SG92ZTwvbWFyazpjb3VydE5hbWU+PC9tYXJrOmNvdXJ0PjwvbWFy
-azptYXJrPjxkczpTaWduYXR1cmUgeG1sbnM6ZHM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkv
-eG1sZHNpZyMiIElkPSJfZTU4ZDE5MzAtNjRjNi00N2EyLTk3ZDItMGU3ZGQ3ODY4NjUxIj48ZHM6
-U2lnbmVkSW5mbz48ZHM6Q2Fub25pY2FsaXphdGlvbk1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93
-d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjxkczpTaWduYXR1cmVNZXRob2QgQWxn
-b3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGRzaWctbW9yZSNyc2Etc2hhMjU2
-Ii8+PGRzOlJlZmVyZW5jZSBVUkk9IiNfNjAxN2FkMWMtNTcxNC00YzAxLTk4NDgtYmVmMmY1ZmM3
-NjU1Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53
-My5vcmcvMjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48ZHM6VHJhbnNmb3Jt
-IEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9k
-czpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9y
-Zy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+T0NFUlcxYWVrdkhUWWZZ
-UUZadVkwbUdpanlXYWwyQ09heklZRk9NTUZCTT08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJl
-bmNlPjxkczpSZWZlcmVuY2UgVVJJPSIjXzE5ODYwMmNjLWFiNGItNGEzNC04NjAzLTUzZGM0MzVk
-YmVmNSI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cu
-dzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6RGlnZXN0
-TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxlbmMjc2hhMjU2
-Ii8+PGRzOkRpZ2VzdFZhbHVlPlVNbW5uazB2MTM1NzJEN3FxMVYzZXI1eUtQcmNpbkRYcHNVUXVE
-Z3lURDQ9PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48L2RzOlNpZ25lZEluZm8+PGRz
-OlNpZ25hdHVyZVZhbHVlIElkPSJfZTVmODNjZGItZTgxNi00NDRkLTg3NDktODZkODZiY2YyNjBh
-Ij5xQ1I1VDFiamV1TVJSZWgvNTRSeEphTUdIdTNSNmJlVy94cWRiMUJ2bDN0Y3VXU3FtYVdEaGow
-SXlWQVlibURQYS8ybHJoYmpMVTI2CnRacG9aWGRuU2lOdERkQ3F5NmN3WVdITlRpU1NTdDc2dzA4
-cncrV21GOGQ3UklnOGdPQVdUUWxhM0RNdk4waFNsZHZDb3JjNjBPdlIKeWtrWFU3cGhPZVFnUHBH
-VjcrNmY5a01nUndUQ0pGdy9TK25GZDI3ekR5c1Bwb01mbEZTVVdTTE44QXhZZkxsZThxUVdQdzVS
-Y2ppdwoxV3JIeHBveFp0T3RFUms5YzZvRzFlUlNGclQ5ZEJMY0JoYWFnWEJPNkxOOHk4WE1IZzdn
-dGQ3ZVozZUtJR3dHdVZPSTNPTmFML0dzCkdBNWljUnhYWDZaYVhUZUl4dXE4ZEV1Y2oxNVN0cExI
-TjE4L0JRPT08L2RzOlNpZ25hdHVyZVZhbHVlPjxkczpLZXlJbmZvIElkPSJfMTk4NjAyY2MtYWI0
-Yi00YTM0LTg2MDMtNTNkYzQzNWRiZWY1Ij48ZHM6WDUwOURhdGE+PGRzOlg1MDlDZXJ0aWZpY2F0
-ZT5NSUlGT3pDQ0JDT2dBd0lCQWdJZ0xyQWJldm9hZTUyeTNmNkMydEIwU24zcDdYSm0wVDAyRm9n
-eEtDZk5oWmN3RFFZSktvWklodmNOCkFRRUxCUUF3ZkRFTE1Ba0dBMVVFQmhNQ1ZWTXhQREE2QmdO
-VkJBb1RNMGx1ZEdWeWJtVjBJRU52Y25CdmNtRjBhVzl1SUdadmNpQkIKYzNOcFoyNWxaQ0JPWVcx
-bGN5QmhibVFnVG5WdFltVnljekV2TUMwR0ExVUVBeE1tU1VOQlRrNGdWSEpoWkdWdFlYSnJJRU5z
-WldGeQphVzVuYUc5MWMyVWdVR2xzYjNRZ1EwRXdIaGNOTVRnd01qSTRNREF3TURBd1doY05Nak13
-TXpBeE1qTTFPVFU1V2pDQmp6RUxNQWtHCkExVUVCaE1DUWtVeElEQWVCZ05WQkFnVEYwSnlkWE56
-Wld4ekxVTmhjR2wwWVd3Z1VtVm5hVzl1TVJFd0R3WURWUVFIRXdoQ2NuVnoKYzJWc2N6RVJNQThH
-QTFVRUNoTUlSR1ZzYjJsMGRHVXhPREEyQmdOVkJBTVRMMGxEUVU1T0lGUk5RMGdnUVhWMGFHOXlh
-WHBsWkNCVQpjbUZrWlcxaGNtc2dVR2xzYjNRZ1ZtRnNhV1JoZEc5eU1JSUJJakFOQmdrcWhraUc5
-dzBCQVFFRkFBT0NBUThBTUlJQkNnS0NBUUVBCnhscDNLcFlIWDNXeUFzRmhTazNMd1dmbkdseG5V
-REZxRlpBM1VvdU1Zai9YaWdiTWtOZUVYSWpsa1JPS1Q0T1BHZlJ4L0xBeVJsUVEKakNNdjRxaGJr
-Y1gxcDdhcjYzZmxxNFNaTlZjbDE1bDdoMHVUNThGelNmbmx6MHU1cmtIZkpJbUQ0MyttYVAvOGd2
-MzZGUjI3alc4Ugo5d1k0aGsrV3M0SUIwaUZTZDhTWHYxS3I4dy9KbU1RU0RraXVHK1JmSWl1YndR
-L2Z5N0VrajVRV2hQWncrbU14TktuSFVMeTN4WXoyCkx3VmZmdGp3VXVlYWN2cU5SQ2tNWGxDbE9B
-RHFmVDhvU1pvZURYZWhIdmxQc0xDZW1HQm9US3Vyc2tJUzY5RjB5UEVINWd6ZTBIK2YKOEZST3NJ
-b0tTc1ZRMzRCNFMvam9FNjducHNKUFRkS3NOUEpUeVFJREFRQUJvNElCa3pDQ0FZOHdEQVlEVlIw
-VEFRSC9CQUl3QURBZApCZ05WSFE0RUZnUVVvRnBZNzZwNXlvTkRSR3RRcHpWdVI4MVVXUTB3Z2NZ
-R0ExVWRJd1NCdmpDQnU0QVV3NjArcHRZUkFFV0FYRHBYClNvcHQzREVObm5HaGdZQ2tmakI4TVFz
-d0NRWURWUVFHRXdKVlV6RThNRG9HQTFVRUNoTXpTVzUwWlhKdVpYUWdRMjl5Y0c5eVlYUnAKYjI0
-Z1ptOXlJRUZ6YzJsbmJtVmtJRTVoYldWeklHRnVaQ0JPZFcxaVpYSnpNUzh3TFFZRFZRUURFeVpK
-UTBGT1RpQlVjbUZrWlcxaApjbXNnUTJ4bFlYSnBibWRvYjNWelpTQlFhV3h2ZENCRFFZSWdMckFi
-ZXZvYWU1MnkzZjZDMnRCMFNuM3A3WEptMFQwMkZvZ3hLQ2ZOCmhYa3dEZ1lEVlIwUEFRSC9CQVFE
-QWdlQU1EUUdBMVVkSHdRdE1Dc3dLYUFub0NXR0kyaDBkSEE2THk5amNtd3VhV05oYm00dWIzSm4K
-TDNSdFkyaGZjR2xzYjNRdVkzSnNNRkVHQTFVZElBUktNRWd3RUFZT0t3WUJCQUdDeVJzQkJZTTdE
-QW93TkFZSUt3WUJCUVVIQWdFdwpLREFtQmdnckJnRUZCUWNDQVJZYWFIUjBjSE02THk5allTNXBZ
-MkZ1Ymk1dmNtY3ZjR2xzYjNRd0RRWUpLb1pJaHZjTkFRRUxCUUFECmdnRUJBQXVqWjJJY1IyRFZy
-dGFSckE1OWVOWUNsNHhjc0pNdThEUUNIdjI4ZlRmaS9CaVpZNElyN0Y5a0Z5OTZEN09aOG9MWTV6
-amYKNGRIeEZ3SFBxSDhEaDZKV3N6WHVIVzFaYTNYbWwwUGFIeENXUlMwWG9sOFdzSEhwTnlnak1C
-WWZKMG9kVk04ODVUWjFFbDlTaXVFSApueW5GQmdTbWlGYzk5dVFkL1lEUlp1R3YvQTBIeXY3eVI5
-dGtMRWREM0ExdU5KQlc0UCtISkdwZEtrWUwxUTVyVTcrb0hWUHRNS0tJCjNpRmtVRXNiTzQ1QVZk
-N3ZQL2ovN0p0QVpQYjZrb09WNWxaaTJIMVJMY2NHd3pkZXpuaEpnZDBOOW9iYjB2bkU0MS9VU1dh
-ZmRXUloKVkdrd1B1cVRobDdzQ3R6ckpIOFhZMHhjdW0rY2ZMeDJFQUl3VW5PY2FiND08L2RzOlg1
-MDlDZXJ0aWZpY2F0ZT48L2RzOlg1MDlEYXRhPjwvZHM6S2V5SW5mbz48L2RzOlNpZ25hdHVyZT48
-L3NtZDpzaWduZWRNYXJrPg==
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/active/Trademark-Agent-Arab-Active.smd b/core/src/test/resources/google/registry/tmch/active/Trademark-Agent-Arab-Active.smd
deleted file mode 100644
index 556909e63..000000000
--- a/core/src/test/resources/google/registry/tmch/active/Trademark-Agent-Arab-Active.smd
+++ /dev/null
@@ -1,99 +0,0 @@
-Marks: الاختبار & لتقييم
-smdID: 000000771526320375015-65535
-U-labels: xn------nzeaagpf7azb2ppajr3fa, xn-----btdaafne4a7azpoaiq8ea, xn----ymcaaeld1a4a6onahp3ea, xn--mgbaadjcy1a8mmago8da
-notBefore: 2018-05-14T17:52:55.015Z
-notAfter: 2022-08-18T14:27:18.209Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il85NWNl
-ZjgzNC0wZTkxLTQ1ODQtOGNiYy1iNmFiMDU1ZmFlOWYiPjxzbWQ6aWQ+MDAwMDAwNzcxNTI2MzIw
-Mzc1MDE1LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo1Mjo1NS4wMTVaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0xOFQxNDoyNzoxOC4yMDlaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
-cmFkZW1hcms+PG1hcms6aWQ+MDAwMTQ0MTUwMzA2NjE5NTE1MDMwNjYxOTUtMTwvbWFyazppZD48
-bWFyazptYXJrTmFtZT7Yp9mE2KfYrtiq2KjYp9ixICZhbXA7INmE2KrZgtmK2YrZhTwvbWFyazpt
-YXJrTmFtZT48bWFyazpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpuYW1lPtmF2YfZ
-htiv2LMg2KfZhNmF2LnZhNmI2YXYp9iq2YrYqTwvbWFyazpuYW1lPjxtYXJrOmFkZHI+PG1hcms6
-c3RyZWV0Ptis2LnZgdixINin2KjZhiDYs9mK2YbYp9ihIDc1PC9tYXJrOnN0cmVldD48bWFyazpj
-aXR5PtmF2YPZhtin2LM8L21hcms6Y2l0eT48bWFyazpwYz4yOTAwPC9tYXJrOnBjPjxtYXJrOmNj
-Pk1BPC9tYXJrOmNjPjwvbWFyazphZGRyPjwvbWFyazpob2xkZXI+PG1hcms6Y29udGFjdCB0eXBl
-PSJhZ2VudCI+PG1hcms6bmFtZT7ZhdmH2YbYr9izINin2YTZhdi52YTZiNmF2KfYqtmK2Kk8L21h
-cms6bmFtZT48bWFyazpvcmc+2YjZg9in2YTYqTwvbWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpz
-dHJlZXQ+2LTYp9ix2Lkg2KzYudmB2LEg2KfYqNmGINiz2YrZhtin2KEgNzU8L21hcms6c3RyZWV0
-PjxtYXJrOmNpdHk+2YXZg9mG2KfYszwvbWFyazpjaXR5PjxtYXJrOnBjPjI5MDA8L21hcms6cGM+
-PG1hcms6Y2M+TUE8L21hcms6Y2M+PC9tYXJrOmFkZHI+PG1hcms6dm9pY2U+KzIxMi41MjI1Mzkw
-NDA8L21hcms6dm9pY2U+PG1hcms6ZmF4PisyMTIuNTIyNTM5MDQxPC9tYXJrOmZheD48bWFyazpl
-bWFpbD5pbmZvQGFnZW5jeS1tYXJvY2NvLmNvbTwvbWFyazplbWFpbD48L21hcms6Y29udGFjdD48
-bWFyazpqdXJpc2RpY3Rpb24+VVM8L21hcms6anVyaXNkaWN0aW9uPjxtYXJrOmNsYXNzPjE1PC9t
-YXJrOmNsYXNzPjxtYXJrOmxhYmVsPnhuLS0tLS0tbnplYWFncGY3YXpiMnBwYWpyM2ZhPC9tYXJr
-OmxhYmVsPjxtYXJrOmxhYmVsPnhuLS0tLS1idGRhYWZuZTRhN2F6cG9haXE4ZWE8L21hcms6bGFi
-ZWw+PG1hcms6bGFiZWw+eG4tLS0teW1jYWFlbGQxYTRhNm9uYWhwM2VhPC9tYXJrOmxhYmVsPjxt
-YXJrOmxhYmVsPnhuLS1tZ2JhYWRqY3kxYThtbWFnbzhkYTwvbWFyazpsYWJlbD48bWFyazpnb29k
-c0FuZFNlcnZpY2VzPti62YrYqtin2LE8L21hcms6Z29vZHNBbmRTZXJ2aWNlcz48bWFyazpyZWdO
-dW0+MTIzNDwvbWFyazpyZWdOdW0+PG1hcms6cmVnRGF0ZT4yMDEzLTAxLTAxVDAwOjAwOjAwLjAw
-MFo8L21hcms6cmVnRGF0ZT48L21hcms6dHJhZGVtYXJrPjwvbWFyazptYXJrPjxkczpTaWduYXR1
-cmUgeG1sbnM6ZHM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1sZHNpZyMiIElkPSJfOGU0
-ZGUzYTMtNjAyZC00ZWM2LThiOWYtODIxN2UzY2I4ZDY3Ij48ZHM6U2lnbmVkSW5mbz48ZHM6Q2Fu
-b25pY2FsaXphdGlvbk1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAv
-eG1sLWV4Yy1jMTRuIyIvPjxkczpTaWduYXR1cmVNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3
-LnczLm9yZy8yMDAxLzA0L3htbGRzaWctbW9yZSNyc2Etc2hhMjU2Ii8+PGRzOlJlZmVyZW5jZSBV
-Ukk9IiNfOTVjZWY4MzQtMGU5MS00NTg0LThjYmMtYjZhYjA1NWZhZTlmIj48ZHM6VHJhbnNmb3Jt
-cz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxk
-c2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDov
-L3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpE
-aWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNz
-aGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+RFFpMjZGVVFsRW1WYU41TkFPN2VFUVIwVGhZa2d2Tit2
-YzdKN0ZqV0FtUT08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNlPjxkczpSZWZlcmVuY2Ug
-VVJJPSIjX2ZkZTI3NjYxLTI5ZWMtNDAxMS1hODlkLThjODc0M2ViZWE3MiI+PGRzOlRyYW5zZm9y
-bXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1s
-LWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0i
-aHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxlbmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVl
-PjVxSjR0Q2o5Slg0ZXQ5ZERpdEliNUVreUQrVlhCRFJ3bi9mQ3VtK1JjZEU9PC9kczpEaWdlc3RW
-YWx1ZT48L2RzOlJlZmVyZW5jZT48L2RzOlNpZ25lZEluZm8+PGRzOlNpZ25hdHVyZVZhbHVlIElk
-PSJfNTBmY2QzMDYtZGFkZi00M2M0LWI3MzMtNjFkNTMyZGI3NTZkIj5JeWpBZFgzMW5YOGN2bkov
-dFFZRURFZ04rWGF1SWJPemlqTWV4R1ZPTEhIblpqaTgwb0Q0Mjg3VHNwWUt0b2ZVczM3ZURuenc1
-ZVZ2CmdqazUvcnlleis3Wi8rVVYwVEpGeFhGc3ZDS3p1dHZyQkF3YzJvR3Z3Ni9XcjVtNW1SWkh6
-eit2eTJ3SWhaYytIRmx5a1NNdm84a0IKaXVJUFUreHRXZ0FvSFRrNUtMRktYZDhPT3duOFdMbElh
-WDlpMlVqYzdZemY0VEh5dlRJcGthSjZVS2U5Z2pIZ3VaN0NHME9TeFVqYgp5WTErZTBhMWFNZllU
-cWFFVUVEb2ErbjVuMVorQkVRajlzR2ZkUWYwS0FraE1vQmVVVUZGazVWNDFPZTJlRngwN1EybXYv
-ZG5HRzQyCmV5SzQ0czBhQWNtdUtMUEtDSlFkUHpsMlFBZUlMaVFCYTFQcVBnPT08L2RzOlNpZ25h
-dHVyZVZhbHVlPjxkczpLZXlJbmZvIElkPSJfZmRlMjc2NjEtMjllYy00MDExLWE4OWQtOGM4NzQz
-ZWJlYTcyIj48ZHM6WDUwOURhdGE+PGRzOlg1MDlDZXJ0aWZpY2F0ZT5NSUlGT3pDQ0JDT2dBd0lC
-QWdJZ0xyQWJldm9hZTUyeTNmNkMydEIwU24zcDdYSm0wVDAyRm9neEtDZk5oWmN3RFFZSktvWklo
-dmNOCkFRRUxCUUF3ZkRFTE1Ba0dBMVVFQmhNQ1ZWTXhQREE2QmdOVkJBb1RNMGx1ZEdWeWJtVjBJ
-RU52Y25CdmNtRjBhVzl1SUdadmNpQkIKYzNOcFoyNWxaQ0JPWVcxbGN5QmhibVFnVG5WdFltVnlj
-ekV2TUMwR0ExVUVBeE1tU1VOQlRrNGdWSEpoWkdWdFlYSnJJRU5zWldGeQphVzVuYUc5MWMyVWdV
-R2xzYjNRZ1EwRXdIaGNOTVRnd01qSTRNREF3TURBd1doY05Nak13TXpBeE1qTTFPVFU1V2pDQmp6
-RUxNQWtHCkExVUVCaE1DUWtVeElEQWVCZ05WQkFnVEYwSnlkWE56Wld4ekxVTmhjR2wwWVd3Z1Vt
-Vm5hVzl1TVJFd0R3WURWUVFIRXdoQ2NuVnoKYzJWc2N6RVJNQThHQTFVRUNoTUlSR1ZzYjJsMGRH
-VXhPREEyQmdOVkJBTVRMMGxEUVU1T0lGUk5RMGdnUVhWMGFHOXlhWHBsWkNCVQpjbUZrWlcxaGNt
-c2dVR2xzYjNRZ1ZtRnNhV1JoZEc5eU1JSUJJakFOQmdrcWhraUc5dzBCQVFFRkFBT0NBUThBTUlJ
-QkNnS0NBUUVBCnhscDNLcFlIWDNXeUFzRmhTazNMd1dmbkdseG5VREZxRlpBM1VvdU1Zai9YaWdi
-TWtOZUVYSWpsa1JPS1Q0T1BHZlJ4L0xBeVJsUVEKakNNdjRxaGJrY1gxcDdhcjYzZmxxNFNaTlZj
-bDE1bDdoMHVUNThGelNmbmx6MHU1cmtIZkpJbUQ0MyttYVAvOGd2MzZGUjI3alc4Ugo5d1k0aGsr
-V3M0SUIwaUZTZDhTWHYxS3I4dy9KbU1RU0RraXVHK1JmSWl1YndRL2Z5N0VrajVRV2hQWncrbU14
-TktuSFVMeTN4WXoyCkx3VmZmdGp3VXVlYWN2cU5SQ2tNWGxDbE9BRHFmVDhvU1pvZURYZWhIdmxQ
-c0xDZW1HQm9US3Vyc2tJUzY5RjB5UEVINWd6ZTBIK2YKOEZST3NJb0tTc1ZRMzRCNFMvam9FNjdu
-cHNKUFRkS3NOUEpUeVFJREFRQUJvNElCa3pDQ0FZOHdEQVlEVlIwVEFRSC9CQUl3QURBZApCZ05W
-SFE0RUZnUVVvRnBZNzZwNXlvTkRSR3RRcHpWdVI4MVVXUTB3Z2NZR0ExVWRJd1NCdmpDQnU0QVV3
-NjArcHRZUkFFV0FYRHBYClNvcHQzREVObm5HaGdZQ2tmakI4TVFzd0NRWURWUVFHRXdKVlV6RThN
-RG9HQTFVRUNoTXpTVzUwWlhKdVpYUWdRMjl5Y0c5eVlYUnAKYjI0Z1ptOXlJRUZ6YzJsbmJtVmtJ
-RTVoYldWeklHRnVaQ0JPZFcxaVpYSnpNUzh3TFFZRFZRUURFeVpKUTBGT1RpQlVjbUZrWlcxaApj
-bXNnUTJ4bFlYSnBibWRvYjNWelpTQlFhV3h2ZENCRFFZSWdMckFiZXZvYWU1MnkzZjZDMnRCMFNu
-M3A3WEptMFQwMkZvZ3hLQ2ZOCmhYa3dEZ1lEVlIwUEFRSC9CQVFEQWdlQU1EUUdBMVVkSHdRdE1D
-c3dLYUFub0NXR0kyaDBkSEE2THk5amNtd3VhV05oYm00dWIzSm4KTDNSdFkyaGZjR2xzYjNRdVkz
-SnNNRkVHQTFVZElBUktNRWd3RUFZT0t3WUJCQUdDeVJzQkJZTTdEQW93TkFZSUt3WUJCUVVIQWdF
-dwpLREFtQmdnckJnRUZCUWNDQVJZYWFIUjBjSE02THk5allTNXBZMkZ1Ymk1dmNtY3ZjR2xzYjNR
-d0RRWUpLb1pJaHZjTkFRRUxCUUFECmdnRUJBQXVqWjJJY1IyRFZydGFSckE1OWVOWUNsNHhjc0pN
-dThEUUNIdjI4ZlRmaS9CaVpZNElyN0Y5a0Z5OTZEN09aOG9MWTV6amYKNGRIeEZ3SFBxSDhEaDZK
-V3N6WHVIVzFaYTNYbWwwUGFIeENXUlMwWG9sOFdzSEhwTnlnak1CWWZKMG9kVk04ODVUWjFFbDlT
-aXVFSApueW5GQmdTbWlGYzk5dVFkL1lEUlp1R3YvQTBIeXY3eVI5dGtMRWREM0ExdU5KQlc0UCtI
-SkdwZEtrWUwxUTVyVTcrb0hWUHRNS0tJCjNpRmtVRXNiTzQ1QVZkN3ZQL2ovN0p0QVpQYjZrb09W
-NWxaaTJIMVJMY2NHd3pkZXpuaEpnZDBOOW9iYjB2bkU0MS9VU1dhZmRXUloKVkdrd1B1cVRobDdz
-Q3R6ckpIOFhZMHhjdW0rY2ZMeDJFQUl3VW5PY2FiND08L2RzOlg1MDlDZXJ0aWZpY2F0ZT48L2Rz
-Olg1MDlEYXRhPjwvZHM6S2V5SW5mbz48L2RzOlNpZ25hdHVyZT48L3NtZDpzaWduZWRNYXJrPg==
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/active/Trademark-Agent-Chinese-Active.smd b/core/src/test/resources/google/registry/tmch/active/Trademark-Agent-Chinese-Active.smd
deleted file mode 100644
index bd40b269f..000000000
--- a/core/src/test/resources/google/registry/tmch/active/Trademark-Agent-Chinese-Active.smd
+++ /dev/null
@@ -1,98 +0,0 @@
-Marks: 审判&错误
-smdID: 000000801526320380861-65535
-U-labels: xn----ke8al50aln4ceuj, xn--and-ui2eu74b9t4egon, xn--et-pg5cw37ax04dfrl, xn--fcr14u8t4bdxh
-notBefore: 2018-05-14T17:53:00.861Z
-notAfter: 2022-08-18T14:36:50.931Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il8wMDE5
-NmU0Ni1iYjE3LTQxNzgtYWU5MS1kMTNlZmM5MDU5YzEiPjxzbWQ6aWQ+MDAwMDAwODAxNTI2MzIw
-MzgwODYxLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo1MzowMC44NjFaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0xOFQxNDozNjo1MC45MzFaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
-cmFkZW1hcms+PG1hcms6aWQ+MDAwMTQ2MTUwMzA2Njc5NTE1MDMwNjY3OTUtMTwvbWFyazppZD48
-bWFyazptYXJrTmFtZT7lrqHliKQmYW1wO+mUmeivrzwvbWFyazptYXJrTmFtZT48bWFyazpob2xk
-ZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpvcmc+5bel56iL5aSEPC9tYXJrOm9yZz48bWFy
-azphZGRyPjxtYXJrOnN0cmVldD7pppnmuK/kuJzot6825Y+377yMNeWPt+alvO+8jDjlj7flrqQ8
-L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+6Z2S5bKb5biCPC9tYXJrOmNpdHk+PG1hcms6cGM+MzUw
-MDwvbWFyazpwYz48bWFyazpjYz5DTjwvbWFyazpjYz48L21hcms6YWRkcj48L21hcms6aG9sZGVy
-PjxtYXJrOmNvbnRhY3QgdHlwZT0iYWdlbnQiPjxtYXJrOm5hbWU+5p2O5bCP5pa5PC9tYXJrOm5h
-bWU+PG1hcms6b3JnPuW3peeoi+WkhDwvbWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpzdHJlZXQ+
-6aaZ5riv5Lic6LevNuWPt++8jDXlj7fmpbzvvIw45Y+35a6kPC9tYXJrOnN0cmVldD48bWFyazpj
-aXR5PumdkuWym+W4gjwvbWFyazpjaXR5PjxtYXJrOnBjPjM1MDA8L21hcms6cGM+PG1hcms6Y2M+
-Q048L21hcms6Y2M+PC9tYXJrOmFkZHI+PG1hcms6dm9pY2U+Kzg2LjEwODQ2NTcxNzM8L21hcms6
-dm9pY2U+PG1hcms6ZmF4Pis4Ni4xMDg0NjU3MTc1PC9tYXJrOmZheD48bWFyazplbWFpbD5pbmZv
-QGNoaW5lc2UtYWdlbmN5LmNvbTwvbWFyazplbWFpbD48L21hcms6Y29udGFjdD48bWFyazpqdXJp
-c2RpY3Rpb24+VVM8L21hcms6anVyaXNkaWN0aW9uPjxtYXJrOmNsYXNzPjE1PC9tYXJrOmNsYXNz
-PjxtYXJrOmxhYmVsPnhuLS0tLWtlOGFsNTBhbG40Y2V1ajwvbWFyazpsYWJlbD48bWFyazpsYWJl
-bD54bi0tYW5kLXVpMmV1NzRiOXQ0ZWdvbjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tZXQt
-cGc1Y3czN2F4MDRkZnJsPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1mY3IxNHU4dDRiZHho
-PC9tYXJrOmxhYmVsPjxtYXJrOmdvb2RzQW5kU2VydmljZXM+5ZCJ5LuWPC9tYXJrOmdvb2RzQW5k
-U2VydmljZXM+PG1hcms6cmVnTnVtPjEyMzQ8L21hcms6cmVnTnVtPjxtYXJrOnJlZ0RhdGU+MjAx
-My0wMS0wMVQwMDowMDowMC4wMDBaPC9tYXJrOnJlZ0RhdGU+PC9tYXJrOnRyYWRlbWFyaz48L21h
-cms6bWFyaz48ZHM6U2lnbmF0dXJlIHhtbG5zOmRzPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5
-L3htbGRzaWcjIiBJZD0iX2I2ZmZkNDE3LWNkODktNGM5ZS1iMDVkLTY2MjQ0ZDNhZmVjNiI+PGRz
-OlNpZ25lZEluZm8+PGRzOkNhbm9uaWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGhtPSJodHRwOi8v
-d3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJlTWV0aG9kIEFs
-Z29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxkc2lnLW1vcmUjcnNhLXNoYTI1
-NiIvPjxkczpSZWZlcmVuY2UgVVJJPSIjXzAwMTk2ZTQ2LWJiMTctNDE3OC1hZTkxLWQxM2VmYzkw
-NTljMSI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cu
-dzMub3JnLzIwMDAvMDkveG1sZHNpZyNlbnZlbG9wZWQtc2lnbmF0dXJlIi8+PGRzOlRyYW5zZm9y
-bSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwv
-ZHM6VHJhbnNmb3Jtcz48ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5v
-cmcvMjAwMS8wNC94bWxlbmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPlJNakxrK09ScVlyRmZl
-UGg1TWNxRklNc2pUYWJGbGZudWhJNWwxRjdyWlU9PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVy
-ZW5jZT48ZHM6UmVmZXJlbmNlIFVSST0iI19mOWY3OGUwOS05MzkyLTRlZTItYTExZi0zOTUzM2Iz
-NDg1M2YiPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3
-LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2Vz
-dE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1
-NiIvPjxkczpEaWdlc3RWYWx1ZT4zVzFBZjY4U0F3dlRjUEVjN21RZnV1VUZKaVN3eWlkWTlUZXBv
-ZXc3U3JzPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PC9kczpTaWduZWRJbmZvPjxk
-czpTaWduYXR1cmVWYWx1ZSBJZD0iXzMxZjlmNTEzLWQwYjktNDcwNC04NGE1LTNiYjBmOTE3MzY1
-MCI+Rm9iTGpncVA0TllOUXFGeVRReHkvMGV1N05nRk5NYXgzYjRCaG5oL1Q0bkFjdWtCZ2NCK0xx
-d3NranVGZUR3NDNybjY2bm9sdFBtTwphOGdDQWNNdUdjM1drcjVYdDl2N1J4dEViOFdrN3hVRXZh
-WnM2R0tpNDBZQlRodElNbHhKQyswRGlaRHEzLy9SZjFzSGxDT1k3S2htCjBXeXhMOFFFbmh1RUpJ
-T09mRDBFbTZzUU9yMG90N0pQVGZ1MDc3bjFuY3FYbEZqSU9JOGZLRVd1d0ZPV0JYL1BTRDNDSENl
-MCtIeTIKbHI3Q0xyWGVGbWVybmt3OEFDZDZKU3h6WjBqc2ZyVWsrOXY2MmNqQjdSY2FJTjhnTk44
-ZUdvSCtzR0s2M1BGWHJBQU54YXZxem9tWgp5NXhtVkwzVHUyT1gvUlc5b0xrZVdKUzhEQnlLNGIy
-WnArTXE5QT09PC9kczpTaWduYXR1cmVWYWx1ZT48ZHM6S2V5SW5mbyBJZD0iX2Y5Zjc4ZTA5LTkz
-OTItNGVlMi1hMTFmLTM5NTMzYjM0ODUzZiI+PGRzOlg1MDlEYXRhPjxkczpYNTA5Q2VydGlmaWNh
-dGU+TUlJRk96Q0NCQ09nQXdJQkFnSWdMckFiZXZvYWU1MnkzZjZDMnRCMFNuM3A3WEptMFQwMkZv
-Z3hLQ2ZOaFpjd0RRWUpLb1pJaHZjTgpBUUVMQlFBd2ZERUxNQWtHQTFVRUJoTUNWVk14UERBNkJn
-TlZCQW9UTTBsdWRHVnlibVYwSUVOdmNuQnZjbUYwYVc5dUlHWnZjaUJCCmMzTnBaMjVsWkNCT1lX
-MWxjeUJoYm1RZ1RuVnRZbVZ5Y3pFdk1DMEdBMVVFQXhNbVNVTkJUazRnVkhKaFpHVnRZWEpySUVO
-c1pXRnkKYVc1bmFHOTFjMlVnVUdsc2IzUWdRMEV3SGhjTk1UZ3dNakk0TURBd01EQXdXaGNOTWpN
-d016QXhNak0xT1RVNVdqQ0JqekVMTUFrRwpBMVVFQmhNQ1FrVXhJREFlQmdOVkJBZ1RGMEp5ZFhO
-elpXeHpMVU5oY0dsMFlXd2dVbVZuYVc5dU1SRXdEd1lEVlFRSEV3aENjblZ6CmMyVnNjekVSTUE4
-R0ExVUVDaE1JUkdWc2IybDBkR1V4T0RBMkJnTlZCQU1UTDBsRFFVNU9JRlJOUTBnZ1FYVjBhRzl5
-YVhwbFpDQlUKY21Ga1pXMWhjbXNnVUdsc2IzUWdWbUZzYVdSaGRHOXlNSUlCSWpBTkJna3Foa2lH
-OXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQQp4bHAzS3BZSFgzV3lBc0ZoU2szTHdXZm5HbHhu
-VURGcUZaQTNVb3VNWWovWGlnYk1rTmVFWElqbGtST0tUNE9QR2ZSeC9MQXlSbFFRCmpDTXY0cWhi
-a2NYMXA3YXI2M2ZscTRTWk5WY2wxNWw3aDB1VDU4RnpTZm5sejB1NXJrSGZKSW1ENDMrbWFQLzhn
-djM2RlIyN2pXOFIKOXdZNGhrK1dzNElCMGlGU2Q4U1h2MUtyOHcvSm1NUVNEa2l1RytSZklpdWJ3
-US9meTdFa2o1UVdoUFp3K21NeE5LbkhVTHkzeFl6MgpMd1ZmZnRqd1V1ZWFjdnFOUkNrTVhsQ2xP
-QURxZlQ4b1Nab2VEWGVoSHZsUHNMQ2VtR0JvVEt1cnNrSVM2OUYweVBFSDVnemUwSCtmCjhGUk9z
-SW9LU3NWUTM0QjRTL2pvRTY3bnBzSlBUZEtzTlBKVHlRSURBUUFCbzRJQmt6Q0NBWTh3REFZRFZS
-MFRBUUgvQkFJd0FEQWQKQmdOVkhRNEVGZ1FVb0ZwWTc2cDV5b05EUkd0UXB6VnVSODFVV1Ewd2dj
-WUdBMVVkSXdTQnZqQ0J1NEFVdzYwK3B0WVJBRVdBWERwWApTb3B0M0RFTm5uR2hnWUNrZmpCOE1R
-c3dDUVlEVlFRR0V3SlZVekU4TURvR0ExVUVDaE16U1c1MFpYSnVaWFFnUTI5eWNHOXlZWFJwCmIy
-NGdabTl5SUVGemMybG5ibVZrSUU1aGJXVnpJR0Z1WkNCT2RXMWlaWEp6TVM4d0xRWURWUVFERXla
-SlEwRk9UaUJVY21Ga1pXMWgKY21zZ1EyeGxZWEpwYm1kb2IzVnpaU0JRYVd4dmRDQkRRWUlnTHJB
-YmV2b2FlNTJ5M2Y2QzJ0QjBTbjNwN1hKbTBUMDJGb2d4S0NmTgpoWGt3RGdZRFZSMFBBUUgvQkFR
-REFnZUFNRFFHQTFVZEh3UXRNQ3N3S2FBbm9DV0dJMmgwZEhBNkx5OWpjbXd1YVdOaGJtNHViM0pu
-CkwzUnRZMmhmY0dsc2IzUXVZM0pzTUZFR0ExVWRJQVJLTUVnd0VBWU9Ld1lCQkFHQ3lSc0JCWU03
-REFvd05BWUlLd1lCQlFVSEFnRXcKS0RBbUJnZ3JCZ0VGQlFjQ0FSWWFhSFIwY0hNNkx5OWpZUzVw
-WTJGdWJpNXZjbWN2Y0dsc2IzUXdEUVlKS29aSWh2Y05BUUVMQlFBRApnZ0VCQUF1aloySWNSMkRW
-cnRhUnJBNTllTllDbDR4Y3NKTXU4RFFDSHYyOGZUZmkvQmlaWTRJcjdGOWtGeTk2RDdPWjhvTFk1
-empmCjRkSHhGd0hQcUg4RGg2Sldzelh1SFcxWmEzWG1sMFBhSHhDV1JTMFhvbDhXc0hIcE55Z2pN
-QllmSjBvZFZNODg1VFoxRWw5U2l1RUgKbnluRkJnU21pRmM5OXVRZC9ZRFJadUd2L0EwSHl2N3lS
-OXRrTEVkRDNBMXVOSkJXNFArSEpHcGRLa1lMMVE1clU3K29IVlB0TUtLSQozaUZrVUVzYk80NUFW
-ZDd2UC9qLzdKdEFaUGI2a29PVjVsWmkySDFSTGNjR3d6ZGV6bmhKZ2QwTjlvYmIwdm5FNDEvVVNX
-YWZkV1JaClZHa3dQdXFUaGw3c0N0enJKSDhYWTB4Y3VtK2NmTHgyRUFJd1VuT2NhYjQ9PC9kczpY
-NTA5Q2VydGlmaWNhdGU+PC9kczpYNTA5RGF0YT48L2RzOktleUluZm8+PC9kczpTaWduYXR1cmU+
-PC9zbWQ6c2lnbmVkTWFyaz4=
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/active/Trademark-Agent-English-Active.smd b/core/src/test/resources/google/registry/tmch/active/Trademark-Agent-English-Active.smd
deleted file mode 100644
index 651fad18a..000000000
--- a/core/src/test/resources/google/registry/tmch/active/Trademark-Agent-English-Active.smd
+++ /dev/null
@@ -1,102 +0,0 @@
-Marks: Test & Validate
-smdID: 000000871526320392536-65535
-U-labels: test---validate, test--validate, test-and-validate, test-andvalidate, test-validate, testand-validate, testandvalidate, testet-validate, testetvalidate, testvalidate
-notBefore: 2018-05-14T17:53:12.536Z
-notAfter: 2022-08-18T14:57:36.681Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il8wOTJk
-YzQ4Yi02ZDZhLTRiNzQtYTRhZS1mOThmZDQ0NmQ1OGEiPjxzbWQ6aWQ+MDAwMDAwODcxNTI2MzIw
-MzkyNTM2LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo1MzoxMi41MzZaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0xOFQxNDo1NzozNi42ODFaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
-cmFkZW1hcms+PG1hcms6aWQ+MDAwMTM3MTUwMzA2ODA0OTE1MDMwNjgwNDktMTwvbWFyazppZD48
-bWFyazptYXJrTmFtZT5UZXN0ICZhbXA7IFZhbGlkYXRlPC9tYXJrOm1hcmtOYW1lPjxtYXJrOmhv
-bGRlciBlbnRpdGxlbWVudD0ib3duZXIiPjxtYXJrOm5hbWU+VG9ueSBIb2xsYW5kPC9tYXJrOm5h
-bWU+PG1hcms6b3JnPkFnIGNvcnBvcmF0aW9uPC9tYXJrOm9yZz48bWFyazphZGRyPjxtYXJrOnN0
-cmVldD4xMzA1IEJyaWdodCBBdmVudWU8L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+QXJjYWRpYTwv
-bWFyazpjaXR5PjxtYXJrOnBjPjkwMDI4PC9tYXJrOnBjPjxtYXJrOmNjPlVTPC9tYXJrOmNjPjwv
-bWFyazphZGRyPjwvbWFyazpob2xkZXI+PG1hcms6Y29udGFjdCB0eXBlPSJhZ2VudCI+PG1hcms6
-bmFtZT5Ub255IEhvbGxhbmQ8L21hcms6bmFtZT48bWFyazpvcmc+QWcgY29ycG9yYXRpb248L21h
-cms6b3JnPjxtYXJrOmFkZHI+PG1hcms6c3RyZWV0PkJyaWdodCBBdmVudWUgMTMwNSA8L21hcms6
-c3RyZWV0PjxtYXJrOmNpdHk+QXJjYWRpYTwvbWFyazpjaXR5PjxtYXJrOnNwPkNBPC9tYXJrOnNw
-PjxtYXJrOnBjPjkwMDI4PC9tYXJrOnBjPjxtYXJrOmNjPlVTPC9tYXJrOmNjPjwvbWFyazphZGRy
-PjxtYXJrOnZvaWNlPisxLjIwMjU1NjIzMDI8L21hcms6dm9pY2U+PG1hcms6ZmF4PisxLjIwMjU1
-NjIzMDE8L21hcms6ZmF4PjxtYXJrOmVtYWlsPmluZm9AYWdjb3Jwb3JhdGlvbi5jb208L21hcms6
-ZW1haWw+PC9tYXJrOmNvbnRhY3Q+PG1hcms6anVyaXNkaWN0aW9uPlVTPC9tYXJrOmp1cmlzZGlj
-dGlvbj48bWFyazpjbGFzcz4xNTwvbWFyazpjbGFzcz48bWFyazpsYWJlbD50ZXN0LS0tdmFsaWRh
-dGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+dGVzdC0tdmFsaWRhdGU8L21hcms6bGFiZWw+PG1h
-cms6bGFiZWw+dGVzdC1hbmQtdmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+dGVzdC1h
-bmR2YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0LXZhbGlkYXRlPC9tYXJrOmxh
-YmVsPjxtYXJrOmxhYmVsPnRlc3RhbmQtdmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+
-dGVzdGFuZHZhbGlkYXRlPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnRlc3RldC12YWxpZGF0ZTwv
-bWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0ZXR2YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazps
-YWJlbD50ZXN0dmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6Z29vZHNBbmRTZXJ2aWNlcz5ndWl0
-YXI8L21hcms6Z29vZHNBbmRTZXJ2aWNlcz48bWFyazpyZWdOdW0+MTIzNDwvbWFyazpyZWdOdW0+
-PG1hcms6cmVnRGF0ZT4yMDEzLTAxLTAxVDAwOjAwOjAwLjAwMFo8L21hcms6cmVnRGF0ZT48L21h
-cms6dHJhZGVtYXJrPjwvbWFyazptYXJrPjxkczpTaWduYXR1cmUgeG1sbnM6ZHM9Imh0dHA6Ly93
-d3cudzMub3JnLzIwMDAvMDkveG1sZHNpZyMiIElkPSJfMzI5OGQ0OGItMzMyMS00OWU1LThiMDct
-YTE4Y2RlODYxNmU0Ij48ZHM6U2lnbmVkSW5mbz48ZHM6Q2Fub25pY2FsaXphdGlvbk1ldGhvZCBB
-bGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjxkczpT
-aWduYXR1cmVNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGRz
-aWctbW9yZSNyc2Etc2hhMjU2Ii8+PGRzOlJlZmVyZW5jZSBVUkk9IiNfMDkyZGM0OGItNmQ2YS00
-Yjc0LWE0YWUtZjk4ZmQ0NDZkNThhIj48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29y
-aXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1
-cmUiLz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94
-bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGht
-PSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFs
-dWU+dU5TZ2VTclIvbXpHVmdUdmVjRHZCVFdiZDVqTWdKbENEODNrandIemJ4Zz08L2RzOkRpZ2Vz
-dFZhbHVlPjwvZHM6UmVmZXJlbmNlPjxkczpSZWZlcmVuY2UgVVJJPSIjX2U0YTNhNjEzLTAzYTEt
-NGZiMi05NWIwLTU2ODVlZDAzYjI4NyI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdv
-cml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJh
-bnNmb3Jtcz48ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAw
-MS8wNC94bWxlbmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPkZVbjdMcmVhWFVUQzQ3dkVueXQw
-aXZZRXhVZUdJblBVMU5FUWY4NXNyUk09PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48
-L2RzOlNpZ25lZEluZm8+PGRzOlNpZ25hdHVyZVZhbHVlIElkPSJfMjdjODQxOWUtOTk3Yy00NmQz
-LWIxNTEtOTUwODQ1ZjgwOWE3Ij5pSmpxWnFaczdXcE91UzZVNVU0bS8zRzB4ZG9Ya3ZORk93UmNq
-QjI3UFlFNEQ3cVd4d3JDeUZYUTdtNXhkcTAxR1NpeHRpYjlKOXIwClpzZEROaXZyR0c2b05JTGNs
-a0J1UzRlR3pDMWo3cEZ0alYvRjFNclNiRlI3ZUN3eDhXd2p0N3lBdGlEYXQ0L3VSQkEwQlEyeEpV
-QSsKQ3IxRml4ckdHSkZNREsxRzBRSU5FU0grK3lNUFZKM0x1ckFTSEJjY0syeVlQTWN6ME5yenJF
-b0RHd0R0QVk5YXpmQTZndlRDZHZCVwpxOXpxR2NSaTIxOXAvb3c0aW5CcmNsQ05qMGdrUDRwMk5t
-UTVmM29WSEI2MFVBQ2FFaDV1aUROZ2Q0QkszdDN0N0JQUHN2bStyb0N0CjNIR2V0dnFzK3RQdlE2
-Mm1RRWFZVGtCSTZCS0M0TEVYYjRwdzRRPT08L2RzOlNpZ25hdHVyZVZhbHVlPjxkczpLZXlJbmZv
-IElkPSJfZTRhM2E2MTMtMDNhMS00ZmIyLTk1YjAtNTY4NWVkMDNiMjg3Ij48ZHM6WDUwOURhdGE+
-PGRzOlg1MDlDZXJ0aWZpY2F0ZT5NSUlGT3pDQ0JDT2dBd0lCQWdJZ0xyQWJldm9hZTUyeTNmNkMy
-dEIwU24zcDdYSm0wVDAyRm9neEtDZk5oWmN3RFFZSktvWklodmNOCkFRRUxCUUF3ZkRFTE1Ba0dB
-MVVFQmhNQ1ZWTXhQREE2QmdOVkJBb1RNMGx1ZEdWeWJtVjBJRU52Y25CdmNtRjBhVzl1SUdadmNp
-QkIKYzNOcFoyNWxaQ0JPWVcxbGN5QmhibVFnVG5WdFltVnljekV2TUMwR0ExVUVBeE1tU1VOQlRr
-NGdWSEpoWkdWdFlYSnJJRU5zWldGeQphVzVuYUc5MWMyVWdVR2xzYjNRZ1EwRXdIaGNOTVRnd01q
-STRNREF3TURBd1doY05Nak13TXpBeE1qTTFPVFU1V2pDQmp6RUxNQWtHCkExVUVCaE1DUWtVeElE
-QWVCZ05WQkFnVEYwSnlkWE56Wld4ekxVTmhjR2wwWVd3Z1VtVm5hVzl1TVJFd0R3WURWUVFIRXdo
-Q2NuVnoKYzJWc2N6RVJNQThHQTFVRUNoTUlSR1ZzYjJsMGRHVXhPREEyQmdOVkJBTVRMMGxEUVU1
-T0lGUk5RMGdnUVhWMGFHOXlhWHBsWkNCVQpjbUZrWlcxaGNtc2dVR2xzYjNRZ1ZtRnNhV1JoZEc5
-eU1JSUJJakFOQmdrcWhraUc5dzBCQVFFRkFBT0NBUThBTUlJQkNnS0NBUUVBCnhscDNLcFlIWDNX
-eUFzRmhTazNMd1dmbkdseG5VREZxRlpBM1VvdU1Zai9YaWdiTWtOZUVYSWpsa1JPS1Q0T1BHZlJ4
-L0xBeVJsUVEKakNNdjRxaGJrY1gxcDdhcjYzZmxxNFNaTlZjbDE1bDdoMHVUNThGelNmbmx6MHU1
-cmtIZkpJbUQ0MyttYVAvOGd2MzZGUjI3alc4Ugo5d1k0aGsrV3M0SUIwaUZTZDhTWHYxS3I4dy9K
-bU1RU0RraXVHK1JmSWl1YndRL2Z5N0VrajVRV2hQWncrbU14TktuSFVMeTN4WXoyCkx3VmZmdGp3
-VXVlYWN2cU5SQ2tNWGxDbE9BRHFmVDhvU1pvZURYZWhIdmxQc0xDZW1HQm9US3Vyc2tJUzY5RjB5
-UEVINWd6ZTBIK2YKOEZST3NJb0tTc1ZRMzRCNFMvam9FNjducHNKUFRkS3NOUEpUeVFJREFRQUJv
-NElCa3pDQ0FZOHdEQVlEVlIwVEFRSC9CQUl3QURBZApCZ05WSFE0RUZnUVVvRnBZNzZwNXlvTkRS
-R3RRcHpWdVI4MVVXUTB3Z2NZR0ExVWRJd1NCdmpDQnU0QVV3NjArcHRZUkFFV0FYRHBYClNvcHQz
-REVObm5HaGdZQ2tmakI4TVFzd0NRWURWUVFHRXdKVlV6RThNRG9HQTFVRUNoTXpTVzUwWlhKdVpY
-UWdRMjl5Y0c5eVlYUnAKYjI0Z1ptOXlJRUZ6YzJsbmJtVmtJRTVoYldWeklHRnVaQ0JPZFcxaVpY
-SnpNUzh3TFFZRFZRUURFeVpKUTBGT1RpQlVjbUZrWlcxaApjbXNnUTJ4bFlYSnBibWRvYjNWelpT
-QlFhV3h2ZENCRFFZSWdMckFiZXZvYWU1MnkzZjZDMnRCMFNuM3A3WEptMFQwMkZvZ3hLQ2ZOCmhY
-a3dEZ1lEVlIwUEFRSC9CQVFEQWdlQU1EUUdBMVVkSHdRdE1Dc3dLYUFub0NXR0kyaDBkSEE2THk5
-amNtd3VhV05oYm00dWIzSm4KTDNSdFkyaGZjR2xzYjNRdVkzSnNNRkVHQTFVZElBUktNRWd3RUFZ
-T0t3WUJCQUdDeVJzQkJZTTdEQW93TkFZSUt3WUJCUVVIQWdFdwpLREFtQmdnckJnRUZCUWNDQVJZ
-YWFIUjBjSE02THk5allTNXBZMkZ1Ymk1dmNtY3ZjR2xzYjNRd0RRWUpLb1pJaHZjTkFRRUxCUUFE
-CmdnRUJBQXVqWjJJY1IyRFZydGFSckE1OWVOWUNsNHhjc0pNdThEUUNIdjI4ZlRmaS9CaVpZNEly
-N0Y5a0Z5OTZEN09aOG9MWTV6amYKNGRIeEZ3SFBxSDhEaDZKV3N6WHVIVzFaYTNYbWwwUGFIeENX
-UlMwWG9sOFdzSEhwTnlnak1CWWZKMG9kVk04ODVUWjFFbDlTaXVFSApueW5GQmdTbWlGYzk5dVFk
-L1lEUlp1R3YvQTBIeXY3eVI5dGtMRWREM0ExdU5KQlc0UCtISkdwZEtrWUwxUTVyVTcrb0hWUHRN
-S0tJCjNpRmtVRXNiTzQ1QVZkN3ZQL2ovN0p0QVpQYjZrb09WNWxaaTJIMVJMY2NHd3pkZXpuaEpn
-ZDBOOW9iYjB2bkU0MS9VU1dhZmRXUloKVkdrd1B1cVRobDdzQ3R6ckpIOFhZMHhjdW0rY2ZMeDJF
-QUl3VW5PY2FiND08L2RzOlg1MDlDZXJ0aWZpY2F0ZT48L2RzOlg1MDlEYXRhPjwvZHM6S2V5SW5m
-bz48L2RzOlNpZ25hdHVyZT48L3NtZDpzaWduZWRNYXJrPg==
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/active/Trademark-Agent-French-Active.smd b/core/src/test/resources/google/registry/tmch/active/Trademark-Agent-French-Active.smd
deleted file mode 100644
index cd780ae53..000000000
--- a/core/src/test/resources/google/registry/tmch/active/Trademark-Agent-French-Active.smd
+++ /dev/null
@@ -1,103 +0,0 @@
-Marks: Essai & évaluation
-smdID: 000000831526320386700-65535
-U-labels: xn--essai---valuation-itb, xn--essai--valuation-hqb, xn--essai-and-valuation-kzb, xn--essai-andvaluation-jwb, xn--essai-valuation-gnb, xn--essaiand-valuation-jwb, xn--essaiandvaluation-itb, xn--essaiet-valuation-itb, xn--essaietvaluation-hqb, xn--essaivaluation-fkb
-notBefore: 2018-05-14T17:53:06.700Z
-notAfter: 2022-08-18T14:46:53.013Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il8wNDc1
-MzkxZi03MzU1LTQ2ZTctODAxOC0yMDdkOWY4OGIzNjYiPjxzbWQ6aWQ+MDAwMDAwODMxNTI2MzIw
-Mzg2NzAwLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo1MzowNi43MDBaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0xOFQxNDo0Njo1My4wMTNaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
-cmFkZW1hcms+PG1hcms6aWQ+MDAwMTM5MTUwMzA2NzM4MjE1MDMwNjczODItMTwvbWFyazppZD48
-bWFyazptYXJrTmFtZT5Fc3NhaSAmYW1wOyDDqXZhbHVhdGlvbjwvbWFyazptYXJrTmFtZT48bWFy
-azpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpvcmc+QWdlbmNlIGVuIEZyYW5jZTwv
-bWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpzdHJlZXQ+MTAgQXZlbnVlIFJvdXNzZWF1eDwvbWFy
-azpzdHJlZXQ+PG1hcms6Y2l0eT5WZXJzYWlsbGVzPC9tYXJrOmNpdHk+PG1hcms6cGM+MzMwODE8
-L21hcms6cGM+PG1hcms6Y2M+RlI8L21hcms6Y2M+PC9tYXJrOmFkZHI+PC9tYXJrOmhvbGRlcj48
-bWFyazpjb250YWN0IHR5cGU9ImFnZW50Ij48bWFyazpuYW1lPkZyYW5jIExlYnJ1bjwvbWFyazpu
-YW1lPjxtYXJrOm9yZz5BZ2VuY2UgZW4gRnJhbmNlPC9tYXJrOm9yZz48bWFyazphZGRyPjxtYXJr
-OnN0cmVldD5BdmVudWUgUm91c3NlYXV4IDEwIDwvbWFyazpzdHJlZXQ+PG1hcms6Y2l0eT5WZXJz
-YWlsbGVzPC9tYXJrOmNpdHk+PG1hcms6cGM+MzMwODE8L21hcms6cGM+PG1hcms6Y2M+RlI8L21h
-cms6Y2M+PC9tYXJrOmFkZHI+PG1hcms6dm9pY2U+KzMzLjEyNTc4MTI1MDwvbWFyazp2b2ljZT48
-bWFyazpmYXg+KzMzLjEyNTc4MTI1MTwvbWFyazpmYXg+PG1hcms6ZW1haWw+aW5mb0BhZ2VuY2Ut
-ZW4tZnJhbmNlLmZyPC9tYXJrOmVtYWlsPjwvbWFyazpjb250YWN0PjxtYXJrOmp1cmlzZGljdGlv
-bj5VUzwvbWFyazpqdXJpc2RpY3Rpb24+PG1hcms6Y2xhc3M+MTU8L21hcms6Y2xhc3M+PG1hcms6
-bGFiZWw+eG4tLWVzc2FpLS0tdmFsdWF0aW9uLWl0YjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54
-bi0tZXNzYWktLXZhbHVhdGlvbi1ocWI8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLWVzc2Fp
-LWFuZC12YWx1YXRpb24ta3piPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1lc3NhaS1hbmR2
-YWx1YXRpb24tandiPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1lc3NhaS12YWx1YXRpb24t
-Z25iPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1lc3NhaWFuZC12YWx1YXRpb24tandiPC9t
-YXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1lc3NhaWFuZHZhbHVhdGlvbi1pdGI8L21hcms6bGFi
-ZWw+PG1hcms6bGFiZWw+eG4tLWVzc2FpZXQtdmFsdWF0aW9uLWl0YjwvbWFyazpsYWJlbD48bWFy
-azpsYWJlbD54bi0tZXNzYWlldHZhbHVhdGlvbi1ocWI8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+
-eG4tLWVzc2FpdmFsdWF0aW9uLWZrYjwvbWFyazpsYWJlbD48bWFyazpnb29kc0FuZFNlcnZpY2Vz
-Pmd1aXRhcjwvbWFyazpnb29kc0FuZFNlcnZpY2VzPjxtYXJrOnJlZ051bT4xMjM0PC9tYXJrOnJl
-Z051bT48bWFyazpyZWdEYXRlPjIwMTMtMDEtMDFUMDA6MDA6MDAuMDAwWjwvbWFyazpyZWdEYXRl
-PjwvbWFyazp0cmFkZW1hcms+PC9tYXJrOm1hcms+PGRzOlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0
-cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyIgSWQ9Il9kODJkMWNjZC01NDE1LTQ1ZGMt
-YmFlZS02YjQ0MTQyZjRiZjEiPjxkczpTaWduZWRJbmZvPjxkczpDYW5vbmljYWxpemF0aW9uTWV0
-aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+
-PGRzOlNpZ25hdHVyZU1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQv
-eG1sZHNpZy1tb3JlI3JzYS1zaGEyNTYiLz48ZHM6UmVmZXJlbmNlIFVSST0iI18wNDc1MzkxZi03
-MzU1LTQ2ZTctODAxOC0yMDdkOWY4OGIzNjYiPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0g
-QWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjZW52ZWxvcGVkLXNp
-Z25hdHVyZSIvPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAx
-LzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdv
-cml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdl
-c3RWYWx1ZT5CTWRyLzg3cVpocHQ1SXVvVXdTUFpiQ3JsMEQvYzMvS2RLM1ZTV2RFUmo0PTwvZHM6
-RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PGRzOlJlZmVyZW5jZSBVUkk9IiNfNDhiZjM0ZTgt
-NWM3MC00ZDRlLTg2MDItNWEwNTAwYWYyNWQ3Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3Jt
-IEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9k
-czpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9y
-Zy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+cEZ0RTkxTEwyZ2h0SDZ0
-cmtyR2ppWE1pZlpyQ1pNMUhXRXFZSmtTQ1ZwND08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJl
-bmNlPjwvZHM6U2lnbmVkSW5mbz48ZHM6U2lnbmF0dXJlVmFsdWUgSWQ9Il8yNGVjYWRhNS1kYjZj
-LTQ4MmEtOWM3Mi0wYWJiYjUyNmU1OGIiPlNTbjRXeWVZNDZyVmdMZGQzNUNJQlAva2taMFFMWFpO
-ajd0ZUhhUU1OVC9ROU5sRWNicmo0Y2djWFZNNXlsT1M5SXQvdjdvQ09jckMKK2cxbTdINjB1Vkg3
-U0w0bWl5dWVyYW5vZy9GU2ZTd1J1akc4Z0MyWEhqQUNEU2dxbnFYN3YzempWRkI4VFZrYjhLWHJh
-a29jM0tRUAo2ZjlDNmcxcll3QlBiVnZNV1FUd3BwSHJBbmRnRFlUb3pUOWowRmVzcWljbm14UzhG
-ZU1DRHl4UkYydmxCQ05RaUk0QmZ6NVpYcHhFClhRdnEvdjBkVmk0cnl0UWY3K29UMnBHSlJNUVV3
-ZHpXVmJOZnZvU2ZMUDBlRHFkUHcxczI1MVpHamhyRm9LOWRZRDBOMmo2RG5mSUgKUG9LbjNXSCtl
-bVBvaGt3UlFGUmZlT2JUbnhwOGwyNmRsMWNVOVE9PTwvZHM6U2lnbmF0dXJlVmFsdWU+PGRzOktl
-eUluZm8gSWQ9Il80OGJmMzRlOC01YzcwLTRkNGUtODYwMi01YTA1MDBhZjI1ZDciPjxkczpYNTA5
-RGF0YT48ZHM6WDUwOUNlcnRpZmljYXRlPk1JSUZPekNDQkNPZ0F3SUJBZ0lnTHJBYmV2b2FlNTJ5
-M2Y2QzJ0QjBTbjNwN1hKbTBUMDJGb2d4S0NmTmhaY3dEUVlKS29aSWh2Y04KQVFFTEJRQXdmREVM
-TUFrR0ExVUVCaE1DVlZNeFBEQTZCZ05WQkFvVE0wbHVkR1Z5Ym1WMElFTnZjbkJ2Y21GMGFXOXVJ
-R1p2Y2lCQgpjM05wWjI1bFpDQk9ZVzFsY3lCaGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF4TW1T
-VU5CVGs0Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5CmFXNW5hRzkxYzJVZ1VHbHNiM1FnUTBFd0hoY05N
-VGd3TWpJNE1EQXdNREF3V2hjTk1qTXdNekF4TWpNMU9UVTVXakNCanpFTE1Ba0cKQTFVRUJoTUNR
-a1V4SURBZUJnTlZCQWdURjBKeWRYTnpaV3h6TFVOaGNHbDBZV3dnVW1WbmFXOXVNUkV3RHdZRFZR
-UUhFd2hDY25WegpjMlZzY3pFUk1BOEdBMVVFQ2hNSVJHVnNiMmwwZEdVeE9EQTJCZ05WQkFNVEww
-bERRVTVPSUZSTlEwZ2dRWFYwYUc5eWFYcGxaQ0JVCmNtRmtaVzFoY21zZ1VHbHNiM1FnVm1Gc2FX
-UmhkRzl5TUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUEKeGxwM0tw
-WUhYM1d5QXNGaFNrM0x3V2ZuR2x4blVERnFGWkEzVW91TVlqL1hpZ2JNa05lRVhJamxrUk9LVDRP
-UEdmUngvTEF5UmxRUQpqQ012NHFoYmtjWDFwN2FyNjNmbHE0U1pOVmNsMTVsN2gwdVQ1OEZ6U2Zu
-bHowdTVya0hmSkltRDQzK21hUC84Z3YzNkZSMjdqVzhSCjl3WTRoaytXczRJQjBpRlNkOFNYdjFL
-cjh3L0ptTVFTRGtpdUcrUmZJaXVid1EvZnk3RWtqNVFXaFBadyttTXhOS25IVUx5M3hZejIKTHdW
-ZmZ0andVdWVhY3ZxTlJDa01YbENsT0FEcWZUOG9TWm9lRFhlaEh2bFBzTENlbUdCb1RLdXJza0lT
-NjlGMHlQRUg1Z3plMEgrZgo4RlJPc0lvS1NzVlEzNEI0Uy9qb0U2N25wc0pQVGRLc05QSlR5UUlE
-QVFBQm80SUJrekNDQVk4d0RBWURWUjBUQVFIL0JBSXdBREFkCkJnTlZIUTRFRmdRVW9GcFk3NnA1
-eW9ORFJHdFFwelZ1UjgxVVdRMHdnY1lHQTFVZEl3U0J2akNCdTRBVXc2MCtwdFlSQUVXQVhEcFgK
-U29wdDNERU5ubkdoZ1lDa2ZqQjhNUXN3Q1FZRFZRUUdFd0pWVXpFOE1Eb0dBMVVFQ2hNelNXNTBa
-WEp1WlhRZ1EyOXljRzl5WVhScApiMjRnWm05eUlFRnpjMmxuYm1Wa0lFNWhiV1Z6SUdGdVpDQk9k
-VzFpWlhKek1TOHdMUVlEVlFRREV5WkpRMEZPVGlCVWNtRmtaVzFoCmNtc2dRMnhsWVhKcGJtZG9i
-M1Z6WlNCUWFXeHZkQ0JEUVlJZ0xyQWJldm9hZTUyeTNmNkMydEIwU24zcDdYSm0wVDAyRm9neEtD
-Zk4KaFhrd0RnWURWUjBQQVFIL0JBUURBZ2VBTURRR0ExVWRId1F0TUNzd0thQW5vQ1dHSTJoMGRI
-QTZMeTlqY213dWFXTmhibTR1YjNKbgpMM1J0WTJoZmNHbHNiM1F1WTNKc01GRUdBMVVkSUFSS01F
-Z3dFQVlPS3dZQkJBR0N5UnNCQllNN0RBb3dOQVlJS3dZQkJRVUhBZ0V3CktEQW1CZ2dyQmdFRkJR
-Y0NBUllhYUhSMGNITTZMeTlqWVM1cFkyRnViaTV2Y21jdmNHbHNiM1F3RFFZSktvWklodmNOQVFF
-TEJRQUQKZ2dFQkFBdWpaMkljUjJEVnJ0YVJyQTU5ZU5ZQ2w0eGNzSk11OERRQ0h2MjhmVGZpL0Jp
-Wlk0SXI3RjlrRnk5NkQ3T1o4b0xZNXpqZgo0ZEh4RndIUHFIOERoNkpXc3pYdUhXMVphM1htbDBQ
-YUh4Q1dSUzBYb2w4V3NISHBOeWdqTUJZZkowb2RWTTg4NVRaMUVsOVNpdUVICm55bkZCZ1NtaUZj
-OTl1UWQvWURSWnVHdi9BMEh5djd5Ujl0a0xFZEQzQTF1TkpCVzRQK0hKR3BkS2tZTDFRNXJVNytv
-SFZQdE1LS0kKM2lGa1VFc2JPNDVBVmQ3dlAvai83SnRBWlBiNmtvT1Y1bFppMkgxUkxjY0d3emRl
-em5oSmdkME45b2JiMHZuRTQxL1VTV2FmZFdSWgpWR2t3UHVxVGhsN3NDdHpySkg4WFkweGN1bStj
-Zkx4MkVBSXdVbk9jYWI0PTwvZHM6WDUwOUNlcnRpZmljYXRlPjwvZHM6WDUwOURhdGE+PC9kczpL
-ZXlJbmZvPjwvZHM6U2lnbmF0dXJlPjwvc21kOnNpZ25lZE1hcms+
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/active/Trademark-Agent-Russian-Active.smd b/core/src/test/resources/google/registry/tmch/active/Trademark-Agent-Russian-Active.smd
deleted file mode 100644
index c3c679f09..000000000
--- a/core/src/test/resources/google/registry/tmch/active/Trademark-Agent-Russian-Active.smd
+++ /dev/null
@@ -1,104 +0,0 @@
-Marks: суда & ошибки
-smdID: 000000741526320369172-65535
-U-labels: xn------5cdin6abr1b1ay5e, xn-----6kcgl1abp7azaw9d, xn---and--3vemr6bbv9b5a2a7f, xn---and-43dkp1bbt5b3a0a1f, xn----7sbejwbn3axu3d, xn--and--43dkp1bbt5b3a0a1f, xn--and-5cdin6abr1b1ay5e, xn--et--5cdin6abr1b1ay5e, xn--et-6kcgl1abp7azaw9d, xn--80achrblzvs7c
-notBefore: 2018-05-14T17:52:49.172Z
-notAfter: 2022-08-18T14:16:55.554Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il8zZmM4
-NjdlYy0yODlhLTQwMzEtYmQ2Mi1jNDdhZWUzOGNkZGMiPjxzbWQ6aWQ+MDAwMDAwNzQxNTI2MzIw
-MzY5MTcyLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo1Mjo0OS4xNzJaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0xOFQxNDoxNjo1NS41NTRaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
-cmFkZW1hcms+PG1hcms6aWQ+MDAwMTQxMTUwMzA2NTU1MDE1MDMwNjU1NTAtMTwvbWFyazppZD48
-bWFyazptYXJrTmFtZT7RgdGD0LTQsCAmYW1wOyDQvtGI0LjQsdC60Lg8L21hcms6bWFya05hbWU+
-PG1hcms6aG9sZGVyIGVudGl0bGVtZW50PSJvd25lciI+PG1hcms6b3JnPtCQ0LPQtdC90YLRgdGC
-0LLQvjwvbWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpzdHJlZXQ+0J/RgNC+0YHQv9C10LrRgiDQ
-ktC10YDQvdCw0LTRgdC60L7Qs9C+IDE1PC9tYXJrOnN0cmVldD48bWFyazpjaXR5PtCc0L7RgdC6
-0LLQsDwvbWFyazpjaXR5PjxtYXJrOnBjPjExNzQ4NTwvbWFyazpwYz48bWFyazpjYz5SVTwvbWFy
-azpjYz48L21hcms6YWRkcj48L21hcms6aG9sZGVyPjxtYXJrOmNvbnRhY3QgdHlwZT0iYWdlbnQi
-PjxtYXJrOm5hbWU+0J3QsNGC0LDQu9GM0Y8g0JDQvdGC0L7QvdC+0LLQsDwvbWFyazpuYW1lPjxt
-YXJrOm9yZz7QkNCz0LXQvdGC0YHRgtCy0L48L21hcms6b3JnPjxtYXJrOmFkZHI+PG1hcms6c3Ry
-ZWV0PtCf0YDQvtGB0L/QtdC60YIg0JLQtdGA0L3QsNC00YHQutC+0LPQviAxNTwvbWFyazpzdHJl
-ZXQ+PG1hcms6Y2l0eT7QnNC+0YHQutCy0LA8L21hcms6Y2l0eT48bWFyazpwYz4xMTc0ODU8L21h
-cms6cGM+PG1hcms6Y2M+UlU8L21hcms6Y2M+PC9tYXJrOmFkZHI+PG1hcms6dm9pY2U+KzcuOTE4
-ODIyMTY3NDwvbWFyazp2b2ljZT48bWFyazpmYXg+KzcuOTE4ODIyMTY3MzwvbWFyazpmYXg+PG1h
-cms6ZW1haWw+aW5mb0BhZ2VuY3kucnU8L21hcms6ZW1haWw+PC9tYXJrOmNvbnRhY3Q+PG1hcms6
-anVyaXNkaWN0aW9uPlVTPC9tYXJrOmp1cmlzZGljdGlvbj48bWFyazpjbGFzcz4xNTwvbWFyazpj
-bGFzcz48bWFyazpsYWJlbD54bi0tLS0tLTVjZGluNmFicjFiMWF5NWU8L21hcms6bGFiZWw+PG1h
-cms6bGFiZWw+eG4tLS0tLTZrY2dsMWFicDdhemF3OWQ8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+
-eG4tLS1hbmQtLTN2ZW1yNmJidjliNWEyYTdmPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS0t
-YW5kLTQzZGtwMWJidDViM2EwYTFmPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS0tLTdzYmVq
-d2JuM2F4dTNkPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1hbmQtLTQzZGtwMWJidDViM2Ew
-YTFmPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1hbmQtNWNkaW42YWJyMWIxYXk1ZTwvbWFy
-azpsYWJlbD48bWFyazpsYWJlbD54bi0tZXQtLTVjZGluNmFicjFiMWF5NWU8L21hcms6bGFiZWw+
-PG1hcms6bGFiZWw+eG4tLWV0LTZrY2dsMWFicDdhemF3OWQ8L21hcms6bGFiZWw+PG1hcms6bGFi
-ZWw+eG4tLTgwYWNocmJsenZzN2M8L21hcms6bGFiZWw+PG1hcms6Z29vZHNBbmRTZXJ2aWNlcz7Q
-s9C40YLQsNGA0LAgPC9tYXJrOmdvb2RzQW5kU2VydmljZXM+PG1hcms6cmVnTnVtPjEyMzQ8L21h
-cms6cmVnTnVtPjxtYXJrOnJlZ0RhdGU+MjAxMy0wMS0wMVQwMDowMDowMC4wMDBaPC9tYXJrOnJl
-Z0RhdGU+PC9tYXJrOnRyYWRlbWFyaz48L21hcms6bWFyaz48ZHM6U2lnbmF0dXJlIHhtbG5zOmRz
-PSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjIiBJZD0iXzJkYzkzZmYwLWE2OTEt
-NGI5Ni05ZWQxLWQ0MjEyMjAxN2UxMyI+PGRzOlNpZ25lZEluZm8+PGRzOkNhbm9uaWNhbGl6YXRp
-b25NZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0
-biMiLz48ZHM6U2lnbmF0dXJlTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAw
-MS8wNC94bWxkc2lnLW1vcmUjcnNhLXNoYTI1NiIvPjxkczpSZWZlcmVuY2UgVVJJPSIjXzNmYzg2
-N2VjLTI4OWEtNDAzMS1iZDYyLWM0N2FlZTM4Y2RkYyI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5z
-Zm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1sZHNpZyNlbnZlbG9w
-ZWQtc2lnbmF0dXJlIi8+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3Jn
-LzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6RGlnZXN0TWV0aG9k
-IEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxlbmMjc2hhMjU2Ii8+PGRz
-OkRpZ2VzdFZhbHVlPnFRMThOYktsOW0zS2NSS291aFRMWTErSXd3WFNkeEhTZlRMMk80cjFnSU09
-PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48ZHM6UmVmZXJlbmNlIFVSST0iI18xNGQ1
-MzQ4MS04MTUzLTRhNDItOGI3OS0xNWYwMzI1N2FjYjYiPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFu
-c2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMi
-Lz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cu
-dzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1ZT5IcUplczRqN0dw
-ODUrdmNvMVo2Q1A0VjA1dFU3c01FbDBQR0gwSDlJYjR3PTwvZHM6RGlnZXN0VmFsdWU+PC9kczpS
-ZWZlcmVuY2U+PC9kczpTaWduZWRJbmZvPjxkczpTaWduYXR1cmVWYWx1ZSBJZD0iXzVjNDllNzcw
-LTJjYjMtNDg0OC05OWY1LWNhOTBlMDdhYmJhZSI+bmg1eGhwQ2tHdElmbnhVUGdUMmV6Uk5ZVWQ5
-bjRGT2E2N1pSaW81QzdkbzkybjU0OTAzdTUwbThIV0FDTmdUdGVWTitvQ2lMNGNXdgpnQ1prNDJ0
-bHdiY3dhb0I3cjJmK3ZsTzR6eDdFbUc2UDZPYWl3aWRYYjVabUdoOVc4dVplVk54VUtjLytjenNk
-d0xBUmVQeXpZL2JOCjEzT3ZoSEkrbHM3TitDUkhNdTlwZUdIZXdBQlpIV0RKYXpXZWxPQVZkcVNY
-L2hEOVVBSGY5QXo2RjdhZEp3RTVUN2JMOGxuRlVGaWMKQ3BlRDMxN0ZGOU1YTWdqU1hXMWpOVDdP
-aUlLeXUxeXQ1WXFIZUtFU2ZiSklpY01WUVZDa3NVMUw1YWpWYzMyOUNudDM5N09Bb0JHdgpDei9N
-SzhvV0o2UmluUHB3dThQN05TVzF1eWRVaTBKZE1CL0cyZz09PC9kczpTaWduYXR1cmVWYWx1ZT48
-ZHM6S2V5SW5mbyBJZD0iXzE0ZDUzNDgxLTgxNTMtNGE0Mi04Yjc5LTE1ZjAzMjU3YWNiNiI+PGRz
-Olg1MDlEYXRhPjxkczpYNTA5Q2VydGlmaWNhdGU+TUlJRk96Q0NCQ09nQXdJQkFnSWdMckFiZXZv
-YWU1MnkzZjZDMnRCMFNuM3A3WEptMFQwMkZvZ3hLQ2ZOaFpjd0RRWUpLb1pJaHZjTgpBUUVMQlFB
-d2ZERUxNQWtHQTFVRUJoTUNWVk14UERBNkJnTlZCQW9UTTBsdWRHVnlibVYwSUVOdmNuQnZjbUYw
-YVc5dUlHWnZjaUJCCmMzTnBaMjVsWkNCT1lXMWxjeUJoYm1RZ1RuVnRZbVZ5Y3pFdk1DMEdBMVVF
-QXhNbVNVTkJUazRnVkhKaFpHVnRZWEpySUVOc1pXRnkKYVc1bmFHOTFjMlVnVUdsc2IzUWdRMEV3
-SGhjTk1UZ3dNakk0TURBd01EQXdXaGNOTWpNd016QXhNak0xT1RVNVdqQ0JqekVMTUFrRwpBMVVF
-QmhNQ1FrVXhJREFlQmdOVkJBZ1RGMEp5ZFhOelpXeHpMVU5oY0dsMFlXd2dVbVZuYVc5dU1SRXdE
-d1lEVlFRSEV3aENjblZ6CmMyVnNjekVSTUE4R0ExVUVDaE1JUkdWc2IybDBkR1V4T0RBMkJnTlZC
-QU1UTDBsRFFVNU9JRlJOUTBnZ1FYVjBhRzl5YVhwbFpDQlUKY21Ga1pXMWhjbXNnVUdsc2IzUWdW
-bUZzYVdSaGRHOXlNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQQp4
-bHAzS3BZSFgzV3lBc0ZoU2szTHdXZm5HbHhuVURGcUZaQTNVb3VNWWovWGlnYk1rTmVFWElqbGtS
-T0tUNE9QR2ZSeC9MQXlSbFFRCmpDTXY0cWhia2NYMXA3YXI2M2ZscTRTWk5WY2wxNWw3aDB1VDU4
-RnpTZm5sejB1NXJrSGZKSW1ENDMrbWFQLzhndjM2RlIyN2pXOFIKOXdZNGhrK1dzNElCMGlGU2Q4
-U1h2MUtyOHcvSm1NUVNEa2l1RytSZklpdWJ3US9meTdFa2o1UVdoUFp3K21NeE5LbkhVTHkzeFl6
-MgpMd1ZmZnRqd1V1ZWFjdnFOUkNrTVhsQ2xPQURxZlQ4b1Nab2VEWGVoSHZsUHNMQ2VtR0JvVEt1
-cnNrSVM2OUYweVBFSDVnemUwSCtmCjhGUk9zSW9LU3NWUTM0QjRTL2pvRTY3bnBzSlBUZEtzTlBK
-VHlRSURBUUFCbzRJQmt6Q0NBWTh3REFZRFZSMFRBUUgvQkFJd0FEQWQKQmdOVkhRNEVGZ1FVb0Zw
-WTc2cDV5b05EUkd0UXB6VnVSODFVV1Ewd2djWUdBMVVkSXdTQnZqQ0J1NEFVdzYwK3B0WVJBRVdB
-WERwWApTb3B0M0RFTm5uR2hnWUNrZmpCOE1Rc3dDUVlEVlFRR0V3SlZVekU4TURvR0ExVUVDaE16
-U1c1MFpYSnVaWFFnUTI5eWNHOXlZWFJwCmIyNGdabTl5SUVGemMybG5ibVZrSUU1aGJXVnpJR0Z1
-WkNCT2RXMWlaWEp6TVM4d0xRWURWUVFERXlaSlEwRk9UaUJVY21Ga1pXMWgKY21zZ1EyeGxZWEpw
-Ym1kb2IzVnpaU0JRYVd4dmRDQkRRWUlnTHJBYmV2b2FlNTJ5M2Y2QzJ0QjBTbjNwN1hKbTBUMDJG
-b2d4S0NmTgpoWGt3RGdZRFZSMFBBUUgvQkFRREFnZUFNRFFHQTFVZEh3UXRNQ3N3S2FBbm9DV0dJ
-MmgwZEhBNkx5OWpjbXd1YVdOaGJtNHViM0puCkwzUnRZMmhmY0dsc2IzUXVZM0pzTUZFR0ExVWRJ
-QVJLTUVnd0VBWU9Ld1lCQkFHQ3lSc0JCWU03REFvd05BWUlLd1lCQlFVSEFnRXcKS0RBbUJnZ3JC
-Z0VGQlFjQ0FSWWFhSFIwY0hNNkx5OWpZUzVwWTJGdWJpNXZjbWN2Y0dsc2IzUXdEUVlKS29aSWh2
-Y05BUUVMQlFBRApnZ0VCQUF1aloySWNSMkRWcnRhUnJBNTllTllDbDR4Y3NKTXU4RFFDSHYyOGZU
-ZmkvQmlaWTRJcjdGOWtGeTk2RDdPWjhvTFk1empmCjRkSHhGd0hQcUg4RGg2Sldzelh1SFcxWmEz
-WG1sMFBhSHhDV1JTMFhvbDhXc0hIcE55Z2pNQllmSjBvZFZNODg1VFoxRWw5U2l1RUgKbnluRkJn
-U21pRmM5OXVRZC9ZRFJadUd2L0EwSHl2N3lSOXRrTEVkRDNBMXVOSkJXNFArSEpHcGRLa1lMMVE1
-clU3K29IVlB0TUtLSQozaUZrVUVzYk80NUFWZDd2UC9qLzdKdEFaUGI2a29PVjVsWmkySDFSTGNj
-R3d6ZGV6bmhKZ2QwTjlvYmIwdm5FNDEvVVNXYWZkV1JaClZHa3dQdXFUaGw3c0N0enJKSDhYWTB4
-Y3VtK2NmTHgyRUFJd1VuT2NhYjQ9PC9kczpYNTA5Q2VydGlmaWNhdGU+PC9kczpYNTA5RGF0YT48
-L2RzOktleUluZm8+PC9kczpTaWduYXR1cmU+PC9zbWQ6c2lnbmVkTWFyaz4=
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/active/Trademark-Holder-Arab-Active.smd b/core/src/test/resources/google/registry/tmch/active/Trademark-Holder-Arab-Active.smd
deleted file mode 100644
index 4d9c80787..000000000
--- a/core/src/test/resources/google/registry/tmch/active/Trademark-Holder-Arab-Active.smd
+++ /dev/null
@@ -1,99 +0,0 @@
-Marks: الاختبار & لتقييم
-smdID: 000000901526320396418-65535
-U-labels: xn------nzeaagpf7azb2ppajr3fa, xn-----btdaafne4a7azpoaiq8ea, xn----ymcaaeld1a4a6onahp3ea, xn-----btdaafne4a7azpoaiq4byba, xn----ymcaaeld1a4a6onahp2b7aa, xn--mgbaadjcy1a8mmago8da, xn----ymcaaeld1a4a6onahp1b8aa, xn--mgbaadjcy1a8mmago9a5aa
-notBefore: 2018-05-14T17:53:16.418Z
-notAfter: 2022-08-21T08:59:34.305Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il83YWMz
-NWQ1MS1mZTgyLTQ5ODYtYTgzMC1iZjg1NDI4MzI1YWMiPjxzbWQ6aWQ+MDAwMDAwOTAxNTI2MzIw
-Mzk2NDE4LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo1MzoxNi40MThaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0yMVQwODo1OTozNC4zMDVaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
-cmFkZW1hcms+PG1hcms6aWQ+MDAwMTQyMTUwMzMwNTI5OTE1MDMzMDUyOTktMTwvbWFyazppZD48
-bWFyazptYXJrTmFtZT7Yp9mE2KfYrtiq2KjYp9ixICZhbXA7INmE2KrZgtmK2YrZhTwvbWFyazpt
-YXJrTmFtZT48bWFyazpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpuYW1lPtmF2YfZ
-htiv2LMg2KfZhNmF2LnZhNmI2YXYp9iq2YrYqTwvbWFyazpuYW1lPjxtYXJrOm9yZz7Yp9iu2KrY
-qNin2LE8L21hcms6b3JnPjxtYXJrOmFkZHI+PG1hcms6c3RyZWV0Ptis2LnZgdixINin2KjZhiDY
-s9mK2YbYp9ihIDc1PC9tYXJrOnN0cmVldD48bWFyazpjaXR5PtmF2YPZhtin2LM8L21hcms6Y2l0
-eT48bWFyazpwYz4yOTAwPC9tYXJrOnBjPjxtYXJrOmNjPk1BPC9tYXJrOmNjPjwvbWFyazphZGRy
-PjxtYXJrOnZvaWNlPisyMTIuNTIyNTM5MDQwPC9tYXJrOnZvaWNlPjxtYXJrOmZheD4rMjEyLjUy
-MjUzOTA0MTwvbWFyazpmYXg+PG1hcms6ZW1haWw+aW5mb0BleGFtcGxlLmV4YW1wbGU8L21hcms6
-ZW1haWw+PC9tYXJrOmhvbGRlcj48bWFyazpqdXJpc2RpY3Rpb24+TUE8L21hcms6anVyaXNkaWN0
-aW9uPjxtYXJrOmNsYXNzPjE1PC9tYXJrOmNsYXNzPjxtYXJrOmxhYmVsPnhuLS0tLS0tbnplYWFn
-cGY3YXpiMnBwYWpyM2ZhPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS0tLS1idGRhYWZuZTRh
-N2F6cG9haXE4ZWE8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLS0teW1jYWFlbGQxYTRhNm9u
-YWhwM2VhPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS0tLS1idGRhYWZuZTRhN2F6cG9haXE0
-YnliYTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tLS15bWNhYWVsZDFhNGE2b25haHAyYjdh
-YTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tbWdiYWFkamN5MWE4bW1hZ284ZGE8L21hcms6
-bGFiZWw+PG1hcms6bGFiZWw+eG4tLS0teW1jYWFlbGQxYTRhNm9uYWhwMWI4YWE8L21hcms6bGFi
-ZWw+PG1hcms6bGFiZWw+eG4tLW1nYmFhZGpjeTFhOG1tYWdvOWE1YWE8L21hcms6bGFiZWw+PG1h
-cms6Z29vZHNBbmRTZXJ2aWNlcz7YutmK2KrYp9ixPC9tYXJrOmdvb2RzQW5kU2VydmljZXM+PG1h
-cms6cmVnTnVtPjEyMzQ8L21hcms6cmVnTnVtPjxtYXJrOnJlZ0RhdGU+MjAxMy0wMS0wMVQwMDow
-MDowMC4wMDBaPC9tYXJrOnJlZ0RhdGU+PC9tYXJrOnRyYWRlbWFyaz48L21hcms6bWFyaz48ZHM6
-U2lnbmF0dXJlIHhtbG5zOmRzPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjIiBJ
-ZD0iXzA5ODIzYjE3LWU5YjQtNGU2My05ZjdjLTVlMjI0ODExZWJjZCI+PGRzOlNpZ25lZEluZm8+
-PGRzOkNhbm9uaWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8y
-MDAxLzEwL3htbC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJlTWV0aG9kIEFsZ29yaXRobT0iaHR0
-cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxkc2lnLW1vcmUjcnNhLXNoYTI1NiIvPjxkczpSZWZl
-cmVuY2UgVVJJPSIjXzdhYzM1ZDUxLWZlODItNDk4Ni1hODMwLWJmODU0MjgzMjVhYyI+PGRzOlRy
-YW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDAv
-MDkveG1sZHNpZyNlbnZlbG9wZWQtc2lnbmF0dXJlIi8+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09
-Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jt
-cz48ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94
-bWxlbmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPkJsOTBqOE5QMENpWExpTGZ3bGw1czZwUFo0
-RkhndnNERGdONmpsU0VZdUk9PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48ZHM6UmVm
-ZXJlbmNlIFVSST0iI19kYmJkODUzMy1mM2JhLTRlYmItODIwOC00ZTQyNjA3OWZkYTgiPjxkczpU
-cmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAx
-LzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdv
-cml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdl
-c3RWYWx1ZT5NZGhmNjBmN0l4c0t6ODVLemVvbndtRlg5SGR1ZnBUZDhiYmNpODJhWkhZPTwvZHM6
-RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PC9kczpTaWduZWRJbmZvPjxkczpTaWduYXR1cmVW
-YWx1ZSBJZD0iX2I5YmJmYjU0LWVjNWEtNDA2Mi04OGE2LTlmNDg4YjY1ZjJhNyI+cjc5R08xZGFy
-dDBuZ1lFak8rZkNCTzVKZHU2K0hWdDA3WDMvc2V3VUhHOG5tNmF3NGJESEM0aG0vcEMrSmR2NkpT
-NkJLN2I1YTF3MQpTbWRzSUxxWmxMdmF4K0ZBTmlCQzRaVXpFZUN2cHFqZ2hFTThJN3g0MWdhUnFj
-aDh3Y0kyUTdvSEdNbVo3N2crSU1PdHJBa0taZkxOCjV4c0RZbFkwUTVCWEJoNmVES0V5VHFwMmtJ
-dGc3WVlJZDgvWGNYbldVQTRONDY3RE14b0RyekdJbFI0ZFpmMWMvdzZ3WXhMTFdMak0KZThpYzcr
-cGpRMmFXVjNpQ25pZ2pnQlIvendQMHNzZEwxUGhoNVptUU5PSE9TZ2tEN2c2U2pzRUlJRkhRblZl
-ZGVxaHB0cXBtRjVBYgpzdDFwWk1BWS8rRVIwY2NoMGFmSjRBZURVRjdpYVBWODM1cTEwZz09PC9k
-czpTaWduYXR1cmVWYWx1ZT48ZHM6S2V5SW5mbyBJZD0iX2RiYmQ4NTMzLWYzYmEtNGViYi04MjA4
-LTRlNDI2MDc5ZmRhOCI+PGRzOlg1MDlEYXRhPjxkczpYNTA5Q2VydGlmaWNhdGU+TUlJRk96Q0NC
-Q09nQXdJQkFnSWdMckFiZXZvYWU1MnkzZjZDMnRCMFNuM3A3WEptMFQwMkZvZ3hLQ2ZOaFpjd0RR
-WUpLb1pJaHZjTgpBUUVMQlFBd2ZERUxNQWtHQTFVRUJoTUNWVk14UERBNkJnTlZCQW9UTTBsdWRH
-VnlibVYwSUVOdmNuQnZjbUYwYVc5dUlHWnZjaUJCCmMzTnBaMjVsWkNCT1lXMWxjeUJoYm1RZ1Ru
-VnRZbVZ5Y3pFdk1DMEdBMVVFQXhNbVNVTkJUazRnVkhKaFpHVnRZWEpySUVOc1pXRnkKYVc1bmFH
-OTFjMlVnVUdsc2IzUWdRMEV3SGhjTk1UZ3dNakk0TURBd01EQXdXaGNOTWpNd016QXhNak0xT1RV
-NVdqQ0JqekVMTUFrRwpBMVVFQmhNQ1FrVXhJREFlQmdOVkJBZ1RGMEp5ZFhOelpXeHpMVU5oY0ds
-MFlXd2dVbVZuYVc5dU1SRXdEd1lEVlFRSEV3aENjblZ6CmMyVnNjekVSTUE4R0ExVUVDaE1JUkdW
-c2IybDBkR1V4T0RBMkJnTlZCQU1UTDBsRFFVNU9JRlJOUTBnZ1FYVjBhRzl5YVhwbFpDQlUKY21G
-a1pXMWhjbXNnVUdsc2IzUWdWbUZzYVdSaGRHOXlNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9D
-QVE4QU1JSUJDZ0tDQVFFQQp4bHAzS3BZSFgzV3lBc0ZoU2szTHdXZm5HbHhuVURGcUZaQTNVb3VN
-WWovWGlnYk1rTmVFWElqbGtST0tUNE9QR2ZSeC9MQXlSbFFRCmpDTXY0cWhia2NYMXA3YXI2M2Zs
-cTRTWk5WY2wxNWw3aDB1VDU4RnpTZm5sejB1NXJrSGZKSW1ENDMrbWFQLzhndjM2RlIyN2pXOFIK
-OXdZNGhrK1dzNElCMGlGU2Q4U1h2MUtyOHcvSm1NUVNEa2l1RytSZklpdWJ3US9meTdFa2o1UVdo
-UFp3K21NeE5LbkhVTHkzeFl6MgpMd1ZmZnRqd1V1ZWFjdnFOUkNrTVhsQ2xPQURxZlQ4b1Nab2VE
-WGVoSHZsUHNMQ2VtR0JvVEt1cnNrSVM2OUYweVBFSDVnemUwSCtmCjhGUk9zSW9LU3NWUTM0QjRT
-L2pvRTY3bnBzSlBUZEtzTlBKVHlRSURBUUFCbzRJQmt6Q0NBWTh3REFZRFZSMFRBUUgvQkFJd0FE
-QWQKQmdOVkhRNEVGZ1FVb0ZwWTc2cDV5b05EUkd0UXB6VnVSODFVV1Ewd2djWUdBMVVkSXdTQnZq
-Q0J1NEFVdzYwK3B0WVJBRVdBWERwWApTb3B0M0RFTm5uR2hnWUNrZmpCOE1Rc3dDUVlEVlFRR0V3
-SlZVekU4TURvR0ExVUVDaE16U1c1MFpYSnVaWFFnUTI5eWNHOXlZWFJwCmIyNGdabTl5SUVGemMy
-bG5ibVZrSUU1aGJXVnpJR0Z1WkNCT2RXMWlaWEp6TVM4d0xRWURWUVFERXlaSlEwRk9UaUJVY21G
-a1pXMWgKY21zZ1EyeGxZWEpwYm1kb2IzVnpaU0JRYVd4dmRDQkRRWUlnTHJBYmV2b2FlNTJ5M2Y2
-QzJ0QjBTbjNwN1hKbTBUMDJGb2d4S0NmTgpoWGt3RGdZRFZSMFBBUUgvQkFRREFnZUFNRFFHQTFV
-ZEh3UXRNQ3N3S2FBbm9DV0dJMmgwZEhBNkx5OWpjbXd1YVdOaGJtNHViM0puCkwzUnRZMmhmY0ds
-c2IzUXVZM0pzTUZFR0ExVWRJQVJLTUVnd0VBWU9Ld1lCQkFHQ3lSc0JCWU03REFvd05BWUlLd1lC
-QlFVSEFnRXcKS0RBbUJnZ3JCZ0VGQlFjQ0FSWWFhSFIwY0hNNkx5OWpZUzVwWTJGdWJpNXZjbWN2
-Y0dsc2IzUXdEUVlKS29aSWh2Y05BUUVMQlFBRApnZ0VCQUF1aloySWNSMkRWcnRhUnJBNTllTllD
-bDR4Y3NKTXU4RFFDSHYyOGZUZmkvQmlaWTRJcjdGOWtGeTk2RDdPWjhvTFk1empmCjRkSHhGd0hQ
-cUg4RGg2Sldzelh1SFcxWmEzWG1sMFBhSHhDV1JTMFhvbDhXc0hIcE55Z2pNQllmSjBvZFZNODg1
-VFoxRWw5U2l1RUgKbnluRkJnU21pRmM5OXVRZC9ZRFJadUd2L0EwSHl2N3lSOXRrTEVkRDNBMXVO
-SkJXNFArSEpHcGRLa1lMMVE1clU3K29IVlB0TUtLSQozaUZrVUVzYk80NUFWZDd2UC9qLzdKdEFa
-UGI2a29PVjVsWmkySDFSTGNjR3d6ZGV6bmhKZ2QwTjlvYmIwdm5FNDEvVVNXYWZkV1JaClZHa3dQ
-dXFUaGw3c0N0enJKSDhYWTB4Y3VtK2NmTHgyRUFJd1VuT2NhYjQ9PC9kczpYNTA5Q2VydGlmaWNh
-dGU+PC9kczpYNTA5RGF0YT48L2RzOktleUluZm8+PC9kczpTaWduYXR1cmU+PC9zbWQ6c2lnbmVk
-TWFyaz4=
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/active/Trademark-Holder-Chinese-Active.smd b/core/src/test/resources/google/registry/tmch/active/Trademark-Holder-Chinese-Active.smd
deleted file mode 100644
index 7a5dc23ee..000000000
--- a/core/src/test/resources/google/registry/tmch/active/Trademark-Holder-Chinese-Active.smd
+++ /dev/null
@@ -1,94 +0,0 @@
-Marks: 试验&用例
-smdID: 000000711526320363329-65535
-U-labels: xn----lb7ao71jn7sf0q, xn--and-xc0em33obp2aosv, xn--et-rt3cn04lhyx1ps, xn--fsqv03gtrpson
-notBefore: 2018-05-14T17:52:43.329Z
-notAfter: 2022-08-21T08:12:01.925Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il85YTNh
-YTQwZi1kODE5LTQ1ODktYjIxZi1jNDkyODI5YzRkMTUiPjxzbWQ6aWQ+MDAwMDAwNzExNTI2MzIw
-MzYzMzI5LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo1Mjo0My4zMjlaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0yMVQwODoxMjowMS45MjVaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
-cmFkZW1hcms+PG1hcms6aWQ+MDAwMTQ1MTUwMzA2NDc4NDE1MDMwNjQ3ODQtMTwvbWFyazppZD48
-bWFyazptYXJrTmFtZT7or5XpqowmYW1wO+eUqOS+izwvbWFyazptYXJrTmFtZT48bWFyazpob2xk
-ZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpuYW1lPuadjuWwj+aWuTwvbWFyazpuYW1lPjxt
-YXJrOm9yZz7mtYvor5U8L21hcms6b3JnPjxtYXJrOmFkZHI+PG1hcms6c3RyZWV0Pummmea4r+S4
-nOi3rzblj7fvvIw15Y+35qW877yMOOWPt+WupCA8L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+6Z2S
-5bKb5biCPC9tYXJrOmNpdHk+PG1hcms6cGM+MTAwMDwvbWFyazpwYz48bWFyazpjYz5DTjwvbWFy
-azpjYz48L21hcms6YWRkcj48bWFyazp2b2ljZT4rODYuMTA4NDY1NzE3MzwvbWFyazp2b2ljZT48
-bWFyazpmYXg+Kzg2LjEwODQ2NTcxNzM8L21hcms6ZmF4PjxtYXJrOmVtYWlsPmluZm9AZXhhbXBs
-ZS5leGFtcGxlPC9tYXJrOmVtYWlsPjwvbWFyazpob2xkZXI+PG1hcms6anVyaXNkaWN0aW9uPlVT
-PC9tYXJrOmp1cmlzZGljdGlvbj48bWFyazpjbGFzcz4xNTwvbWFyazpjbGFzcz48bWFyazpsYWJl
-bD54bi0tLS1sYjdhbzcxam43c2YwcTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tYW5kLXhj
-MGVtMzNvYnAyYW9zdjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tZXQtcnQzY24wNGxoeXgx
-cHM8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLWZzcXYwM2d0cnBzb248L21hcms6bGFiZWw+
-PG1hcms6Z29vZHNBbmRTZXJ2aWNlcz4g5ZCJ5LuWPC9tYXJrOmdvb2RzQW5kU2VydmljZXM+PG1h
-cms6cmVnTnVtPjEyMzQ8L21hcms6cmVnTnVtPjxtYXJrOnJlZ0RhdGU+MjAxMy0wMS0wMVQwMDow
-MDowMC4wMDBaPC9tYXJrOnJlZ0RhdGU+PC9tYXJrOnRyYWRlbWFyaz48L21hcms6bWFyaz48ZHM6
-U2lnbmF0dXJlIHhtbG5zOmRzPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjIiBJ
-ZD0iX2NmOWI3MGJhLTA3ZGMtNDIzNi1iOGE4LWFkNTdmOWRjNzkwYSI+PGRzOlNpZ25lZEluZm8+
-PGRzOkNhbm9uaWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8y
-MDAxLzEwL3htbC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJlTWV0aG9kIEFsZ29yaXRobT0iaHR0
-cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxkc2lnLW1vcmUjcnNhLXNoYTI1NiIvPjxkczpSZWZl
-cmVuY2UgVVJJPSIjXzlhM2FhNDBmLWQ4MTktNDU4OS1iMjFmLWM0OTI4MjljNGQxNSI+PGRzOlRy
-YW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDAv
-MDkveG1sZHNpZyNlbnZlbG9wZWQtc2lnbmF0dXJlIi8+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09
-Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jt
-cz48ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94
-bWxlbmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPmdYQ3RKOXdLQUNSdkt5L1htUGJBSnFwbFY1
-MklCN053UFVoUnNqN1dVdk09PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48ZHM6UmVm
-ZXJlbmNlIFVSST0iI19hZTYzMzUzNS1mMzYyLTRjYzUtOWE3My00ZTQ3Y2U4NGI1ZjciPjxkczpU
-cmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAx
-LzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdv
-cml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdl
-c3RWYWx1ZT5xL1AveElVYm1zanhLMzNmTUo4eUdtNUxuenpjZ05ydG8yRHNNM2RqVk9ZPTwvZHM6
-RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PC9kczpTaWduZWRJbmZvPjxkczpTaWduYXR1cmVW
-YWx1ZSBJZD0iXzNlODFkNGJlLTc1YzMtNDAwMS04MDAzLWY0ZWNiYzliZWQ1MSI+TVFvNEVXUWRp
-L3ZOWUViUWVzbDhiY2R5R3J3SWFVaVlyOWtpK3EydkV5UDZ1bllJdzdlRzFKaTNzZTRxL3VkWUhD
-c2Uyc3c3UTkyZgpwQVNic1A0d0tQUldzRjZkZHRRVDVidlY1VS9sWU5YekZ1Rk9jV3ZPdEdPQ3hj
-cVArZTBqMUFNR1ZvbVVPckR1VDg1T1dyQkVJM3Q4CjlqQTE3a0lrZkMwcWNFUUVYdG81dXFHa3NC
-YUl2Y0VheFZCbWN2UlU5ZDJCSlozZnBra1ZXNDlVcTdQaVlhN2xiZktkQWFWOFJtYWYKZnBCQkp2
-K2dUSVNKZklMTnozdHpYNVZZUlkzTmEwdUVEOFNNVnpJc1FOUzZXbzYwM1RUNXYxdThIUFVxYWtr
-ZWZVL3VzVnEwVndYSwphdlg0V1hUVERNeVZHUXh2ck5aNnIzQ2RjMDM3UFptTExNSnREdz09PC9k
-czpTaWduYXR1cmVWYWx1ZT48ZHM6S2V5SW5mbyBJZD0iX2FlNjMzNTM1LWYzNjItNGNjNS05YTcz
-LTRlNDdjZTg0YjVmNyI+PGRzOlg1MDlEYXRhPjxkczpYNTA5Q2VydGlmaWNhdGU+TUlJRk96Q0NC
-Q09nQXdJQkFnSWdMckFiZXZvYWU1MnkzZjZDMnRCMFNuM3A3WEptMFQwMkZvZ3hLQ2ZOaFpjd0RR
-WUpLb1pJaHZjTgpBUUVMQlFBd2ZERUxNQWtHQTFVRUJoTUNWVk14UERBNkJnTlZCQW9UTTBsdWRH
-VnlibVYwSUVOdmNuQnZjbUYwYVc5dUlHWnZjaUJCCmMzTnBaMjVsWkNCT1lXMWxjeUJoYm1RZ1Ru
-VnRZbVZ5Y3pFdk1DMEdBMVVFQXhNbVNVTkJUazRnVkhKaFpHVnRZWEpySUVOc1pXRnkKYVc1bmFH
-OTFjMlVnVUdsc2IzUWdRMEV3SGhjTk1UZ3dNakk0TURBd01EQXdXaGNOTWpNd016QXhNak0xT1RV
-NVdqQ0JqekVMTUFrRwpBMVVFQmhNQ1FrVXhJREFlQmdOVkJBZ1RGMEp5ZFhOelpXeHpMVU5oY0ds
-MFlXd2dVbVZuYVc5dU1SRXdEd1lEVlFRSEV3aENjblZ6CmMyVnNjekVSTUE4R0ExVUVDaE1JUkdW
-c2IybDBkR1V4T0RBMkJnTlZCQU1UTDBsRFFVNU9JRlJOUTBnZ1FYVjBhRzl5YVhwbFpDQlUKY21G
-a1pXMWhjbXNnVUdsc2IzUWdWbUZzYVdSaGRHOXlNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9D
-QVE4QU1JSUJDZ0tDQVFFQQp4bHAzS3BZSFgzV3lBc0ZoU2szTHdXZm5HbHhuVURGcUZaQTNVb3VN
-WWovWGlnYk1rTmVFWElqbGtST0tUNE9QR2ZSeC9MQXlSbFFRCmpDTXY0cWhia2NYMXA3YXI2M2Zs
-cTRTWk5WY2wxNWw3aDB1VDU4RnpTZm5sejB1NXJrSGZKSW1ENDMrbWFQLzhndjM2RlIyN2pXOFIK
-OXdZNGhrK1dzNElCMGlGU2Q4U1h2MUtyOHcvSm1NUVNEa2l1RytSZklpdWJ3US9meTdFa2o1UVdo
-UFp3K21NeE5LbkhVTHkzeFl6MgpMd1ZmZnRqd1V1ZWFjdnFOUkNrTVhsQ2xPQURxZlQ4b1Nab2VE
-WGVoSHZsUHNMQ2VtR0JvVEt1cnNrSVM2OUYweVBFSDVnemUwSCtmCjhGUk9zSW9LU3NWUTM0QjRT
-L2pvRTY3bnBzSlBUZEtzTlBKVHlRSURBUUFCbzRJQmt6Q0NBWTh3REFZRFZSMFRBUUgvQkFJd0FE
-QWQKQmdOVkhRNEVGZ1FVb0ZwWTc2cDV5b05EUkd0UXB6VnVSODFVV1Ewd2djWUdBMVVkSXdTQnZq
-Q0J1NEFVdzYwK3B0WVJBRVdBWERwWApTb3B0M0RFTm5uR2hnWUNrZmpCOE1Rc3dDUVlEVlFRR0V3
-SlZVekU4TURvR0ExVUVDaE16U1c1MFpYSnVaWFFnUTI5eWNHOXlZWFJwCmIyNGdabTl5SUVGemMy
-bG5ibVZrSUU1aGJXVnpJR0Z1WkNCT2RXMWlaWEp6TVM4d0xRWURWUVFERXlaSlEwRk9UaUJVY21G
-a1pXMWgKY21zZ1EyeGxZWEpwYm1kb2IzVnpaU0JRYVd4dmRDQkRRWUlnTHJBYmV2b2FlNTJ5M2Y2
-QzJ0QjBTbjNwN1hKbTBUMDJGb2d4S0NmTgpoWGt3RGdZRFZSMFBBUUgvQkFRREFnZUFNRFFHQTFV
-ZEh3UXRNQ3N3S2FBbm9DV0dJMmgwZEhBNkx5OWpjbXd1YVdOaGJtNHViM0puCkwzUnRZMmhmY0ds
-c2IzUXVZM0pzTUZFR0ExVWRJQVJLTUVnd0VBWU9Ld1lCQkFHQ3lSc0JCWU03REFvd05BWUlLd1lC
-QlFVSEFnRXcKS0RBbUJnZ3JCZ0VGQlFjQ0FSWWFhSFIwY0hNNkx5OWpZUzVwWTJGdWJpNXZjbWN2
-Y0dsc2IzUXdEUVlKS29aSWh2Y05BUUVMQlFBRApnZ0VCQUF1aloySWNSMkRWcnRhUnJBNTllTllD
-bDR4Y3NKTXU4RFFDSHYyOGZUZmkvQmlaWTRJcjdGOWtGeTk2RDdPWjhvTFk1empmCjRkSHhGd0hQ
-cUg4RGg2Sldzelh1SFcxWmEzWG1sMFBhSHhDV1JTMFhvbDhXc0hIcE55Z2pNQllmSjBvZFZNODg1
-VFoxRWw5U2l1RUgKbnluRkJnU21pRmM5OXVRZC9ZRFJadUd2L0EwSHl2N3lSOXRrTEVkRDNBMXVO
-SkJXNFArSEpHcGRLa1lMMVE1clU3K29IVlB0TUtLSQozaUZrVUVzYk80NUFWZDd2UC9qLzdKdEFa
-UGI2a29PVjVsWmkySDFSTGNjR3d6ZGV6bmhKZ2QwTjlvYmIwdm5FNDEvVVNXYWZkV1JaClZHa3dQ
-dXFUaGw3c0N0enJKSDhYWTB4Y3VtK2NmTHgyRUFJd1VuT2NhYjQ9PC9kczpYNTA5Q2VydGlmaWNh
-dGU+PC9kczpYNTA5RGF0YT48L2RzOktleUluZm8+PC9kczpTaWduYXR1cmU+PC9zbWQ6c2lnbmVk
-TWFyaz4=
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/active/Trademark-Holder-English-Active.smd b/core/src/test/resources/google/registry/tmch/active/Trademark-Holder-English-Active.smd
deleted file mode 100644
index 6f6e5d543..000000000
--- a/core/src/test/resources/google/registry/tmch/active/Trademark-Holder-English-Active.smd
+++ /dev/null
@@ -1,99 +0,0 @@
-Marks: Test & Validate
-smdID: 000000541526320345762-65535
-U-labels: test---validate, test--validate, test-et-validate, test-etvalidate, test-validate, testand-validate, testandvalidate, testet-validate, testetvalidate, testvalidate
-notBefore: 2018-05-14T17:52:25.762Z
-notAfter: 2022-08-21T08:12:19.525Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il81MDRi
-ZDc4NS1lNzViLTRkYTMtYWEzYy0yZmYxNDlkYmJlNWUiPjxzbWQ6aWQ+MDAwMDAwNTQxNTI2MzIw
-MzQ1NzYyLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo1MjoyNS43NjJaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0yMVQwODoxMjoxOS41MjVaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
-cmFkZW1hcms+PG1hcms6aWQ+MDAwMTM2MTUwMzA1NjkwOTE1MDMwNTY5MDktMTwvbWFyazppZD48
-bWFyazptYXJrTmFtZT5UZXN0ICZhbXA7IFZhbGlkYXRlPC9tYXJrOm1hcmtOYW1lPjxtYXJrOmhv
-bGRlciBlbnRpdGxlbWVudD0ib3duZXIiPjxtYXJrOm5hbWU+RnJhbmsgV2hpdGU8L21hcms6bmFt
-ZT48bWFyazpvcmc+VGVzdCBPcmdhbml6YXRpb248L21hcms6b3JnPjxtYXJrOmFkZHI+PG1hcms6
-c3RyZWV0Pldlc3QgQXJxdWVzIEF2ZW51ZSAxMDEgPC9tYXJrOnN0cmVldD48bWFyazpjaXR5PlN1
-bm55dmFsZTwvbWFyazpjaXR5PjxtYXJrOnNwPkNBPC9tYXJrOnNwPjxtYXJrOnBjPjEwMDIzLTMy
-NDE8L21hcms6cGM+PG1hcms6Y2M+VVM8L21hcms6Y2M+PC9tYXJrOmFkZHI+PG1hcms6dm9pY2U+
-KzEuMzAxNDU1NjYwMDwvbWFyazp2b2ljZT48bWFyazpmYXg+KzEuMzAxNDU1NjYwMTwvbWFyazpm
-YXg+PG1hcms6ZW1haWw+aW5mb0BleGFtcGxlLmV4YW1wbGU8L21hcms6ZW1haWw+PC9tYXJrOmhv
-bGRlcj48bWFyazpqdXJpc2RpY3Rpb24+VVM8L21hcms6anVyaXNkaWN0aW9uPjxtYXJrOmNsYXNz
-PjE1PC9tYXJrOmNsYXNzPjxtYXJrOmxhYmVsPnRlc3QtLS12YWxpZGF0ZTwvbWFyazpsYWJlbD48
-bWFyazpsYWJlbD50ZXN0LS12YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0LWV0
-LXZhbGlkYXRlPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnRlc3QtZXR2YWxpZGF0ZTwvbWFyazps
-YWJlbD48bWFyazpsYWJlbD50ZXN0LXZhbGlkYXRlPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnRl
-c3RhbmQtdmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+dGVzdGFuZHZhbGlkYXRlPC9t
-YXJrOmxhYmVsPjxtYXJrOmxhYmVsPnRlc3RldC12YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazps
-YWJlbD50ZXN0ZXR2YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0dmFsaWRhdGU8
-L21hcms6bGFiZWw+PG1hcms6Z29vZHNBbmRTZXJ2aWNlcz5ndWl0YXI8L21hcms6Z29vZHNBbmRT
-ZXJ2aWNlcz48bWFyazpyZWdOdW0+MTIzNDwvbWFyazpyZWdOdW0+PG1hcms6cmVnRGF0ZT4yMDEz
-LTAxLTAxVDAwOjAwOjAwLjAwMFo8L21hcms6cmVnRGF0ZT48bWFyazpleERhdGU+MjAxNC0xMS0w
-NVQwMDowMDowMC4wMDBaPC9tYXJrOmV4RGF0ZT48L21hcms6dHJhZGVtYXJrPjwvbWFyazptYXJr
-PjxkczpTaWduYXR1cmUgeG1sbnM6ZHM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1sZHNp
-ZyMiIElkPSJfOTJjYWZjMmMtOWM3Yy00MTgwLWI4ZDMtZjI0NmU2NDEzZjBiIj48ZHM6U2lnbmVk
-SW5mbz48ZHM6Q2Fub25pY2FsaXphdGlvbk1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMu
-b3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjxkczpTaWduYXR1cmVNZXRob2QgQWxnb3JpdGht
-PSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGRzaWctbW9yZSNyc2Etc2hhMjU2Ii8+PGRz
-OlJlZmVyZW5jZSBVUkk9IiNfNTA0YmQ3ODUtZTc1Yi00ZGEzLWFhM2MtMmZmMTQ5ZGJiZTVlIj48
-ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcv
-MjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48ZHM6VHJhbnNmb3JtIEFsZ29y
-aXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFu
-c2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAx
-LzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+UmlQcHZCR3B5N3lQZHo5VmVER3BI
-M3RWSGdsS1NtU0xWREYvL3R1ZlcwRT08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNlPjxk
-czpSZWZlcmVuY2UgVVJJPSIjXzE4NmUxY2Y3LTNmMWMtNDM0Ny05MWJmLTg4NzlmZmFjNmRhZSI+
-PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3Jn
-LzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6RGlnZXN0TWV0aG9k
-IEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxlbmMjc2hhMjU2Ii8+PGRz
-OkRpZ2VzdFZhbHVlPnBFSTIvZmhmN0YwOThWTUF6Q3d2eURpRENMNmhBU3NUbTNDUWQ0eFc0LzA9
-PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48L2RzOlNpZ25lZEluZm8+PGRzOlNpZ25h
-dHVyZVZhbHVlIElkPSJfMGEyNzlmNWUtZGY4ZS00NGEyLWI0Y2MtMzFlYmUyYjcyYmQ1Ij5DOG5P
-SFFIR3AwZlpYYVVEWUZxVVBhSS9ESG1rZXJSd0d3R1gybndzREIxazViOGJ4U3lnUFo3cDN6ZWZL
-Y0NLTG8zdFhtNWVUU3dxClJFNVU1Y0tvVTRUYXRlS3JUUDV1SWtTbENhVXJOTU1ZbnFWcy9pNXNy
-TlhMbENYdFpQT0hkTlM0VDVlcXdNMXpTWDlZTCsvSkRnRzIKMVVFbTh2Wk5qbmQ2c1ZzMDdnM0hZ
-aVNZczBlKzZLTjdQbWV3T3NyVHZQbGNyQk1YK2w0MDlZNW5wUmNVRFQ4NUVCQ3l0bDZteG95bwov
-d0NvYjR2cS9oOVE1Qk9nMFZ2NnNiRCt3d0RqQ0pRZzBBU25nVXRQM2w1L3FOODJEYWxLcXRqUDUw
-WGduV2tJL1dSTlVQOG50c0NOCmtCZEY2Mnd0K1E2K2hOU3pDLzRxS2pPMFV6ZlBjWStqSkZ0SVpR
-PT08L2RzOlNpZ25hdHVyZVZhbHVlPjxkczpLZXlJbmZvIElkPSJfMTg2ZTFjZjctM2YxYy00MzQ3
-LTkxYmYtODg3OWZmYWM2ZGFlIj48ZHM6WDUwOURhdGE+PGRzOlg1MDlDZXJ0aWZpY2F0ZT5NSUlG
-T3pDQ0JDT2dBd0lCQWdJZ0xyQWJldm9hZTUyeTNmNkMydEIwU24zcDdYSm0wVDAyRm9neEtDZk5o
-WmN3RFFZSktvWklodmNOCkFRRUxCUUF3ZkRFTE1Ba0dBMVVFQmhNQ1ZWTXhQREE2QmdOVkJBb1RN
-MGx1ZEdWeWJtVjBJRU52Y25CdmNtRjBhVzl1SUdadmNpQkIKYzNOcFoyNWxaQ0JPWVcxbGN5Qmhi
-bVFnVG5WdFltVnljekV2TUMwR0ExVUVBeE1tU1VOQlRrNGdWSEpoWkdWdFlYSnJJRU5zWldGeQph
-VzVuYUc5MWMyVWdVR2xzYjNRZ1EwRXdIaGNOTVRnd01qSTRNREF3TURBd1doY05Nak13TXpBeE1q
-TTFPVFU1V2pDQmp6RUxNQWtHCkExVUVCaE1DUWtVeElEQWVCZ05WQkFnVEYwSnlkWE56Wld4ekxV
-TmhjR2wwWVd3Z1VtVm5hVzl1TVJFd0R3WURWUVFIRXdoQ2NuVnoKYzJWc2N6RVJNQThHQTFVRUNo
-TUlSR1ZzYjJsMGRHVXhPREEyQmdOVkJBTVRMMGxEUVU1T0lGUk5RMGdnUVhWMGFHOXlhWHBsWkNC
-VQpjbUZrWlcxaGNtc2dVR2xzYjNRZ1ZtRnNhV1JoZEc5eU1JSUJJakFOQmdrcWhraUc5dzBCQVFF
-RkFBT0NBUThBTUlJQkNnS0NBUUVBCnhscDNLcFlIWDNXeUFzRmhTazNMd1dmbkdseG5VREZxRlpB
-M1VvdU1Zai9YaWdiTWtOZUVYSWpsa1JPS1Q0T1BHZlJ4L0xBeVJsUVEKakNNdjRxaGJrY1gxcDdh
-cjYzZmxxNFNaTlZjbDE1bDdoMHVUNThGelNmbmx6MHU1cmtIZkpJbUQ0MyttYVAvOGd2MzZGUjI3
-alc4Ugo5d1k0aGsrV3M0SUIwaUZTZDhTWHYxS3I4dy9KbU1RU0RraXVHK1JmSWl1YndRL2Z5N0Vr
-ajVRV2hQWncrbU14TktuSFVMeTN4WXoyCkx3VmZmdGp3VXVlYWN2cU5SQ2tNWGxDbE9BRHFmVDhv
-U1pvZURYZWhIdmxQc0xDZW1HQm9US3Vyc2tJUzY5RjB5UEVINWd6ZTBIK2YKOEZST3NJb0tTc1ZR
-MzRCNFMvam9FNjducHNKUFRkS3NOUEpUeVFJREFRQUJvNElCa3pDQ0FZOHdEQVlEVlIwVEFRSC9C
-QUl3QURBZApCZ05WSFE0RUZnUVVvRnBZNzZwNXlvTkRSR3RRcHpWdVI4MVVXUTB3Z2NZR0ExVWRJ
-d1NCdmpDQnU0QVV3NjArcHRZUkFFV0FYRHBYClNvcHQzREVObm5HaGdZQ2tmakI4TVFzd0NRWURW
-UVFHRXdKVlV6RThNRG9HQTFVRUNoTXpTVzUwWlhKdVpYUWdRMjl5Y0c5eVlYUnAKYjI0Z1ptOXlJ
-RUZ6YzJsbmJtVmtJRTVoYldWeklHRnVaQ0JPZFcxaVpYSnpNUzh3TFFZRFZRUURFeVpKUTBGT1Rp
-QlVjbUZrWlcxaApjbXNnUTJ4bFlYSnBibWRvYjNWelpTQlFhV3h2ZENCRFFZSWdMckFiZXZvYWU1
-MnkzZjZDMnRCMFNuM3A3WEptMFQwMkZvZ3hLQ2ZOCmhYa3dEZ1lEVlIwUEFRSC9CQVFEQWdlQU1E
-UUdBMVVkSHdRdE1Dc3dLYUFub0NXR0kyaDBkSEE2THk5amNtd3VhV05oYm00dWIzSm4KTDNSdFky
-aGZjR2xzYjNRdVkzSnNNRkVHQTFVZElBUktNRWd3RUFZT0t3WUJCQUdDeVJzQkJZTTdEQW93TkFZ
-SUt3WUJCUVVIQWdFdwpLREFtQmdnckJnRUZCUWNDQVJZYWFIUjBjSE02THk5allTNXBZMkZ1Ymk1
-dmNtY3ZjR2xzYjNRd0RRWUpLb1pJaHZjTkFRRUxCUUFECmdnRUJBQXVqWjJJY1IyRFZydGFSckE1
-OWVOWUNsNHhjc0pNdThEUUNIdjI4ZlRmaS9CaVpZNElyN0Y5a0Z5OTZEN09aOG9MWTV6amYKNGRI
-eEZ3SFBxSDhEaDZKV3N6WHVIVzFaYTNYbWwwUGFIeENXUlMwWG9sOFdzSEhwTnlnak1CWWZKMG9k
-Vk04ODVUWjFFbDlTaXVFSApueW5GQmdTbWlGYzk5dVFkL1lEUlp1R3YvQTBIeXY3eVI5dGtMRWRE
-M0ExdU5KQlc0UCtISkdwZEtrWUwxUTVyVTcrb0hWUHRNS0tJCjNpRmtVRXNiTzQ1QVZkN3ZQL2ov
-N0p0QVpQYjZrb09WNWxaaTJIMVJMY2NHd3pkZXpuaEpnZDBOOW9iYjB2bkU0MS9VU1dhZmRXUloK
-Vkdrd1B1cVRobDdzQ3R6ckpIOFhZMHhjdW0rY2ZMeDJFQUl3VW5PY2FiND08L2RzOlg1MDlDZXJ0
-aWZpY2F0ZT48L2RzOlg1MDlEYXRhPjwvZHM6S2V5SW5mbz48L2RzOlNpZ25hdHVyZT48L3NtZDpz
-aWduZWRNYXJrPg==
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/active/Trademark-Holder-French-Active.smd b/core/src/test/resources/google/registry/tmch/active/Trademark-Holder-French-Active.smd
deleted file mode 100644
index a0c2935e5..000000000
--- a/core/src/test/resources/google/registry/tmch/active/Trademark-Holder-French-Active.smd
+++ /dev/null
@@ -1,99 +0,0 @@
-Marks: Essai & évaluation
-smdID: 000000651526320351638-65535
-U-labels: xn--essai---valuation-itb, xn--essai--valuation-hqb, xn--essai-and-valuation-kzb, xn--essai-andvaluation-jwb, xn--essai-valuation-gnb, xn--essaiand-valuation-jwb, xn--essaiandvaluation-itb, xn--essaiet-valuation-itb, xn--essaietvaluation-hqb, xn--essaivaluation-fkb
-notBefore: 2018-05-14T17:52:31.638Z
-notAfter: 2022-08-21T08:12:14.116Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il8zYWE2
-ZjExMS1lMjI4LTRiNWItOTc3MC00ZjkzYjE0MTI2MDkiPjxzbWQ6aWQ+MDAwMDAwNjUxNTI2MzIw
-MzUxNjM4LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo1MjozMS42MzhaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0yMVQwODoxMjoxNC4xMTZaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
-cmFkZW1hcms+PG1hcms6aWQ+MDAwMTM4MTUwMzA2MDc4MjE1MDMwNjA3ODItMTwvbWFyazppZD48
-bWFyazptYXJrTmFtZT5Fc3NhaSAmYW1wOyDDqXZhbHVhdGlvbjwvbWFyazptYXJrTmFtZT48bWFy
-azpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpuYW1lPkplYW4gTGVibGFuYzwvbWFy
-azpuYW1lPjxtYXJrOm9yZz5PcmFuaXNhdGlvbiBkZSB0ZXN0PC9tYXJrOm9yZz48bWFyazphZGRy
-PjxtYXJrOnN0cmVldD5SVUUgUk9HTkUgNDAgPC9tYXJrOnN0cmVldD48bWFyazpjaXR5PkFSVE9J
-UzwvbWFyazpjaXR5PjxtYXJrOnBjPjIxMzAxPC9tYXJrOnBjPjxtYXJrOmNjPkZSPC9tYXJrOmNj
-PjwvbWFyazphZGRyPjxtYXJrOnZvaWNlPiszMy4yNjQ5OTUwMzI8L21hcms6dm9pY2U+PG1hcms6
-ZmF4PiszMy4yNjQ5OTUwMzM8L21hcms6ZmF4PjxtYXJrOmVtYWlsPmluZm9AZXhhbXBsZS5leGFt
-cGxlPC9tYXJrOmVtYWlsPjwvbWFyazpob2xkZXI+PG1hcms6anVyaXNkaWN0aW9uPlVTPC9tYXJr
-Omp1cmlzZGljdGlvbj48bWFyazpjbGFzcz4xNTwvbWFyazpjbGFzcz48bWFyazpsYWJlbD54bi0t
-ZXNzYWktLS12YWx1YXRpb24taXRiPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1lc3NhaS0t
-dmFsdWF0aW9uLWhxYjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tZXNzYWktYW5kLXZhbHVh
-dGlvbi1remI8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLWVzc2FpLWFuZHZhbHVhdGlvbi1q
-d2I8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLWVzc2FpLXZhbHVhdGlvbi1nbmI8L21hcms6
-bGFiZWw+PG1hcms6bGFiZWw+eG4tLWVzc2FpYW5kLXZhbHVhdGlvbi1qd2I8L21hcms6bGFiZWw+
-PG1hcms6bGFiZWw+eG4tLWVzc2FpYW5kdmFsdWF0aW9uLWl0YjwvbWFyazpsYWJlbD48bWFyazps
-YWJlbD54bi0tZXNzYWlldC12YWx1YXRpb24taXRiPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhu
-LS1lc3NhaWV0dmFsdWF0aW9uLWhxYjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tZXNzYWl2
-YWx1YXRpb24tZmtiPC9tYXJrOmxhYmVsPjxtYXJrOmdvb2RzQW5kU2VydmljZXM+Z3VpdGFyZTwv
-bWFyazpnb29kc0FuZFNlcnZpY2VzPjxtYXJrOnJlZ051bT4xMjM0PC9tYXJrOnJlZ051bT48bWFy
-azpyZWdEYXRlPjIwMTMtMDEtMDFUMDA6MDA6MDAuMDAwWjwvbWFyazpyZWdEYXRlPjwvbWFyazp0
-cmFkZW1hcms+PC9tYXJrOm1hcms+PGRzOlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0cDovL3d3dy53
-My5vcmcvMjAwMC8wOS94bWxkc2lnIyIgSWQ9Il84NWI2MTY1NC05NmM4LTRkYjctOGVlOS0yYTJl
-YjA1OTMzOTUiPjxkczpTaWduZWRJbmZvPjxkczpDYW5vbmljYWxpemF0aW9uTWV0aG9kIEFsZ29y
-aXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PGRzOlNpZ25h
-dHVyZU1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZHNpZy1t
-b3JlI3JzYS1zaGEyNTYiLz48ZHM6UmVmZXJlbmNlIFVSST0iI18zYWE2ZjExMS1lMjI4LTRiNWIt
-OTc3MC00ZjkzYjE0MTI2MDkiPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGht
-PSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjZW52ZWxvcGVkLXNpZ25hdHVyZSIv
-PjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1l
-eGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0
-dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1ZT5a
-VnlDb2lBb3M4TWV3SGFRQUhoNHZGcnFCS2l2QytDY29BZXd0Y1d6QmNNPTwvZHM6RGlnZXN0VmFs
-dWU+PC9kczpSZWZlcmVuY2U+PGRzOlJlZmVyZW5jZSBVUkk9IiNfMzgzNDcyMDYtYjIxNS00OGE2
-LWI4NjMtMGIxYmUzZTk3NmY3Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRo
-bT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zv
-cm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0
-L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+ZFBDR0NsN0NPandVYmE5WTVxeWEwRHEy
-WE5aeTY1VDR1M3ErUkt6RjlVbz08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNlPjwvZHM6
-U2lnbmVkSW5mbz48ZHM6U2lnbmF0dXJlVmFsdWUgSWQ9Il9kMTg3MmY4MS02ZjBlLTQ0ZGYtODEy
-Ni1jMDljZTk1YjlmNmIiPnNsbGZ0dEowUEl1S2wvdGhoOTZyM3pBaG1vb0NWTE9UNm1BcmlyRCs4
-MEgzSUpWRXNialh4OWtNTHlLZkM0UlVsRkZJdi9WVVd3clQKeG0xbVgyY2grVHFWRG9NczZHQWVY
-eVJxUGtQaGdvejhNeGNaWi80TS9SK25teEpSK1dsbVBSZ0Z4bFd3dDZBTFRkL0RKT0RJR1FDYQpt
-YUdVK0ZGdXpDS2NQZ0FISTBTSzZJR2JtZUZMNW1jRUNhZHBxNUxNamxGYU9vNmZkNTRGMDBkWDZ1
-RTc2cmo5U2pZdVJvNkVjQjE5ClkyMXk4YVFOVU9GVmY1N25lLytsT0UwaExuS1JveHlJNVhzUDV3
-MXlld0pQRXZ5ZVdvR1JzRVFhSmxBUmNqUDIwTVhiaEJLcVgrUE4KRzQrTHBlZXcyTlNZSnF2dzhE
-VFZ1ZGROR1RKMlhMajRGdk55eHc9PTwvZHM6U2lnbmF0dXJlVmFsdWU+PGRzOktleUluZm8gSWQ9
-Il8zODM0NzIwNi1iMjE1LTQ4YTYtYjg2My0wYjFiZTNlOTc2ZjciPjxkczpYNTA5RGF0YT48ZHM6
-WDUwOUNlcnRpZmljYXRlPk1JSUZPekNDQkNPZ0F3SUJBZ0lnTHJBYmV2b2FlNTJ5M2Y2QzJ0QjBT
-bjNwN1hKbTBUMDJGb2d4S0NmTmhaY3dEUVlKS29aSWh2Y04KQVFFTEJRQXdmREVMTUFrR0ExVUVC
-aE1DVlZNeFBEQTZCZ05WQkFvVE0wbHVkR1Z5Ym1WMElFTnZjbkJ2Y21GMGFXOXVJR1p2Y2lCQgpj
-M05wWjI1bFpDQk9ZVzFsY3lCaGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF4TW1TVU5CVGs0Z1ZI
-SmhaR1Z0WVhKcklFTnNaV0Z5CmFXNW5hRzkxYzJVZ1VHbHNiM1FnUTBFd0hoY05NVGd3TWpJNE1E
-QXdNREF3V2hjTk1qTXdNekF4TWpNMU9UVTVXakNCanpFTE1Ba0cKQTFVRUJoTUNRa1V4SURBZUJn
-TlZCQWdURjBKeWRYTnpaV3h6TFVOaGNHbDBZV3dnVW1WbmFXOXVNUkV3RHdZRFZRUUhFd2hDY25W
-egpjMlZzY3pFUk1BOEdBMVVFQ2hNSVJHVnNiMmwwZEdVeE9EQTJCZ05WQkFNVEwwbERRVTVPSUZS
-TlEwZ2dRWFYwYUc5eWFYcGxaQ0JVCmNtRmtaVzFoY21zZ1VHbHNiM1FnVm1Gc2FXUmhkRzl5TUlJ
-QklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUEKeGxwM0twWUhYM1d5QXNG
-aFNrM0x3V2ZuR2x4blVERnFGWkEzVW91TVlqL1hpZ2JNa05lRVhJamxrUk9LVDRPUEdmUngvTEF5
-UmxRUQpqQ012NHFoYmtjWDFwN2FyNjNmbHE0U1pOVmNsMTVsN2gwdVQ1OEZ6U2ZubHowdTVya0hm
-SkltRDQzK21hUC84Z3YzNkZSMjdqVzhSCjl3WTRoaytXczRJQjBpRlNkOFNYdjFLcjh3L0ptTVFT
-RGtpdUcrUmZJaXVid1EvZnk3RWtqNVFXaFBadyttTXhOS25IVUx5M3hZejIKTHdWZmZ0andVdWVh
-Y3ZxTlJDa01YbENsT0FEcWZUOG9TWm9lRFhlaEh2bFBzTENlbUdCb1RLdXJza0lTNjlGMHlQRUg1
-Z3plMEgrZgo4RlJPc0lvS1NzVlEzNEI0Uy9qb0U2N25wc0pQVGRLc05QSlR5UUlEQVFBQm80SUJr
-ekNDQVk4d0RBWURWUjBUQVFIL0JBSXdBREFkCkJnTlZIUTRFRmdRVW9GcFk3NnA1eW9ORFJHdFFw
-elZ1UjgxVVdRMHdnY1lHQTFVZEl3U0J2akNCdTRBVXc2MCtwdFlSQUVXQVhEcFgKU29wdDNERU5u
-bkdoZ1lDa2ZqQjhNUXN3Q1FZRFZRUUdFd0pWVXpFOE1Eb0dBMVVFQ2hNelNXNTBaWEp1WlhRZ1Ey
-OXljRzl5WVhScApiMjRnWm05eUlFRnpjMmxuYm1Wa0lFNWhiV1Z6SUdGdVpDQk9kVzFpWlhKek1T
-OHdMUVlEVlFRREV5WkpRMEZPVGlCVWNtRmtaVzFoCmNtc2dRMnhsWVhKcGJtZG9iM1Z6WlNCUWFX
-eHZkQ0JEUVlJZ0xyQWJldm9hZTUyeTNmNkMydEIwU24zcDdYSm0wVDAyRm9neEtDZk4KaFhrd0Rn
-WURWUjBQQVFIL0JBUURBZ2VBTURRR0ExVWRId1F0TUNzd0thQW5vQ1dHSTJoMGRIQTZMeTlqY213
-dWFXTmhibTR1YjNKbgpMM1J0WTJoZmNHbHNiM1F1WTNKc01GRUdBMVVkSUFSS01FZ3dFQVlPS3dZ
-QkJBR0N5UnNCQllNN0RBb3dOQVlJS3dZQkJRVUhBZ0V3CktEQW1CZ2dyQmdFRkJRY0NBUllhYUhS
-MGNITTZMeTlqWVM1cFkyRnViaTV2Y21jdmNHbHNiM1F3RFFZSktvWklodmNOQVFFTEJRQUQKZ2dF
-QkFBdWpaMkljUjJEVnJ0YVJyQTU5ZU5ZQ2w0eGNzSk11OERRQ0h2MjhmVGZpL0JpWlk0SXI3Rjlr
-Rnk5NkQ3T1o4b0xZNXpqZgo0ZEh4RndIUHFIOERoNkpXc3pYdUhXMVphM1htbDBQYUh4Q1dSUzBY
-b2w4V3NISHBOeWdqTUJZZkowb2RWTTg4NVRaMUVsOVNpdUVICm55bkZCZ1NtaUZjOTl1UWQvWURS
-WnVHdi9BMEh5djd5Ujl0a0xFZEQzQTF1TkpCVzRQK0hKR3BkS2tZTDFRNXJVNytvSFZQdE1LS0kK
-M2lGa1VFc2JPNDVBVmQ3dlAvai83SnRBWlBiNmtvT1Y1bFppMkgxUkxjY0d3emRlem5oSmdkME45
-b2JiMHZuRTQxL1VTV2FmZFdSWgpWR2t3UHVxVGhsN3NDdHpySkg4WFkweGN1bStjZkx4MkVBSXdV
-bk9jYWI0PTwvZHM6WDUwOUNlcnRpZmljYXRlPjwvZHM6WDUwOURhdGE+PC9kczpLZXlJbmZvPjwv
-ZHM6U2lnbmF0dXJlPjwvc21kOnNpZ25lZE1hcms+
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/active/Trademark-Holder-Russian-Active.smd b/core/src/test/resources/google/registry/tmch/active/Trademark-Holder-Russian-Active.smd
deleted file mode 100644
index 5046570a3..000000000
--- a/core/src/test/resources/google/registry/tmch/active/Trademark-Holder-Russian-Active.smd
+++ /dev/null
@@ -1,94 +0,0 @@
-Marks: Тест&случай
-smdID: 000000681526320357491-65535
-U-labels: xn----8sbnsi8abecn8b, xn--and-8cdv2am8bdecr6c, xn--et-8kcrxk3bcecp2c, xn--80ajng3aaecl4b
-notBefore: 2018-05-14T17:52:37.491Z
-notAfter: 2022-08-21T08:12:08.921Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il82ZDA4
-NDdkZS0yZWMyLTQ5YjgtYjRkMy05MTMwMDE0YmQxN2MiPjxzbWQ6aWQ+MDAwMDAwNjgxNTI2MzIw
-MzU3NDkxLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo1MjozNy40OTFaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0yMVQwODoxMjowOC45MjFaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
-cmFkZW1hcms+PG1hcms6aWQ+MDAwMTQwMTUwMzA2MzYxMzE1MDMwNjM2MTMtMTwvbWFyazppZD48
-bWFyazptYXJrTmFtZT7QotC10YHRgiZhbXA70YHQu9GD0YfQsNC5PC9tYXJrOm1hcmtOYW1lPjxt
-YXJrOmhvbGRlciBlbnRpdGxlbWVudD0ib3duZXIiPjxtYXJrOm5hbWU+0J3QsNGC0LDQu9GM0Y8g
-0JDQvdGC0L7QvdC+0LLQsDwvbWFyazpuYW1lPjxtYXJrOm9yZz7QkNC90YLQvtC90L7QstCwPC9t
-YXJrOm9yZz48bWFyazphZGRyPjxtYXJrOnN0cmVldD7Qn9GA0L7RgdC/0LXQutGCINCS0LXRgNC9
-0LDQtNGB0LrQvtCz0L4gMTU8L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+0JzQvtGB0LrQstCwPC9t
-YXJrOmNpdHk+PG1hcms6cGM+MTE3NDg1PC9tYXJrOnBjPjxtYXJrOmNjPlJVPC9tYXJrOmNjPjwv
-bWFyazphZGRyPjxtYXJrOnZvaWNlPis3LjkxODgyMjE2NzQ8L21hcms6dm9pY2U+PG1hcms6ZW1h
-aWw+aW5mb0BleGFtcGxlLmV4YW1wbGU8L21hcms6ZW1haWw+PC9tYXJrOmhvbGRlcj48bWFyazpq
-dXJpc2RpY3Rpb24+VVM8L21hcms6anVyaXNkaWN0aW9uPjxtYXJrOmNsYXNzPjE1PC9tYXJrOmNs
-YXNzPjxtYXJrOmxhYmVsPnhuLS0tLThzYm5zaThhYmVjbjhiPC9tYXJrOmxhYmVsPjxtYXJrOmxh
-YmVsPnhuLS1hbmQtOGNkdjJhbThiZGVjcjZjPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1l
-dC04a2NyeGszYmNlY3AyYzwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tODBham5nM2FhZWNs
-NGI8L21hcms6bGFiZWw+PG1hcms6Z29vZHNBbmRTZXJ2aWNlcz7Qs9C40YLQsNGA0LA8L21hcms6
-Z29vZHNBbmRTZXJ2aWNlcz48bWFyazpyZWdOdW0+MTIzNDwvbWFyazpyZWdOdW0+PG1hcms6cmVn
-RGF0ZT4yMDEzLTAxLTAxVDAwOjAwOjAwLjAwMFo8L21hcms6cmVnRGF0ZT48L21hcms6dHJhZGVt
-YXJrPjwvbWFyazptYXJrPjxkczpTaWduYXR1cmUgeG1sbnM6ZHM9Imh0dHA6Ly93d3cudzMub3Jn
-LzIwMDAvMDkveG1sZHNpZyMiIElkPSJfOWM2NmZhMGUtMDY3ZS00YWQ0LWI4OWItZjM4NTA1NzQ1
-N2YwIj48ZHM6U2lnbmVkSW5mbz48ZHM6Q2Fub25pY2FsaXphdGlvbk1ldGhvZCBBbGdvcml0aG09
-Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjxkczpTaWduYXR1cmVN
-ZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGRzaWctbW9yZSNy
-c2Etc2hhMjU2Ii8+PGRzOlJlZmVyZW5jZSBVUkk9IiNfNmQwODQ3ZGUtMmVjMi00OWI4LWI0ZDMt
-OTEzMDAxNGJkMTdjIj48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0
-cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48ZHM6
-VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMx
-NG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8v
-d3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+Z2JvTEhP
-YStmMDR2QmxDNTk3RjdBU3U2cWVuNzNFcXBoM3NsMk5oN2dYZz08L2RzOkRpZ2VzdFZhbHVlPjwv
-ZHM6UmVmZXJlbmNlPjxkczpSZWZlcmVuY2UgVVJJPSIjXzg2MWFjZWM5LTRkNDItNDEyMC1iY2Ey
-LWQzMTlmMjlhOTRjNyI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0
-dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48
-ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxl
-bmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPlVxUzVYN25MKzdDaXdQaW54Z0RFRXl6Qy9tV1Zk
-cnZnbTVBeURVeWtzV2s9PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48L2RzOlNpZ25l
-ZEluZm8+PGRzOlNpZ25hdHVyZVZhbHVlIElkPSJfZjY5MTA1NTEtM2MxYi00ZjdhLWE2ZTAtNTU0
-MmJjM2NjMTgxIj5vODM5YTFUajJwQjhEaGU3M2RPdlRub3JlaVdFM1NlM2VySkJpWjB3ZkxvYXBK
-UEZsWXEzSm9wYXEyZjk2V2pIeHRIMjBoRHBiQVJZCi9jVjBsRzZaQkVxYllwRnJDOVd5TlMwN3ZD
-eXFkOFV1dXdKZHl1Y0lZVW52UlptMmg3d1hsM2V6T1JweStDSG43YnVZVitIN0FjanEKRDgxNHhq
-Zml0RVNzOE9ZdjJBaDNyV0QzcnplQzRPcjMrWWZLWFVYV01NMFRzSHVxbjBzR2ZEcGN4VXROSVJw
-S1BMY003THI5UE1vTwpkd1d0ay9ySXZ2MjdQMVZXVVBSZEtjZXZOcHBSdWpmTDc4R09qbmxkT1Z0
-RjhjcWJyZ1Uxc0pEV3JFZW5GY1VCRFB3VktrMGdmMnpPCnZEYjRSK3VFV0V5YWFyME45Y0xiU2hk
-M3pkZHVNQUNHVHYzSVBRPT08L2RzOlNpZ25hdHVyZVZhbHVlPjxkczpLZXlJbmZvIElkPSJfODYx
-YWNlYzktNGQ0Mi00MTIwLWJjYTItZDMxOWYyOWE5NGM3Ij48ZHM6WDUwOURhdGE+PGRzOlg1MDlD
-ZXJ0aWZpY2F0ZT5NSUlGT3pDQ0JDT2dBd0lCQWdJZ0xyQWJldm9hZTUyeTNmNkMydEIwU24zcDdY
-Sm0wVDAyRm9neEtDZk5oWmN3RFFZSktvWklodmNOCkFRRUxCUUF3ZkRFTE1Ba0dBMVVFQmhNQ1ZW
-TXhQREE2QmdOVkJBb1RNMGx1ZEdWeWJtVjBJRU52Y25CdmNtRjBhVzl1SUdadmNpQkIKYzNOcFoy
-NWxaQ0JPWVcxbGN5QmhibVFnVG5WdFltVnljekV2TUMwR0ExVUVBeE1tU1VOQlRrNGdWSEpoWkdW
-dFlYSnJJRU5zWldGeQphVzVuYUc5MWMyVWdVR2xzYjNRZ1EwRXdIaGNOTVRnd01qSTRNREF3TURB
-d1doY05Nak13TXpBeE1qTTFPVFU1V2pDQmp6RUxNQWtHCkExVUVCaE1DUWtVeElEQWVCZ05WQkFn
-VEYwSnlkWE56Wld4ekxVTmhjR2wwWVd3Z1VtVm5hVzl1TVJFd0R3WURWUVFIRXdoQ2NuVnoKYzJW
-c2N6RVJNQThHQTFVRUNoTUlSR1ZzYjJsMGRHVXhPREEyQmdOVkJBTVRMMGxEUVU1T0lGUk5RMGdn
-UVhWMGFHOXlhWHBsWkNCVQpjbUZrWlcxaGNtc2dVR2xzYjNRZ1ZtRnNhV1JoZEc5eU1JSUJJakFO
-QmdrcWhraUc5dzBCQVFFRkFBT0NBUThBTUlJQkNnS0NBUUVBCnhscDNLcFlIWDNXeUFzRmhTazNM
-d1dmbkdseG5VREZxRlpBM1VvdU1Zai9YaWdiTWtOZUVYSWpsa1JPS1Q0T1BHZlJ4L0xBeVJsUVEK
-akNNdjRxaGJrY1gxcDdhcjYzZmxxNFNaTlZjbDE1bDdoMHVUNThGelNmbmx6MHU1cmtIZkpJbUQ0
-MyttYVAvOGd2MzZGUjI3alc4Ugo5d1k0aGsrV3M0SUIwaUZTZDhTWHYxS3I4dy9KbU1RU0RraXVH
-K1JmSWl1YndRL2Z5N0VrajVRV2hQWncrbU14TktuSFVMeTN4WXoyCkx3VmZmdGp3VXVlYWN2cU5S
-Q2tNWGxDbE9BRHFmVDhvU1pvZURYZWhIdmxQc0xDZW1HQm9US3Vyc2tJUzY5RjB5UEVINWd6ZTBI
-K2YKOEZST3NJb0tTc1ZRMzRCNFMvam9FNjducHNKUFRkS3NOUEpUeVFJREFRQUJvNElCa3pDQ0FZ
-OHdEQVlEVlIwVEFRSC9CQUl3QURBZApCZ05WSFE0RUZnUVVvRnBZNzZwNXlvTkRSR3RRcHpWdVI4
-MVVXUTB3Z2NZR0ExVWRJd1NCdmpDQnU0QVV3NjArcHRZUkFFV0FYRHBYClNvcHQzREVObm5HaGdZ
-Q2tmakI4TVFzd0NRWURWUVFHRXdKVlV6RThNRG9HQTFVRUNoTXpTVzUwWlhKdVpYUWdRMjl5Y0c5
-eVlYUnAKYjI0Z1ptOXlJRUZ6YzJsbmJtVmtJRTVoYldWeklHRnVaQ0JPZFcxaVpYSnpNUzh3TFFZ
-RFZRUURFeVpKUTBGT1RpQlVjbUZrWlcxaApjbXNnUTJ4bFlYSnBibWRvYjNWelpTQlFhV3h2ZENC
-RFFZSWdMckFiZXZvYWU1MnkzZjZDMnRCMFNuM3A3WEptMFQwMkZvZ3hLQ2ZOCmhYa3dEZ1lEVlIw
-UEFRSC9CQVFEQWdlQU1EUUdBMVVkSHdRdE1Dc3dLYUFub0NXR0kyaDBkSEE2THk5amNtd3VhV05o
-Ym00dWIzSm4KTDNSdFkyaGZjR2xzYjNRdVkzSnNNRkVHQTFVZElBUktNRWd3RUFZT0t3WUJCQUdD
-eVJzQkJZTTdEQW93TkFZSUt3WUJCUVVIQWdFdwpLREFtQmdnckJnRUZCUWNDQVJZYWFIUjBjSE02
-THk5allTNXBZMkZ1Ymk1dmNtY3ZjR2xzYjNRd0RRWUpLb1pJaHZjTkFRRUxCUUFECmdnRUJBQXVq
-WjJJY1IyRFZydGFSckE1OWVOWUNsNHhjc0pNdThEUUNIdjI4ZlRmaS9CaVpZNElyN0Y5a0Z5OTZE
-N09aOG9MWTV6amYKNGRIeEZ3SFBxSDhEaDZKV3N6WHVIVzFaYTNYbWwwUGFIeENXUlMwWG9sOFdz
-SEhwTnlnak1CWWZKMG9kVk04ODVUWjFFbDlTaXVFSApueW5GQmdTbWlGYzk5dVFkL1lEUlp1R3Yv
-QTBIeXY3eVI5dGtMRWREM0ExdU5KQlc0UCtISkdwZEtrWUwxUTVyVTcrb0hWUHRNS0tJCjNpRmtV
-RXNiTzQ1QVZkN3ZQL2ovN0p0QVpQYjZrb09WNWxaaTJIMVJMY2NHd3pkZXpuaEpnZDBOOW9iYjB2
-bkU0MS9VU1dhZmRXUloKVkdrd1B1cVRobDdzQ3R6ckpIOFhZMHhjdW0rY2ZMeDJFQUl3VW5PY2Fi
-ND08L2RzOlg1MDlDZXJ0aWZpY2F0ZT48L2RzOlg1MDlEYXRhPjwvZHM6S2V5SW5mbz48L2RzOlNp
-Z25hdHVyZT48L3NtZDpzaWduZWRNYXJrPg==
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/active/TreatyStatute-Agent-Arab-Active.smd b/core/src/test/resources/google/registry/tmch/active/TreatyStatute-Agent-Arab-Active.smd
deleted file mode 100644
index 1d3901c30..000000000
--- a/core/src/test/resources/google/registry/tmch/active/TreatyStatute-Agent-Arab-Active.smd
+++ /dev/null
@@ -1,99 +0,0 @@
-Marks: الاختبار & لتقييم
-smdID: 000000781526320376959-65535
-U-labels: xn------nzeaagpf7azb2ppajr3fa, xn-----btdaafne4a7azpoaiq8ea, xn----ymcaaeld1a4a6onahp3ea, xn--mgbaadjcy1a8mmago8da
-notBefore: 2018-05-14T17:52:56.959Z
-notAfter: 2022-08-18T14:27:18.209Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il9mMGZi
-ZTM5Ny05ZmI0LTRmMmQtODlmNC1iMDI5YjQwMzU2ZWQiPjxzbWQ6aWQ+MDAwMDAwNzgxNTI2MzIw
-Mzc2OTU5LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo1Mjo1Ni45NTlaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0xOFQxNDoyNzoxOC4yMDlaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazpj
-b3VydD48bWFyazppZD4wMDAxNDQxNTAzMDY2NDE3MTUwMzA2NjQxNy0xPC9tYXJrOmlkPjxtYXJr
-Om1hcmtOYW1lPtin2YTYp9iu2KrYqNin2LEgJmFtcDsg2YTYqtmC2YrZitmFPC9tYXJrOm1hcmtO
-YW1lPjxtYXJrOmhvbGRlciBlbnRpdGxlbWVudD0ib3duZXIiPjxtYXJrOm5hbWU+2YXZh9mG2K/Y
-syDYp9mE2YXYudmE2YjZhdin2KrZitipPC9tYXJrOm5hbWU+PG1hcms6YWRkcj48bWFyazpzdHJl
-ZXQ+2KzYudmB2LEg2KfYqNmGINiz2YrZhtin2KEgNzU8L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+
-2YXZg9mG2KfYszwvbWFyazpjaXR5PjxtYXJrOnBjPjI5MDA8L21hcms6cGM+PG1hcms6Y2M+VVM8
-L21hcms6Y2M+PC9tYXJrOmFkZHI+PC9tYXJrOmhvbGRlcj48bWFyazpjb250YWN0IHR5cGU9ImFn
-ZW50Ij48bWFyazpuYW1lPtmF2YfZhtiv2LMg2KfZhNmF2LnZhNmI2YXYp9iq2YrYqTwvbWFyazpu
-YW1lPjxtYXJrOm9yZz7ZiNmD2KfZhNipPC9tYXJrOm9yZz48bWFyazphZGRyPjxtYXJrOnN0cmVl
-dD7YtNin2LHYuSDYrNi52YHYsSDYp9io2YYg2LPZitmG2KfYoSA3NTwvbWFyazpzdHJlZXQ+PG1h
-cms6Y2l0eT7ZhdmD2YbYp9izPC9tYXJrOmNpdHk+PG1hcms6cGM+MjkwMDwvbWFyazpwYz48bWFy
-azpjYz5NQTwvbWFyazpjYz48L21hcms6YWRkcj48bWFyazp2b2ljZT4rMjEyLjUyMjUzOTA0MDwv
-bWFyazp2b2ljZT48bWFyazpmYXg+KzIxMi41MjI1MzkwNDE8L21hcms6ZmF4PjxtYXJrOmVtYWls
-PmluZm9AYWdlbmN5LW1hcm9jY28uY29tPC9tYXJrOmVtYWlsPjwvbWFyazpjb250YWN0PjxtYXJr
-OmxhYmVsPnhuLS0tLS0tbnplYWFncGY3YXpiMnBwYWpyM2ZhPC9tYXJrOmxhYmVsPjxtYXJrOmxh
-YmVsPnhuLS0tLS1idGRhYWZuZTRhN2F6cG9haXE4ZWE8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+
-eG4tLS0teW1jYWFlbGQxYTRhNm9uYWhwM2VhPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1t
-Z2JhYWRqY3kxYThtbWFnbzhkYTwvbWFyazpsYWJlbD48bWFyazpnb29kc0FuZFNlcnZpY2VzPti6
-2YrYqtin2LE8L21hcms6Z29vZHNBbmRTZXJ2aWNlcz48bWFyazpyZWZOdW0+MTk4PC9tYXJrOnJl
-Zk51bT48bWFyazpwcm9EYXRlPjIwMTUtMDktMTVUMDA6MDA6MDAuMDAwWjwvbWFyazpwcm9EYXRl
-PjxtYXJrOmNjPlVTPC9tYXJrOmNjPjxtYXJrOmNvdXJ0TmFtZT7Yp9mE2K/Yp9ixINin2YTYqNmK
-2LbYp9ihPC9tYXJrOmNvdXJ0TmFtZT48L21hcms6Y291cnQ+PC9tYXJrOm1hcms+PGRzOlNpZ25h
-dHVyZSB4bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyIgSWQ9Il82
-NmZhMWNjZC04OTQ5LTRjYTgtYjIwYy0wYTAzYWZkZWI1NmEiPjxkczpTaWduZWRJbmZvPjxkczpD
-YW5vbmljYWxpemF0aW9uTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8x
-MC94bWwtZXhjLWMxNG4jIi8+PGRzOlNpZ25hdHVyZU1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93
-d3cudzMub3JnLzIwMDEvMDQveG1sZHNpZy1tb3JlI3JzYS1zaGEyNTYiLz48ZHM6UmVmZXJlbmNl
-IFVSST0iI19mMGZiZTM5Ny05ZmI0LTRmMmQtODlmNC1iMDI5YjQwMzU2ZWQiPjxkczpUcmFuc2Zv
-cm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3ht
-bGRzaWcjZW52ZWxvcGVkLXNpZ25hdHVyZSIvPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRw
-Oi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRz
-OkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5j
-I3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1ZT4xK0pvcVFqQ1BEb0tMRVkyb0xUMGZOUktVaGFpSHJW
-ZzREdHpyMG5rbTNnPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PGRzOlJlZmVyZW5j
-ZSBVUkk9IiNfNGI1ZDYxODktNDg0Ny00Yzg0LTgwZDMtMDQ4NTA0MTMzMTZlIj48ZHM6VHJhbnNm
-b3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94
-bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGht
-PSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFs
-dWU+OUw3WWY5bk1meTZVaTVlRkg5ZEJnRldVODlTeGJ2TEFSeE02K1ovTm9XQT08L2RzOkRpZ2Vz
-dFZhbHVlPjwvZHM6UmVmZXJlbmNlPjwvZHM6U2lnbmVkSW5mbz48ZHM6U2lnbmF0dXJlVmFsdWUg
-SWQ9Il81YzhlY2ZkMy1lOTMxLTRkNzItYTMwOC1mYjhmM2JlYTJlZTMiPnZxN2FKMUxraHBxUmhn
-Zmx2NFBPeE1zK3R6MDBld0d2NUdFWlVJczhxVmNNemxLY2IzWTJJVGFjUklWcEZUekk1WDRsK29t
-My9RM2cKQzFXakpkL0VFSDVkc2o2VGZ1eDBsTXJ5YjFxN0tLRVlpTTc4eTlVWEhGblJpa0ZteEth
-SGJFbEpJQVhyRzFMb1BZV0RQQ0NJd2Vragp5L3VyV1E0Tm03aVZHczFxRVByMDZreGpaT1Vob2h1
-UThrMEdYMWMreXhIRE85eDUvOXl6WEg0UmpmN2VRWFZtK3ZkbXI5WktIRW9UCmJzK3R0RVFJUVA3
-dTB1dGhtUHpSOUNJeC9WOTFUYlB4dXhsd2ZCcE1GUEdsNzAxZk9Ha2xVb0tURUNwMjlOZFVlOUx2
-bXV2U0xzK1UKa2hKRWpNeUdMZUdCOFlLUTNoTUFtUklmdkhvZWVqWU9ETWRIbFE9PTwvZHM6U2ln
-bmF0dXJlVmFsdWU+PGRzOktleUluZm8gSWQ9Il80YjVkNjE4OS00ODQ3LTRjODQtODBkMy0wNDg1
-MDQxMzMxNmUiPjxkczpYNTA5RGF0YT48ZHM6WDUwOUNlcnRpZmljYXRlPk1JSUZPekNDQkNPZ0F3
-SUJBZ0lnTHJBYmV2b2FlNTJ5M2Y2QzJ0QjBTbjNwN1hKbTBUMDJGb2d4S0NmTmhaY3dEUVlKS29a
-SWh2Y04KQVFFTEJRQXdmREVMTUFrR0ExVUVCaE1DVlZNeFBEQTZCZ05WQkFvVE0wbHVkR1Z5Ym1W
-MElFTnZjbkJ2Y21GMGFXOXVJR1p2Y2lCQgpjM05wWjI1bFpDQk9ZVzFsY3lCaGJtUWdUblZ0WW1W
-eWN6RXZNQzBHQTFVRUF4TW1TVU5CVGs0Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5CmFXNW5hRzkxYzJV
-Z1VHbHNiM1FnUTBFd0hoY05NVGd3TWpJNE1EQXdNREF3V2hjTk1qTXdNekF4TWpNMU9UVTVXakNC
-anpFTE1Ba0cKQTFVRUJoTUNRa1V4SURBZUJnTlZCQWdURjBKeWRYTnpaV3h6TFVOaGNHbDBZV3dn
-VW1WbmFXOXVNUkV3RHdZRFZRUUhFd2hDY25WegpjMlZzY3pFUk1BOEdBMVVFQ2hNSVJHVnNiMmww
-ZEdVeE9EQTJCZ05WQkFNVEwwbERRVTVPSUZSTlEwZ2dRWFYwYUc5eWFYcGxaQ0JVCmNtRmtaVzFo
-Y21zZ1VHbHNiM1FnVm1Gc2FXUmhkRzl5TUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFN
-SUlCQ2dLQ0FRRUEKeGxwM0twWUhYM1d5QXNGaFNrM0x3V2ZuR2x4blVERnFGWkEzVW91TVlqL1hp
-Z2JNa05lRVhJamxrUk9LVDRPUEdmUngvTEF5UmxRUQpqQ012NHFoYmtjWDFwN2FyNjNmbHE0U1pO
-VmNsMTVsN2gwdVQ1OEZ6U2ZubHowdTVya0hmSkltRDQzK21hUC84Z3YzNkZSMjdqVzhSCjl3WTRo
-aytXczRJQjBpRlNkOFNYdjFLcjh3L0ptTVFTRGtpdUcrUmZJaXVid1EvZnk3RWtqNVFXaFBadytt
-TXhOS25IVUx5M3hZejIKTHdWZmZ0andVdWVhY3ZxTlJDa01YbENsT0FEcWZUOG9TWm9lRFhlaEh2
-bFBzTENlbUdCb1RLdXJza0lTNjlGMHlQRUg1Z3plMEgrZgo4RlJPc0lvS1NzVlEzNEI0Uy9qb0U2
-N25wc0pQVGRLc05QSlR5UUlEQVFBQm80SUJrekNDQVk4d0RBWURWUjBUQVFIL0JBSXdBREFkCkJn
-TlZIUTRFRmdRVW9GcFk3NnA1eW9ORFJHdFFwelZ1UjgxVVdRMHdnY1lHQTFVZEl3U0J2akNCdTRB
-VXc2MCtwdFlSQUVXQVhEcFgKU29wdDNERU5ubkdoZ1lDa2ZqQjhNUXN3Q1FZRFZRUUdFd0pWVXpF
-OE1Eb0dBMVVFQ2hNelNXNTBaWEp1WlhRZ1EyOXljRzl5WVhScApiMjRnWm05eUlFRnpjMmxuYm1W
-a0lFNWhiV1Z6SUdGdVpDQk9kVzFpWlhKek1TOHdMUVlEVlFRREV5WkpRMEZPVGlCVWNtRmtaVzFo
-CmNtc2dRMnhsWVhKcGJtZG9iM1Z6WlNCUWFXeHZkQ0JEUVlJZ0xyQWJldm9hZTUyeTNmNkMydEIw
-U24zcDdYSm0wVDAyRm9neEtDZk4KaFhrd0RnWURWUjBQQVFIL0JBUURBZ2VBTURRR0ExVWRId1F0
-TUNzd0thQW5vQ1dHSTJoMGRIQTZMeTlqY213dWFXTmhibTR1YjNKbgpMM1J0WTJoZmNHbHNiM1F1
-WTNKc01GRUdBMVVkSUFSS01FZ3dFQVlPS3dZQkJBR0N5UnNCQllNN0RBb3dOQVlJS3dZQkJRVUhB
-Z0V3CktEQW1CZ2dyQmdFRkJRY0NBUllhYUhSMGNITTZMeTlqWVM1cFkyRnViaTV2Y21jdmNHbHNi
-M1F3RFFZSktvWklodmNOQVFFTEJRQUQKZ2dFQkFBdWpaMkljUjJEVnJ0YVJyQTU5ZU5ZQ2w0eGNz
-Sk11OERRQ0h2MjhmVGZpL0JpWlk0SXI3RjlrRnk5NkQ3T1o4b0xZNXpqZgo0ZEh4RndIUHFIOERo
-NkpXc3pYdUhXMVphM1htbDBQYUh4Q1dSUzBYb2w4V3NISHBOeWdqTUJZZkowb2RWTTg4NVRaMUVs
-OVNpdUVICm55bkZCZ1NtaUZjOTl1UWQvWURSWnVHdi9BMEh5djd5Ujl0a0xFZEQzQTF1TkpCVzRQ
-K0hKR3BkS2tZTDFRNXJVNytvSFZQdE1LS0kKM2lGa1VFc2JPNDVBVmQ3dlAvai83SnRBWlBiNmtv
-T1Y1bFppMkgxUkxjY0d3emRlem5oSmdkME45b2JiMHZuRTQxL1VTV2FmZFdSWgpWR2t3UHVxVGhs
-N3NDdHpySkg4WFkweGN1bStjZkx4MkVBSXdVbk9jYWI0PTwvZHM6WDUwOUNlcnRpZmljYXRlPjwv
-ZHM6WDUwOURhdGE+PC9kczpLZXlJbmZvPjwvZHM6U2lnbmF0dXJlPjwvc21kOnNpZ25lZE1hcms+
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/active/TreatyStatute-Agent-Chinese-Active.smd b/core/src/test/resources/google/registry/tmch/active/TreatyStatute-Agent-Chinese-Active.smd
deleted file mode 100644
index e5fe2a08a..000000000
--- a/core/src/test/resources/google/registry/tmch/active/TreatyStatute-Agent-Chinese-Active.smd
+++ /dev/null
@@ -1,99 +0,0 @@
-Marks: 检查&查询
-smdID: 000000811526320382809-65535
-U-labels: xn----sh7bb78f789j, xn--and-bp0gd32k781m, xn--jvva96di40i
-notBefore: 2018-05-14T17:53:02.809Z
-notAfter: 2022-08-18T14:36:50.931Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il84NWVl
-ZjE2OC1kOGE0LTQzYTYtOTRlZS1jNDk5MDcxN2ZkY2YiPjxzbWQ6aWQ+MDAwMDAwODExNTI2MzIw
-MzgyODA5LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo1MzowMi44MDlaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0xOFQxNDozNjo1MC45MzFaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
-cmVhdHlPclN0YXR1dGU+PG1hcms6aWQ+MDAwMTQ2MTUwMzA2Njk3NjE1MDMwNjY5NzYtMTwvbWFy
-azppZD48bWFyazptYXJrTmFtZT7mo4Dmn6UmYW1wO+afpeivojwvbWFyazptYXJrTmFtZT48bWFy
-azpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpvcmc+5bel56iL5aSEPC9tYXJrOm9y
-Zz48bWFyazphZGRyPjxtYXJrOnN0cmVldD7pppnmuK/kuJzot6825Y+377yMNeWPt+alvO+8jDjl
-j7flrqQ8L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+6Z2S5bKb5biCPC9tYXJrOmNpdHk+PG1hcms6
-cGM+MzUwMDwvbWFyazpwYz48bWFyazpjYz5DTjwvbWFyazpjYz48L21hcms6YWRkcj48L21hcms6
-aG9sZGVyPjxtYXJrOmNvbnRhY3QgdHlwZT0iYWdlbnQiPjxtYXJrOm5hbWU+5p2O5bCP5pa5PC9t
-YXJrOm5hbWU+PG1hcms6b3JnPuW3peeoi+WkhDwvbWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpz
-dHJlZXQ+6aaZ5riv5Lic6LevNuWPt++8jDXlj7fmpbzvvIw45Y+35a6kPC9tYXJrOnN0cmVldD48
-bWFyazpjaXR5PumdkuWym+W4gjwvbWFyazpjaXR5PjxtYXJrOnBjPjM1MDA8L21hcms6cGM+PG1h
-cms6Y2M+Q048L21hcms6Y2M+PC9tYXJrOmFkZHI+PG1hcms6dm9pY2U+Kzg2LjEwODQ2NTcxNzM8
-L21hcms6dm9pY2U+PG1hcms6ZmF4Pis4Ni4xMDg0NjU3MTc1PC9tYXJrOmZheD48bWFyazplbWFp
-bD5pbmZvQGNoaW5lc2UtYWdlbmN5LmNvbTwvbWFyazplbWFpbD48L21hcms6Y29udGFjdD48bWFy
-azpwcm90ZWN0aW9uPjxtYXJrOmNjPlVTPC9tYXJrOmNjPjxtYXJrOnJ1bGluZz5DTjwvbWFyazpy
-dWxpbmc+PC9tYXJrOnByb3RlY3Rpb24+PG1hcms6bGFiZWw+eG4tLS0tc2g3YmI3OGY3ODlqPC9t
-YXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1hbmQtYnAwZ2QzMms3ODFtPC9tYXJrOmxhYmVsPjxt
-YXJrOmxhYmVsPnhuLS1qdnZhOTZkaTQwaTwvbWFyazpsYWJlbD48bWFyazpnb29kc0FuZFNlcnZp
-Y2VzPiDlkInku5Y8L21hcms6Z29vZHNBbmRTZXJ2aWNlcz48bWFyazpyZWZOdW0+MTIzNDwvbWFy
-azpyZWZOdW0+PG1hcms6cHJvRGF0ZT4yMDAwLTAxLTAxVDAwOjAwOjAwLjAwMFo8L21hcms6cHJv
-RGF0ZT48bWFyazp0aXRsZT5UZXN0IFRyZWF0eTwvbWFyazp0aXRsZT48bWFyazpleGVjRGF0ZT4y
-MDEzLTAyLTAyVDAwOjAwOjAwLjAwMFo8L21hcms6ZXhlY0RhdGU+PC9tYXJrOnRyZWF0eU9yU3Rh
-dHV0ZT48L21hcms6bWFyaz48ZHM6U2lnbmF0dXJlIHhtbG5zOmRzPSJodHRwOi8vd3d3LnczLm9y
-Zy8yMDAwLzA5L3htbGRzaWcjIiBJZD0iXzViZjE4MzY1LTNhYjYtNDI0YS04NTA1LTIyYjEyZTI2
-YWM2NyI+PGRzOlNpZ25lZEluZm8+PGRzOkNhbm9uaWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGht
-PSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJl
-TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxkc2lnLW1vcmUj
-cnNhLXNoYTI1NiIvPjxkczpSZWZlcmVuY2UgVVJJPSIjXzg1ZWVmMTY4LWQ4YTQtNDNhNi05NGVl
-LWM0OTkwNzE3ZmRjZiI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0
-dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1sZHNpZyNlbnZlbG9wZWQtc2lnbmF0dXJlIi8+PGRz
-OlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1j
-MTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDov
-L3d3dy53My5vcmcvMjAwMS8wNC94bWxlbmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPi9pbWJv
-aDFoMGFROTNZOU5UTnAzNlpGYUg5UDNjbUNXQmlJUGVWQmUyWXc9PC9kczpEaWdlc3RWYWx1ZT48
-L2RzOlJlZmVyZW5jZT48ZHM6UmVmZXJlbmNlIFVSST0iI19iMjgwM2NkOS00M2M4LTQ4M2ItOTM4
-ZC03ZGRkM2FlZDQ4NDUiPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJo
-dHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+
-PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1s
-ZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1ZT5ROU4xZllXb0U5VmJka2toSThVMThZQUQySzVV
-b0xCT2dlUmtOZWNrRy9FPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PC9kczpTaWdu
-ZWRJbmZvPjxkczpTaWduYXR1cmVWYWx1ZSBJZD0iX2MyMGUxYjhlLTA3YmItNDM2MC05ODRlLWEz
-ZDNmNGE5MWNiMiI+d1FBTm5xcldIQll1dVo1WlpQZzF6b2srOGpxa0ZsWmVlSnMvNGdHYW13K2lt
-VmVMUkYzYk1TdVJBVjBiKytJRlNGL2VUL2M2QjkwTwo3Z0h2TlhIV25BRStWK2lwdFhSYmI5OHd0
-YjBkTGh1NGFkNFBGN1ZHcWhmU1FPSUlMVHpUblQ2UkkwZXpVbUdEYzJ6ZXlIb2F0WWFKCm1XUXBy
-UzcvY2ozL29DRVQ3OU1IelJCMDduN0VuSjlIaUhnYXdWbjhXUnJPSFNBaVVpZEpBcmtQTVNTRVdB
-SG1PVUNvMzQ4MnI5WXMKVkhmNFVmV3ROMU91Nlo0TWFIbkk1SGRqQ3J6ekowVE8yblYydHJqandR
-YmVFQ3Q0bDMyNzlKdkpsWVdYYnBYQ3dKaGYzdjlwUHV0YgpYS3VqWkZvck1LeERWVWlzT2hRaW9a
-bHZvRVkwcFA0bGJUZkdXQT09PC9kczpTaWduYXR1cmVWYWx1ZT48ZHM6S2V5SW5mbyBJZD0iX2Iy
-ODAzY2Q5LTQzYzgtNDgzYi05MzhkLTdkZGQzYWVkNDg0NSI+PGRzOlg1MDlEYXRhPjxkczpYNTA5
-Q2VydGlmaWNhdGU+TUlJRk96Q0NCQ09nQXdJQkFnSWdMckFiZXZvYWU1MnkzZjZDMnRCMFNuM3A3
-WEptMFQwMkZvZ3hLQ2ZOaFpjd0RRWUpLb1pJaHZjTgpBUUVMQlFBd2ZERUxNQWtHQTFVRUJoTUNW
-Vk14UERBNkJnTlZCQW9UTTBsdWRHVnlibVYwSUVOdmNuQnZjbUYwYVc5dUlHWnZjaUJCCmMzTnBa
-MjVsWkNCT1lXMWxjeUJoYm1RZ1RuVnRZbVZ5Y3pFdk1DMEdBMVVFQXhNbVNVTkJUazRnVkhKaFpH
-VnRZWEpySUVOc1pXRnkKYVc1bmFHOTFjMlVnVUdsc2IzUWdRMEV3SGhjTk1UZ3dNakk0TURBd01E
-QXdXaGNOTWpNd016QXhNak0xT1RVNVdqQ0JqekVMTUFrRwpBMVVFQmhNQ1FrVXhJREFlQmdOVkJB
-Z1RGMEp5ZFhOelpXeHpMVU5oY0dsMFlXd2dVbVZuYVc5dU1SRXdEd1lEVlFRSEV3aENjblZ6CmMy
-VnNjekVSTUE4R0ExVUVDaE1JUkdWc2IybDBkR1V4T0RBMkJnTlZCQU1UTDBsRFFVNU9JRlJOUTBn
-Z1FYVjBhRzl5YVhwbFpDQlUKY21Ga1pXMWhjbXNnVUdsc2IzUWdWbUZzYVdSaGRHOXlNSUlCSWpB
-TkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQQp4bHAzS3BZSFgzV3lBc0ZoU2sz
-THdXZm5HbHhuVURGcUZaQTNVb3VNWWovWGlnYk1rTmVFWElqbGtST0tUNE9QR2ZSeC9MQXlSbFFR
-CmpDTXY0cWhia2NYMXA3YXI2M2ZscTRTWk5WY2wxNWw3aDB1VDU4RnpTZm5sejB1NXJrSGZKSW1E
-NDMrbWFQLzhndjM2RlIyN2pXOFIKOXdZNGhrK1dzNElCMGlGU2Q4U1h2MUtyOHcvSm1NUVNEa2l1
-RytSZklpdWJ3US9meTdFa2o1UVdoUFp3K21NeE5LbkhVTHkzeFl6MgpMd1ZmZnRqd1V1ZWFjdnFO
-UkNrTVhsQ2xPQURxZlQ4b1Nab2VEWGVoSHZsUHNMQ2VtR0JvVEt1cnNrSVM2OUYweVBFSDVnemUw
-SCtmCjhGUk9zSW9LU3NWUTM0QjRTL2pvRTY3bnBzSlBUZEtzTlBKVHlRSURBUUFCbzRJQmt6Q0NB
-WTh3REFZRFZSMFRBUUgvQkFJd0FEQWQKQmdOVkhRNEVGZ1FVb0ZwWTc2cDV5b05EUkd0UXB6VnVS
-ODFVV1Ewd2djWUdBMVVkSXdTQnZqQ0J1NEFVdzYwK3B0WVJBRVdBWERwWApTb3B0M0RFTm5uR2hn
-WUNrZmpCOE1Rc3dDUVlEVlFRR0V3SlZVekU4TURvR0ExVUVDaE16U1c1MFpYSnVaWFFnUTI5eWNH
-OXlZWFJwCmIyNGdabTl5SUVGemMybG5ibVZrSUU1aGJXVnpJR0Z1WkNCT2RXMWlaWEp6TVM4d0xR
-WURWUVFERXlaSlEwRk9UaUJVY21Ga1pXMWgKY21zZ1EyeGxZWEpwYm1kb2IzVnpaU0JRYVd4dmRD
-QkRRWUlnTHJBYmV2b2FlNTJ5M2Y2QzJ0QjBTbjNwN1hKbTBUMDJGb2d4S0NmTgpoWGt3RGdZRFZS
-MFBBUUgvQkFRREFnZUFNRFFHQTFVZEh3UXRNQ3N3S2FBbm9DV0dJMmgwZEhBNkx5OWpjbXd1YVdO
-aGJtNHViM0puCkwzUnRZMmhmY0dsc2IzUXVZM0pzTUZFR0ExVWRJQVJLTUVnd0VBWU9Ld1lCQkFH
-Q3lSc0JCWU03REFvd05BWUlLd1lCQlFVSEFnRXcKS0RBbUJnZ3JCZ0VGQlFjQ0FSWWFhSFIwY0hN
-Nkx5OWpZUzVwWTJGdWJpNXZjbWN2Y0dsc2IzUXdEUVlKS29aSWh2Y05BUUVMQlFBRApnZ0VCQUF1
-aloySWNSMkRWcnRhUnJBNTllTllDbDR4Y3NKTXU4RFFDSHYyOGZUZmkvQmlaWTRJcjdGOWtGeTk2
-RDdPWjhvTFk1empmCjRkSHhGd0hQcUg4RGg2Sldzelh1SFcxWmEzWG1sMFBhSHhDV1JTMFhvbDhX
-c0hIcE55Z2pNQllmSjBvZFZNODg1VFoxRWw5U2l1RUgKbnluRkJnU21pRmM5OXVRZC9ZRFJadUd2
-L0EwSHl2N3lSOXRrTEVkRDNBMXVOSkJXNFArSEpHcGRLa1lMMVE1clU3K29IVlB0TUtLSQozaUZr
-VUVzYk80NUFWZDd2UC9qLzdKdEFaUGI2a29PVjVsWmkySDFSTGNjR3d6ZGV6bmhKZ2QwTjlvYmIw
-dm5FNDEvVVNXYWZkV1JaClZHa3dQdXFUaGw3c0N0enJKSDhYWTB4Y3VtK2NmTHgyRUFJd1VuT2Nh
-YjQ9PC9kczpYNTA5Q2VydGlmaWNhdGU+PC9kczpYNTA5RGF0YT48L2RzOktleUluZm8+PC9kczpT
-aWduYXR1cmU+PC9zbWQ6c2lnbmVkTWFyaz4=
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/active/TreatyStatute-Agent-English-Active.smd b/core/src/test/resources/google/registry/tmch/active/TreatyStatute-Agent-English-Active.smd
deleted file mode 100644
index 66c19af6c..000000000
--- a/core/src/test/resources/google/registry/tmch/active/TreatyStatute-Agent-English-Active.smd
+++ /dev/null
@@ -1,103 +0,0 @@
-Marks: Test & Validate
-smdID: 000000881526320394478-65535
-U-labels: test---validate, test--validate, test-and-validate, test-andvalidate, test-validate, testand-validate, testandvalidate, testvalidate
-notBefore: 2018-05-14T17:53:14.478Z
-notAfter: 2022-08-18T14:57:36.681Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il8yOThh
-NmVjZC0xN2I4LTQ3ZTAtYWQ4MC1hMDEyOGIyMzI0MTYiPjxzbWQ6aWQ+MDAwMDAwODgxNTI2MzIw
-Mzk0NDc4LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo1MzoxNC40NzhaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0xOFQxNDo1NzozNi42ODFaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
-cmVhdHlPclN0YXR1dGU+PG1hcms6aWQ+MDAwMTM3MTUwMzA2ODIzMjE1MDMwNjgyMzItMTwvbWFy
-azppZD48bWFyazptYXJrTmFtZT5UZXN0ICZhbXA7IFZhbGlkYXRlPC9tYXJrOm1hcmtOYW1lPjxt
-YXJrOmhvbGRlciBlbnRpdGxlbWVudD0ib3duZXIiPjxtYXJrOm5hbWU+VG9ueSBIb2xsYW5kPC9t
-YXJrOm5hbWU+PG1hcms6b3JnPkFnIGNvcnBvcmF0aW9uPC9tYXJrOm9yZz48bWFyazphZGRyPjxt
-YXJrOnN0cmVldD4xMzA1IEJyaWdodCBBdmVudWU8L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+QXJj
-YWRpYTwvbWFyazpjaXR5PjxtYXJrOnBjPjkwMDI4PC9tYXJrOnBjPjxtYXJrOmNjPlVTPC9tYXJr
-OmNjPjwvbWFyazphZGRyPjwvbWFyazpob2xkZXI+PG1hcms6Y29udGFjdCB0eXBlPSJhZ2VudCI+
-PG1hcms6bmFtZT5Ub255IEhvbGxhbmQ8L21hcms6bmFtZT48bWFyazpvcmc+QWcgY29ycG9yYXRp
-b248L21hcms6b3JnPjxtYXJrOmFkZHI+PG1hcms6c3RyZWV0PkJyaWdodCBBdmVudWUgMTMwNSA8
-L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+QXJjYWRpYTwvbWFyazpjaXR5PjxtYXJrOnNwPkNBPC9t
-YXJrOnNwPjxtYXJrOnBjPjkwMDI4PC9tYXJrOnBjPjxtYXJrOmNjPlVTPC9tYXJrOmNjPjwvbWFy
-azphZGRyPjxtYXJrOnZvaWNlPisxLjIwMjU1NjIzMDI8L21hcms6dm9pY2U+PG1hcms6ZmF4Pisx
-LjIwMjU1NjIzMDE8L21hcms6ZmF4PjxtYXJrOmVtYWlsPmluZm9AYWdjb3Jwb3JhdGlvbi5jb208
-L21hcms6ZW1haWw+PC9tYXJrOmNvbnRhY3Q+PG1hcms6cHJvdGVjdGlvbj48bWFyazpjYz5VUzwv
-bWFyazpjYz48bWFyazpydWxpbmc+VVM8L21hcms6cnVsaW5nPjwvbWFyazpwcm90ZWN0aW9uPjxt
-YXJrOmxhYmVsPnRlc3QtLS12YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0LS12
-YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0LWFuZC12YWxpZGF0ZTwvbWFyazps
-YWJlbD48bWFyazpsYWJlbD50ZXN0LWFuZHZhbGlkYXRlPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVs
-PnRlc3QtdmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+dGVzdGFuZC12YWxpZGF0ZTwv
-bWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0YW5kdmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6
-bGFiZWw+dGVzdHZhbGlkYXRlPC9tYXJrOmxhYmVsPjxtYXJrOmdvb2RzQW5kU2VydmljZXM+Z3Vp
-dGFyPC9tYXJrOmdvb2RzQW5kU2VydmljZXM+PG1hcms6cmVmTnVtPjEyMzQ8L21hcms6cmVmTnVt
-PjxtYXJrOnByb0RhdGU+MjAwMC0wMS0wMVQwMDowMDowMC4wMDBaPC9tYXJrOnByb0RhdGU+PG1h
-cms6dGl0bGU+Z3VpdGFyPC9tYXJrOnRpdGxlPjxtYXJrOmV4ZWNEYXRlPjIwMTMtMDItMDJUMDA6
-MDA6MDAuMDAwWjwvbWFyazpleGVjRGF0ZT48L21hcms6dHJlYXR5T3JTdGF0dXRlPjwvbWFyazpt
-YXJrPjxkczpTaWduYXR1cmUgeG1sbnM6ZHM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1s
-ZHNpZyMiIElkPSJfNWI5ZmQ0MWItMzYwOS00NDM3LTk2ZTMtYTUyM2I4YmQ4MTA1Ij48ZHM6U2ln
-bmVkSW5mbz48ZHM6Q2Fub25pY2FsaXphdGlvbk1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cu
-dzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjxkczpTaWduYXR1cmVNZXRob2QgQWxnb3Jp
-dGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGRzaWctbW9yZSNyc2Etc2hhMjU2Ii8+
-PGRzOlJlZmVyZW5jZSBVUkk9IiNfMjk4YTZlY2QtMTdiOC00N2UwLWFkODAtYTAxMjhiMjMyNDE2
-Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5v
-cmcvMjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48ZHM6VHJhbnNmb3JtIEFs
-Z29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpU
-cmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8y
-MDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+bGVIUzVtV2podHZZaWF2ZlQz
-RWs1ZHRYSEFjbzV0dWlwVlRpVmM4NkxlRT08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNl
-PjxkczpSZWZlcmVuY2UgVVJJPSIjX2FhYzFkZTQzLTFmMTAtNGRiOC1hZTRhLWZmM2MzZTdjMzgw
-MCI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMu
-b3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6RGlnZXN0TWV0
-aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxlbmMjc2hhMjU2Ii8+
-PGRzOkRpZ2VzdFZhbHVlPkJVcmNZaUxZZ0lKYWJBbXlMbXBNZDBsNEZIVEF4SkgvWVlsNTRyUHpw
-MWM9PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48L2RzOlNpZ25lZEluZm8+PGRzOlNp
-Z25hdHVyZVZhbHVlIElkPSJfYjViMjhjYmUtZmEzYS00NDhjLTk1ZWEtZWE0YWUxYTgxMmQ5Ij5Y
-WHU5eXo3Y045R0hQQ0tUUkxqT0VSRWRBM0hSejVlQkw2RmlSeU5VbkFGT2htRUVYZC9welBZeitm
-d01vdktkMldjaWVDaHp1dmZoCjZYSUdOaWMycVpGQmpodTBBYXp6bjBueHd4QkYrRngwQ3lxb3pR
-MitnZ2pwOUxubExKQ2hHcEhLMjFnOFc2RFpGVndXaXVLbjhMeGkKNWxzTDV4WFgvVllSVHh0OGQ2
-b2tLeDM1bnVXbmx0RUc4Uldoa0JaZzBhaEZBZjl3c0FRV29wN1JucFc1RkQ1WjMyc3pYekV3U3pU
-cApsR0JVV0xhb3ZMck9lMFVSM1VNWUU1SE1NL3l3bjZSd2ExMWNBeTVwekVhSzRHQXl3NTEvdlJS
-L0ZXS3o3S3Fva2hvTDk4OGV2b1FzClNlc2tmSWRGb3BGbWdKQTd6YzdWWmdhV0ozanhKOGRORXpo
-TFhnPT08L2RzOlNpZ25hdHVyZVZhbHVlPjxkczpLZXlJbmZvIElkPSJfYWFjMWRlNDMtMWYxMC00
-ZGI4LWFlNGEtZmYzYzNlN2MzODAwIj48ZHM6WDUwOURhdGE+PGRzOlg1MDlDZXJ0aWZpY2F0ZT5N
-SUlGT3pDQ0JDT2dBd0lCQWdJZ0xyQWJldm9hZTUyeTNmNkMydEIwU24zcDdYSm0wVDAyRm9neEtD
-Zk5oWmN3RFFZSktvWklodmNOCkFRRUxCUUF3ZkRFTE1Ba0dBMVVFQmhNQ1ZWTXhQREE2QmdOVkJB
-b1RNMGx1ZEdWeWJtVjBJRU52Y25CdmNtRjBhVzl1SUdadmNpQkIKYzNOcFoyNWxaQ0JPWVcxbGN5
-QmhibVFnVG5WdFltVnljekV2TUMwR0ExVUVBeE1tU1VOQlRrNGdWSEpoWkdWdFlYSnJJRU5zWldG
-eQphVzVuYUc5MWMyVWdVR2xzYjNRZ1EwRXdIaGNOTVRnd01qSTRNREF3TURBd1doY05Nak13TXpB
-eE1qTTFPVFU1V2pDQmp6RUxNQWtHCkExVUVCaE1DUWtVeElEQWVCZ05WQkFnVEYwSnlkWE56Wld4
-ekxVTmhjR2wwWVd3Z1VtVm5hVzl1TVJFd0R3WURWUVFIRXdoQ2NuVnoKYzJWc2N6RVJNQThHQTFV
-RUNoTUlSR1ZzYjJsMGRHVXhPREEyQmdOVkJBTVRMMGxEUVU1T0lGUk5RMGdnUVhWMGFHOXlhWHBs
-WkNCVQpjbUZrWlcxaGNtc2dVR2xzYjNRZ1ZtRnNhV1JoZEc5eU1JSUJJakFOQmdrcWhraUc5dzBC
-QVFFRkFBT0NBUThBTUlJQkNnS0NBUUVBCnhscDNLcFlIWDNXeUFzRmhTazNMd1dmbkdseG5VREZx
-RlpBM1VvdU1Zai9YaWdiTWtOZUVYSWpsa1JPS1Q0T1BHZlJ4L0xBeVJsUVEKakNNdjRxaGJrY1gx
-cDdhcjYzZmxxNFNaTlZjbDE1bDdoMHVUNThGelNmbmx6MHU1cmtIZkpJbUQ0MyttYVAvOGd2MzZG
-UjI3alc4Ugo5d1k0aGsrV3M0SUIwaUZTZDhTWHYxS3I4dy9KbU1RU0RraXVHK1JmSWl1YndRL2Z5
-N0VrajVRV2hQWncrbU14TktuSFVMeTN4WXoyCkx3VmZmdGp3VXVlYWN2cU5SQ2tNWGxDbE9BRHFm
-VDhvU1pvZURYZWhIdmxQc0xDZW1HQm9US3Vyc2tJUzY5RjB5UEVINWd6ZTBIK2YKOEZST3NJb0tT
-c1ZRMzRCNFMvam9FNjducHNKUFRkS3NOUEpUeVFJREFRQUJvNElCa3pDQ0FZOHdEQVlEVlIwVEFR
-SC9CQUl3QURBZApCZ05WSFE0RUZnUVVvRnBZNzZwNXlvTkRSR3RRcHpWdVI4MVVXUTB3Z2NZR0Ex
-VWRJd1NCdmpDQnU0QVV3NjArcHRZUkFFV0FYRHBYClNvcHQzREVObm5HaGdZQ2tmakI4TVFzd0NR
-WURWUVFHRXdKVlV6RThNRG9HQTFVRUNoTXpTVzUwWlhKdVpYUWdRMjl5Y0c5eVlYUnAKYjI0Z1pt
-OXlJRUZ6YzJsbmJtVmtJRTVoYldWeklHRnVaQ0JPZFcxaVpYSnpNUzh3TFFZRFZRUURFeVpKUTBG
-T1RpQlVjbUZrWlcxaApjbXNnUTJ4bFlYSnBibWRvYjNWelpTQlFhV3h2ZENCRFFZSWdMckFiZXZv
-YWU1MnkzZjZDMnRCMFNuM3A3WEptMFQwMkZvZ3hLQ2ZOCmhYa3dEZ1lEVlIwUEFRSC9CQVFEQWdl
-QU1EUUdBMVVkSHdRdE1Dc3dLYUFub0NXR0kyaDBkSEE2THk5amNtd3VhV05oYm00dWIzSm4KTDNS
-dFkyaGZjR2xzYjNRdVkzSnNNRkVHQTFVZElBUktNRWd3RUFZT0t3WUJCQUdDeVJzQkJZTTdEQW93
-TkFZSUt3WUJCUVVIQWdFdwpLREFtQmdnckJnRUZCUWNDQVJZYWFIUjBjSE02THk5allTNXBZMkZ1
-Ymk1dmNtY3ZjR2xzYjNRd0RRWUpLb1pJaHZjTkFRRUxCUUFECmdnRUJBQXVqWjJJY1IyRFZydGFS
-ckE1OWVOWUNsNHhjc0pNdThEUUNIdjI4ZlRmaS9CaVpZNElyN0Y5a0Z5OTZEN09aOG9MWTV6amYK
-NGRIeEZ3SFBxSDhEaDZKV3N6WHVIVzFaYTNYbWwwUGFIeENXUlMwWG9sOFdzSEhwTnlnak1CWWZK
-MG9kVk04ODVUWjFFbDlTaXVFSApueW5GQmdTbWlGYzk5dVFkL1lEUlp1R3YvQTBIeXY3eVI5dGtM
-RWREM0ExdU5KQlc0UCtISkdwZEtrWUwxUTVyVTcrb0hWUHRNS0tJCjNpRmtVRXNiTzQ1QVZkN3ZQ
-L2ovN0p0QVpQYjZrb09WNWxaaTJIMVJMY2NHd3pkZXpuaEpnZDBOOW9iYjB2bkU0MS9VU1dhZmRX
-UloKVkdrd1B1cVRobDdzQ3R6ckpIOFhZMHhjdW0rY2ZMeDJFQUl3VW5PY2FiND08L2RzOlg1MDlD
-ZXJ0aWZpY2F0ZT48L2RzOlg1MDlEYXRhPjwvZHM6S2V5SW5mbz48L2RzOlNpZ25hdHVyZT48L3Nt
-ZDpzaWduZWRNYXJrPg==
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/active/TreatyStatute-Agent-French-Active.smd b/core/src/test/resources/google/registry/tmch/active/TreatyStatute-Agent-French-Active.smd
deleted file mode 100644
index d63dd1b28..000000000
--- a/core/src/test/resources/google/registry/tmch/active/TreatyStatute-Agent-French-Active.smd
+++ /dev/null
@@ -1,103 +0,0 @@
-Marks: Essai & évaluation
-smdID: 000000841526320388646-65535
-U-labels: xn--essai---valuation-itb, xn--essai--valuation-hqb, xn--essai-and-valuation-kzb, xn--essai-andvaluation-jwb, xn--essai-valuation-gnb, xn--essaiand-valuation-jwb, xn--essaiandvaluation-itb, xn--essaivaluation-fkb
-notBefore: 2018-05-14T17:53:08.646Z
-notAfter: 2022-08-18T14:46:53.013Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il85MjQw
-OTc1Ni01YmU1LTQ2ZDktOWRiNC1mZmY5ZDM1NzJkODQiPjxzbWQ6aWQ+MDAwMDAwODQxNTI2MzIw
-Mzg4NjQ2LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo1MzowOC42NDZaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0xOFQxNDo0Njo1My4wMTNaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
-cmVhdHlPclN0YXR1dGU+PG1hcms6aWQ+MDAwMTM5MTUwMzA2NzU4ODE1MDMwNjc1ODgtMTwvbWFy
-azppZD48bWFyazptYXJrTmFtZT5Fc3NhaSAmYW1wOyDDqXZhbHVhdGlvbjwvbWFyazptYXJrTmFt
-ZT48bWFyazpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpvcmc+QWdlbmNlIGVuIEZy
-YW5jZTwvbWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpzdHJlZXQ+MTAgQXZlbnVlIFJvdXNzZWF1
-eDwvbWFyazpzdHJlZXQ+PG1hcms6Y2l0eT5WZXJzYWlsbGVzPC9tYXJrOmNpdHk+PG1hcms6cGM+
-MzMwODE8L21hcms6cGM+PG1hcms6Y2M+RlI8L21hcms6Y2M+PC9tYXJrOmFkZHI+PC9tYXJrOmhv
-bGRlcj48bWFyazpjb250YWN0IHR5cGU9ImFnZW50Ij48bWFyazpuYW1lPkZyYW5jIExlYnJ1bjwv
-bWFyazpuYW1lPjxtYXJrOm9yZz5BZ2VuY2UgZW4gRnJhbmNlPC9tYXJrOm9yZz48bWFyazphZGRy
-PjxtYXJrOnN0cmVldD5BdmVudWUgUm91c3NlYXV4IDEwIDwvbWFyazpzdHJlZXQ+PG1hcms6Y2l0
-eT5WZXJzYWlsbGVzPC9tYXJrOmNpdHk+PG1hcms6cGM+MzMwODE8L21hcms6cGM+PG1hcms6Y2M+
-RlI8L21hcms6Y2M+PC9tYXJrOmFkZHI+PG1hcms6dm9pY2U+KzMzLjEyNTc4MTI1MDwvbWFyazp2
-b2ljZT48bWFyazpmYXg+KzMzLjEyNTc4MTI1MTwvbWFyazpmYXg+PG1hcms6ZW1haWw+aW5mb0Bh
-Z2VuY2UtZW4tZnJhbmNlLmZyPC9tYXJrOmVtYWlsPjwvbWFyazpjb250YWN0PjxtYXJrOnByb3Rl
-Y3Rpb24+PG1hcms6Y2M+VVM8L21hcms6Y2M+PG1hcms6cnVsaW5nPkZSPC9tYXJrOnJ1bGluZz48
-L21hcms6cHJvdGVjdGlvbj48bWFyazpsYWJlbD54bi0tZXNzYWktLS12YWx1YXRpb24taXRiPC9t
-YXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1lc3NhaS0tdmFsdWF0aW9uLWhxYjwvbWFyazpsYWJl
-bD48bWFyazpsYWJlbD54bi0tZXNzYWktYW5kLXZhbHVhdGlvbi1remI8L21hcms6bGFiZWw+PG1h
-cms6bGFiZWw+eG4tLWVzc2FpLWFuZHZhbHVhdGlvbi1qd2I8L21hcms6bGFiZWw+PG1hcms6bGFi
-ZWw+eG4tLWVzc2FpLXZhbHVhdGlvbi1nbmI8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLWVz
-c2FpYW5kLXZhbHVhdGlvbi1qd2I8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLWVzc2FpYW5k
-dmFsdWF0aW9uLWl0YjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tZXNzYWl2YWx1YXRpb24t
-ZmtiPC9tYXJrOmxhYmVsPjxtYXJrOmdvb2RzQW5kU2VydmljZXM+Z3VpdGFyPC9tYXJrOmdvb2Rz
-QW5kU2VydmljZXM+PG1hcms6cmVmTnVtPjEyMzQ8L21hcms6cmVmTnVtPjxtYXJrOnByb0RhdGU+
-MjAwMC0wMS0wMVQwMDowMDowMC4wMDBaPC9tYXJrOnByb0RhdGU+PG1hcms6dGl0bGU+Z3VpdGFy
-ZTwvbWFyazp0aXRsZT48bWFyazpleGVjRGF0ZT4yMDEzLTAyLTAyVDAwOjAwOjAwLjAwMFo8L21h
-cms6ZXhlY0RhdGU+PC9tYXJrOnRyZWF0eU9yU3RhdHV0ZT48L21hcms6bWFyaz48ZHM6U2lnbmF0
-dXJlIHhtbG5zOmRzPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjIiBJZD0iXzM4
-ZDUwNWJmLWJiMDEtNGIyOS04OTE5LTA1MDRiMDlkNTE4NyI+PGRzOlNpZ25lZEluZm8+PGRzOkNh
-bm9uaWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEw
-L3htbC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJlTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3
-dy53My5vcmcvMjAwMS8wNC94bWxkc2lnLW1vcmUjcnNhLXNoYTI1NiIvPjxkczpSZWZlcmVuY2Ug
-VVJJPSIjXzkyNDA5NzU2LTViZTUtNDZkOS05ZGI0LWZmZjlkMzU3MmQ4NCI+PGRzOlRyYW5zZm9y
-bXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1s
-ZHNpZyNlbnZlbG9wZWQtc2lnbmF0dXJlIi8+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6
-Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6
-RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxlbmMj
-c2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPkZUelBLQXhzU2FaRFNYdzdrcWJkdUhPMDYyNTA4UzZp
-U1FTbTBnRFZDRjg9PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48ZHM6UmVmZXJlbmNl
-IFVSST0iI183ODQxZGM2Zi0wMzBmLTQ0NGUtOTVjMS1kNzE3ZjE4NzM0MjAiPjxkczpUcmFuc2Zv
-cm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3ht
-bC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09
-Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1
-ZT5LdktKbDN4VE9yWkc4c3FFdkxQejNPeVNFdlc0Vm9Dd0xUT25sME1oaVU0PTwvZHM6RGlnZXN0
-VmFsdWU+PC9kczpSZWZlcmVuY2U+PC9kczpTaWduZWRJbmZvPjxkczpTaWduYXR1cmVWYWx1ZSBJ
-ZD0iXzI5NjJjNWNhLTQ1OTYtNDFiZS05YmI5LTIxMDE3MmY3NTE4MSI+RjB6U3U2aWFtMGFrNXkz
-YlhoSExseUtaNGJCNzJib2k4Z0lBNUpNOWxQQTdrcnc1aDdsZVFRN1VDKyszMXJSK0d2RkFab2Fi
-RUVOUQphKzdLL2tON1cyNW5kNVNaamtEMFJlUUQ2clpjdk16S2k2c3lTNnAzaktNWDAwcmFPcDdz
-VnJyUC9IWDV4U01xak0wMkd2Lzd5QkovCkZoS0hxeE9ZWElqWDRJbXdCSWlVcytON3lkcSt5S3lp
-YXBXSUlWb1RUYWF5QjNyWTExdTllc2pvZ3RnK1JoVzMwRE9mQ1JjZU9ablQKemh4dkxXTERjb0Z2
-Y2F6bDdiYXhCSE9jd0ZjSnNROThHeWtGQnFQWjVRNjAyMDJwQ2M1cTI5YSs3d0FDY0MwNjhVNUl1
-MUNGZlprVgpxazZLZDBYV2laWVVoby9RODlJV2FtYk56Z3h0ZmpBNUtodXEvQT09PC9kczpTaWdu
-YXR1cmVWYWx1ZT48ZHM6S2V5SW5mbyBJZD0iXzc4NDFkYzZmLTAzMGYtNDQ0ZS05NWMxLWQ3MTdm
-MTg3MzQyMCI+PGRzOlg1MDlEYXRhPjxkczpYNTA5Q2VydGlmaWNhdGU+TUlJRk96Q0NCQ09nQXdJ
-QkFnSWdMckFiZXZvYWU1MnkzZjZDMnRCMFNuM3A3WEptMFQwMkZvZ3hLQ2ZOaFpjd0RRWUpLb1pJ
-aHZjTgpBUUVMQlFBd2ZERUxNQWtHQTFVRUJoTUNWVk14UERBNkJnTlZCQW9UTTBsdWRHVnlibVYw
-SUVOdmNuQnZjbUYwYVc5dUlHWnZjaUJCCmMzTnBaMjVsWkNCT1lXMWxjeUJoYm1RZ1RuVnRZbVZ5
-Y3pFdk1DMEdBMVVFQXhNbVNVTkJUazRnVkhKaFpHVnRZWEpySUVOc1pXRnkKYVc1bmFHOTFjMlVn
-VUdsc2IzUWdRMEV3SGhjTk1UZ3dNakk0TURBd01EQXdXaGNOTWpNd016QXhNak0xT1RVNVdqQ0Jq
-ekVMTUFrRwpBMVVFQmhNQ1FrVXhJREFlQmdOVkJBZ1RGMEp5ZFhOelpXeHpMVU5oY0dsMFlXd2dV
-bVZuYVc5dU1SRXdEd1lEVlFRSEV3aENjblZ6CmMyVnNjekVSTUE4R0ExVUVDaE1JUkdWc2IybDBk
-R1V4T0RBMkJnTlZCQU1UTDBsRFFVNU9JRlJOUTBnZ1FYVjBhRzl5YVhwbFpDQlUKY21Ga1pXMWhj
-bXNnVUdsc2IzUWdWbUZzYVdSaGRHOXlNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1J
-SUJDZ0tDQVFFQQp4bHAzS3BZSFgzV3lBc0ZoU2szTHdXZm5HbHhuVURGcUZaQTNVb3VNWWovWGln
-Yk1rTmVFWElqbGtST0tUNE9QR2ZSeC9MQXlSbFFRCmpDTXY0cWhia2NYMXA3YXI2M2ZscTRTWk5W
-Y2wxNWw3aDB1VDU4RnpTZm5sejB1NXJrSGZKSW1ENDMrbWFQLzhndjM2RlIyN2pXOFIKOXdZNGhr
-K1dzNElCMGlGU2Q4U1h2MUtyOHcvSm1NUVNEa2l1RytSZklpdWJ3US9meTdFa2o1UVdoUFp3K21N
-eE5LbkhVTHkzeFl6MgpMd1ZmZnRqd1V1ZWFjdnFOUkNrTVhsQ2xPQURxZlQ4b1Nab2VEWGVoSHZs
-UHNMQ2VtR0JvVEt1cnNrSVM2OUYweVBFSDVnemUwSCtmCjhGUk9zSW9LU3NWUTM0QjRTL2pvRTY3
-bnBzSlBUZEtzTlBKVHlRSURBUUFCbzRJQmt6Q0NBWTh3REFZRFZSMFRBUUgvQkFJd0FEQWQKQmdO
-VkhRNEVGZ1FVb0ZwWTc2cDV5b05EUkd0UXB6VnVSODFVV1Ewd2djWUdBMVVkSXdTQnZqQ0J1NEFV
-dzYwK3B0WVJBRVdBWERwWApTb3B0M0RFTm5uR2hnWUNrZmpCOE1Rc3dDUVlEVlFRR0V3SlZVekU4
-TURvR0ExVUVDaE16U1c1MFpYSnVaWFFnUTI5eWNHOXlZWFJwCmIyNGdabTl5SUVGemMybG5ibVZr
-SUU1aGJXVnpJR0Z1WkNCT2RXMWlaWEp6TVM4d0xRWURWUVFERXlaSlEwRk9UaUJVY21Ga1pXMWgK
-Y21zZ1EyeGxZWEpwYm1kb2IzVnpaU0JRYVd4dmRDQkRRWUlnTHJBYmV2b2FlNTJ5M2Y2QzJ0QjBT
-bjNwN1hKbTBUMDJGb2d4S0NmTgpoWGt3RGdZRFZSMFBBUUgvQkFRREFnZUFNRFFHQTFVZEh3UXRN
-Q3N3S2FBbm9DV0dJMmgwZEhBNkx5OWpjbXd1YVdOaGJtNHViM0puCkwzUnRZMmhmY0dsc2IzUXVZ
-M0pzTUZFR0ExVWRJQVJLTUVnd0VBWU9Ld1lCQkFHQ3lSc0JCWU03REFvd05BWUlLd1lCQlFVSEFn
-RXcKS0RBbUJnZ3JCZ0VGQlFjQ0FSWWFhSFIwY0hNNkx5OWpZUzVwWTJGdWJpNXZjbWN2Y0dsc2Iz
-UXdEUVlKS29aSWh2Y05BUUVMQlFBRApnZ0VCQUF1aloySWNSMkRWcnRhUnJBNTllTllDbDR4Y3NK
-TXU4RFFDSHYyOGZUZmkvQmlaWTRJcjdGOWtGeTk2RDdPWjhvTFk1empmCjRkSHhGd0hQcUg4RGg2
-Sldzelh1SFcxWmEzWG1sMFBhSHhDV1JTMFhvbDhXc0hIcE55Z2pNQllmSjBvZFZNODg1VFoxRWw5
-U2l1RUgKbnluRkJnU21pRmM5OXVRZC9ZRFJadUd2L0EwSHl2N3lSOXRrTEVkRDNBMXVOSkJXNFAr
-SEpHcGRLa1lMMVE1clU3K29IVlB0TUtLSQozaUZrVUVzYk80NUFWZDd2UC9qLzdKdEFaUGI2a29P
-VjVsWmkySDFSTGNjR3d6ZGV6bmhKZ2QwTjlvYmIwdm5FNDEvVVNXYWZkV1JaClZHa3dQdXFUaGw3
-c0N0enJKSDhYWTB4Y3VtK2NmTHgyRUFJd1VuT2NhYjQ9PC9kczpYNTA5Q2VydGlmaWNhdGU+PC9k
-czpYNTA5RGF0YT48L2RzOktleUluZm8+PC9kczpTaWduYXR1cmU+PC9zbWQ6c2lnbmVkTWFyaz4=
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/active/TreatyStatute-Agent-Russian-Active.smd b/core/src/test/resources/google/registry/tmch/active/TreatyStatute-Agent-Russian-Active.smd
deleted file mode 100644
index a93948060..000000000
--- a/core/src/test/resources/google/registry/tmch/active/TreatyStatute-Agent-Russian-Active.smd
+++ /dev/null
@@ -1,105 +0,0 @@
-Marks: Проверьте & запросы
-smdID: 000000751526320371121-65535
-U-labels: xn------8cdgsat0dibjddhrh6oh, xn-----8kcfpaq4chbiddgqh6nh, xn---and--8veiyaz2ekblddjth6qh, xn---and-83dhvaw6djbkddish6ph, xn----8sbeman8bgbhddfph6mh, xn--and--83dhvaw6djbkddish6ph, xn--and-8cdgsat0dibjddhrh6oh, xn--80adjak2bfbgddeoh6lh
-notBefore: 2018-05-14T17:52:51.121Z
-notAfter: 2022-08-18T14:16:55.554Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il83YWMz
-NGZlOC1kNjNhLTQwMzctOWJlYy1kZDEyNWY4OGY3Y2UiPjxzbWQ6aWQ+MDAwMDAwNzUxNTI2MzIw
-MzcxMTIxLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo1Mjo1MS4xMjFaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0xOFQxNDoxNjo1NS41NTRaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
-cmVhdHlPclN0YXR1dGU+PG1hcms6aWQ+MDAwMTQxMTUwMzA2NTc3NDE1MDMwNjU3NzQtMTwvbWFy
-azppZD48bWFyazptYXJrTmFtZT7Qn9GA0L7QstC10YDRjNGC0LUgJmFtcDsg0LfQsNC/0YDQvtGB
-0Ys8L21hcms6bWFya05hbWU+PG1hcms6aG9sZGVyIGVudGl0bGVtZW50PSJvd25lciI+PG1hcms6
-b3JnPtCQ0LPQtdC90YLRgdGC0LLQvjwvbWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpzdHJlZXQ+
-0J/RgNC+0YHQv9C10LrRgiDQktC10YDQvdCw0LTRgdC60L7Qs9C+IDE1PC9tYXJrOnN0cmVldD48
-bWFyazpjaXR5PtCc0L7RgdC60LLQsDwvbWFyazpjaXR5PjxtYXJrOnBjPjExNzQ4NTwvbWFyazpw
-Yz48bWFyazpjYz5SVTwvbWFyazpjYz48L21hcms6YWRkcj48L21hcms6aG9sZGVyPjxtYXJrOmNv
-bnRhY3QgdHlwZT0iYWdlbnQiPjxtYXJrOm5hbWU+0J3QsNGC0LDQu9GM0Y8g0JDQvdGC0L7QvdC+
-0LLQsDwvbWFyazpuYW1lPjxtYXJrOm9yZz7QkNCz0LXQvdGC0YHRgtCy0L48L21hcms6b3JnPjxt
-YXJrOmFkZHI+PG1hcms6c3RyZWV0PtCf0YDQvtGB0L/QtdC60YIg0JLQtdGA0L3QsNC00YHQutC+
-0LPQviAxNTwvbWFyazpzdHJlZXQ+PG1hcms6Y2l0eT7QnNC+0YHQutCy0LA8L21hcms6Y2l0eT48
-bWFyazpwYz4xMTc0ODU8L21hcms6cGM+PG1hcms6Y2M+UlU8L21hcms6Y2M+PC9tYXJrOmFkZHI+
-PG1hcms6dm9pY2U+KzcuOTE4ODIyMTY3NDwvbWFyazp2b2ljZT48bWFyazpmYXg+KzcuOTE4ODIy
-MTY3MzwvbWFyazpmYXg+PG1hcms6ZW1haWw+aW5mb0BhZ2VuY3kucnU8L21hcms6ZW1haWw+PC9t
-YXJrOmNvbnRhY3Q+PG1hcms6cHJvdGVjdGlvbj48bWFyazpjYz5VUzwvbWFyazpjYz48bWFyazpy
-dWxpbmc+UlU8L21hcms6cnVsaW5nPjwvbWFyazpwcm90ZWN0aW9uPjxtYXJrOmxhYmVsPnhuLS0t
-LS0tOGNkZ3NhdDBkaWJqZGRocmg2b2g8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLS0tLThr
-Y2ZwYXE0Y2hiaWRkZ3FoNm5oPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS0tYW5kLS04dmVp
-eWF6MmVrYmxkZGp0aDZxaDwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tLWFuZC04M2RodmF3
-NmRqYmtkZGlzaDZwaDwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tLS04c2JlbWFuOGJnYmhk
-ZGZwaDZtaDwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tYW5kLS04M2RodmF3NmRqYmtkZGlz
-aDZwaDwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tYW5kLThjZGdzYXQwZGliamRkaHJoNm9o
-PC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS04MGFkamFrMmJmYmdkZGVvaDZsaDwvbWFyazps
-YWJlbD48bWFyazpnb29kc0FuZFNlcnZpY2VzPtCz0LjRgtCw0YDQsDwvbWFyazpnb29kc0FuZFNl
-cnZpY2VzPjxtYXJrOnJlZk51bT4xMjM0PC9tYXJrOnJlZk51bT48bWFyazpwcm9EYXRlPjIwMDAt
-MDEtMDFUMDA6MDA6MDAuMDAwWjwvbWFyazpwcm9EYXRlPjxtYXJrOnRpdGxlPtCz0LjRgtCw0YDQ
-sDwvbWFyazp0aXRsZT48bWFyazpleGVjRGF0ZT4yMDEzLTAyLTAyVDAwOjAwOjAwLjAwMFo8L21h
-cms6ZXhlY0RhdGU+PC9tYXJrOnRyZWF0eU9yU3RhdHV0ZT48L21hcms6bWFyaz48ZHM6U2lnbmF0
-dXJlIHhtbG5zOmRzPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjIiBJZD0iXzY2
-MjQxZjQxLWNjMjctNGY5OC05OGZiLWUxMjA0YjQ5ZDZkOSI+PGRzOlNpZ25lZEluZm8+PGRzOkNh
-bm9uaWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEw
-L3htbC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJlTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3
-dy53My5vcmcvMjAwMS8wNC94bWxkc2lnLW1vcmUjcnNhLXNoYTI1NiIvPjxkczpSZWZlcmVuY2Ug
-VVJJPSIjXzdhYzM0ZmU4LWQ2M2EtNDAzNy05YmVjLWRkMTI1Zjg4ZjdjZSI+PGRzOlRyYW5zZm9y
-bXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1s
-ZHNpZyNlbnZlbG9wZWQtc2lnbmF0dXJlIi8+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6
-Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6
-RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxlbmMj
-c2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPnBSSWVadnEzamlaR0RmRE1ETDJ0eTZ2cDc3NHMyVTlV
-V0ZyZHpPOWF4d2s9PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48ZHM6UmVmZXJlbmNl
-IFVSST0iI18wM2NhNDI2MC1lYWJiLTQ5MWUtOTU5Yi1jM2FhNjdkOGRkYzIiPjxkczpUcmFuc2Zv
-cm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3ht
-bC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09
-Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1
-ZT5nZ1dWOFBOejM0dHJJTHgvZkg3YmFPcmlKTFptT2tuS2hSTmV5eHBheWRnPTwvZHM6RGlnZXN0
-VmFsdWU+PC9kczpSZWZlcmVuY2U+PC9kczpTaWduZWRJbmZvPjxkczpTaWduYXR1cmVWYWx1ZSBJ
-ZD0iX2VjYWYwMDI1LTQ2MzAtNDQxNS04ZTE3LThkMDI0MmUzNjQ2MSI+VERxUzVvMzAwNjF1ajY0
-ZG1WMk5ZMUg3V1pDMjZwRXlQWDBaMko1RG8xc3VvdFJ1a2FjaWRrR3dmWFdDOVdJQlVOMm94SjFr
-U3VZbgpaN01aVG9uWnoxS3k0cmlIVkJiaC9TNXlzYms1VWNKcC9WZEsvRDVLaW5lN1MyOUU1aDVR
-MWNmTzl5SHJGTWxJZEVRMFlCMW1wZHRZCkRSaTBXdDJGUjlDKzdYZFF6VTJpS1p0bVlLbWFIUDYw
-ODMyN1I4UFVyRVQwT3Z6dlJudmdRQ3RXTTRyYmx2NUhDWXhxNGdrTk5ZUncKb1lMMjVjQm9hTzFD
-VXJzL0tOR1puK3NGa0lIYVB4ZUlvVW8vdVNEbVlKZGRFemFoQVN5V0tOazloMmRQZFdWY2d0L2Ex
-UXY0RUdCZApXR2djT2tWdnd1azQxYzVZcVlXMktoeVlmdUhIQ0MyOGduWm9HZz09PC9kczpTaWdu
-YXR1cmVWYWx1ZT48ZHM6S2V5SW5mbyBJZD0iXzAzY2E0MjYwLWVhYmItNDkxZS05NTliLWMzYWE2
-N2Q4ZGRjMiI+PGRzOlg1MDlEYXRhPjxkczpYNTA5Q2VydGlmaWNhdGU+TUlJRk96Q0NCQ09nQXdJ
-QkFnSWdMckFiZXZvYWU1MnkzZjZDMnRCMFNuM3A3WEptMFQwMkZvZ3hLQ2ZOaFpjd0RRWUpLb1pJ
-aHZjTgpBUUVMQlFBd2ZERUxNQWtHQTFVRUJoTUNWVk14UERBNkJnTlZCQW9UTTBsdWRHVnlibVYw
-SUVOdmNuQnZjbUYwYVc5dUlHWnZjaUJCCmMzTnBaMjVsWkNCT1lXMWxjeUJoYm1RZ1RuVnRZbVZ5
-Y3pFdk1DMEdBMVVFQXhNbVNVTkJUazRnVkhKaFpHVnRZWEpySUVOc1pXRnkKYVc1bmFHOTFjMlVn
-VUdsc2IzUWdRMEV3SGhjTk1UZ3dNakk0TURBd01EQXdXaGNOTWpNd016QXhNak0xT1RVNVdqQ0Jq
-ekVMTUFrRwpBMVVFQmhNQ1FrVXhJREFlQmdOVkJBZ1RGMEp5ZFhOelpXeHpMVU5oY0dsMFlXd2dV
-bVZuYVc5dU1SRXdEd1lEVlFRSEV3aENjblZ6CmMyVnNjekVSTUE4R0ExVUVDaE1JUkdWc2IybDBk
-R1V4T0RBMkJnTlZCQU1UTDBsRFFVNU9JRlJOUTBnZ1FYVjBhRzl5YVhwbFpDQlUKY21Ga1pXMWhj
-bXNnVUdsc2IzUWdWbUZzYVdSaGRHOXlNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1J
-SUJDZ0tDQVFFQQp4bHAzS3BZSFgzV3lBc0ZoU2szTHdXZm5HbHhuVURGcUZaQTNVb3VNWWovWGln
-Yk1rTmVFWElqbGtST0tUNE9QR2ZSeC9MQXlSbFFRCmpDTXY0cWhia2NYMXA3YXI2M2ZscTRTWk5W
-Y2wxNWw3aDB1VDU4RnpTZm5sejB1NXJrSGZKSW1ENDMrbWFQLzhndjM2RlIyN2pXOFIKOXdZNGhr
-K1dzNElCMGlGU2Q4U1h2MUtyOHcvSm1NUVNEa2l1RytSZklpdWJ3US9meTdFa2o1UVdoUFp3K21N
-eE5LbkhVTHkzeFl6MgpMd1ZmZnRqd1V1ZWFjdnFOUkNrTVhsQ2xPQURxZlQ4b1Nab2VEWGVoSHZs
-UHNMQ2VtR0JvVEt1cnNrSVM2OUYweVBFSDVnemUwSCtmCjhGUk9zSW9LU3NWUTM0QjRTL2pvRTY3
-bnBzSlBUZEtzTlBKVHlRSURBUUFCbzRJQmt6Q0NBWTh3REFZRFZSMFRBUUgvQkFJd0FEQWQKQmdO
-VkhRNEVGZ1FVb0ZwWTc2cDV5b05EUkd0UXB6VnVSODFVV1Ewd2djWUdBMVVkSXdTQnZqQ0J1NEFV
-dzYwK3B0WVJBRVdBWERwWApTb3B0M0RFTm5uR2hnWUNrZmpCOE1Rc3dDUVlEVlFRR0V3SlZVekU4
-TURvR0ExVUVDaE16U1c1MFpYSnVaWFFnUTI5eWNHOXlZWFJwCmIyNGdabTl5SUVGemMybG5ibVZr
-SUU1aGJXVnpJR0Z1WkNCT2RXMWlaWEp6TVM4d0xRWURWUVFERXlaSlEwRk9UaUJVY21Ga1pXMWgK
-Y21zZ1EyeGxZWEpwYm1kb2IzVnpaU0JRYVd4dmRDQkRRWUlnTHJBYmV2b2FlNTJ5M2Y2QzJ0QjBT
-bjNwN1hKbTBUMDJGb2d4S0NmTgpoWGt3RGdZRFZSMFBBUUgvQkFRREFnZUFNRFFHQTFVZEh3UXRN
-Q3N3S2FBbm9DV0dJMmgwZEhBNkx5OWpjbXd1YVdOaGJtNHViM0puCkwzUnRZMmhmY0dsc2IzUXVZ
-M0pzTUZFR0ExVWRJQVJLTUVnd0VBWU9Ld1lCQkFHQ3lSc0JCWU03REFvd05BWUlLd1lCQlFVSEFn
-RXcKS0RBbUJnZ3JCZ0VGQlFjQ0FSWWFhSFIwY0hNNkx5OWpZUzVwWTJGdWJpNXZjbWN2Y0dsc2Iz
-UXdEUVlKS29aSWh2Y05BUUVMQlFBRApnZ0VCQUF1aloySWNSMkRWcnRhUnJBNTllTllDbDR4Y3NK
-TXU4RFFDSHYyOGZUZmkvQmlaWTRJcjdGOWtGeTk2RDdPWjhvTFk1empmCjRkSHhGd0hQcUg4RGg2
-Sldzelh1SFcxWmEzWG1sMFBhSHhDV1JTMFhvbDhXc0hIcE55Z2pNQllmSjBvZFZNODg1VFoxRWw5
-U2l1RUgKbnluRkJnU21pRmM5OXVRZC9ZRFJadUd2L0EwSHl2N3lSOXRrTEVkRDNBMXVOSkJXNFAr
-SEpHcGRLa1lMMVE1clU3K29IVlB0TUtLSQozaUZrVUVzYk80NUFWZDd2UC9qLzdKdEFaUGI2a29P
-VjVsWmkySDFSTGNjR3d6ZGV6bmhKZ2QwTjlvYmIwdm5FNDEvVVNXYWZkV1JaClZHa3dQdXFUaGw3
-c0N0enJKSDhYWTB4Y3VtK2NmTHgyRUFJd1VuT2NhYjQ9PC9kczpYNTA5Q2VydGlmaWNhdGU+PC9k
-czpYNTA5RGF0YT48L2RzOktleUluZm8+PC9kczpTaWduYXR1cmU+PC9zbWQ6c2lnbmVkTWFyaz4=
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/active/TreatyStatute-Holder-Arab-Active.smd b/core/src/test/resources/google/registry/tmch/active/TreatyStatute-Holder-Arab-Active.smd
deleted file mode 100644
index 5a9dc6fd9..000000000
--- a/core/src/test/resources/google/registry/tmch/active/TreatyStatute-Holder-Arab-Active.smd
+++ /dev/null
@@ -1,97 +0,0 @@
-Marks: الاختبار & لتقييم
-smdID: 000000921526320400303-65535
-U-labels: xn------nzeaagpf7azb2ppajr3fa, xn-----btdaafne4a7azpoaiq8ea, xn----ymcaaeld1a4a6onahp3ea, xn--mgbaadjcy1a8mmago8da
-notBefore: 2018-05-14T17:53:20.303Z
-notAfter: 2022-08-21T08:59:34.305Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il9hNDk5
-MGI3Zi1lNGJkLTRkZWItYjhmYS02ZGU0YWU4YjAxYjciPjxzbWQ6aWQ+MDAwMDAwOTIxNTI2MzIw
-NDAwMzAzLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo1MzoyMC4zMDNaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0yMVQwODo1OTozNC4zMDVaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
-cmVhdHlPclN0YXR1dGU+PG1hcms6aWQ+MDAwMTQyMTUwMzMwNTgwODE1MDMzMDU4MDgtMTwvbWFy
-azppZD48bWFyazptYXJrTmFtZT7Yp9mE2KfYrtiq2KjYp9ixICZhbXA7INmE2KrZgtmK2YrZhTwv
-bWFyazptYXJrTmFtZT48bWFyazpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpuYW1l
-PtmF2YfZhtiv2LMg2KfZhNmF2LnZhNmI2YXYp9iq2YrYqTwvbWFyazpuYW1lPjxtYXJrOm9yZz7Y
-p9iu2KrYqNin2LE8L21hcms6b3JnPjxtYXJrOmFkZHI+PG1hcms6c3RyZWV0Ptis2LnZgdixINin
-2KjZhiDYs9mK2YbYp9ihIDc1PC9tYXJrOnN0cmVldD48bWFyazpjaXR5PtmF2YPZhtin2LM8L21h
-cms6Y2l0eT48bWFyazpwYz4yOTAwPC9tYXJrOnBjPjxtYXJrOmNjPk1BPC9tYXJrOmNjPjwvbWFy
-azphZGRyPjxtYXJrOnZvaWNlPisyMTIuNTIyNTM5MDQwPC9tYXJrOnZvaWNlPjxtYXJrOmZheD4r
-MjEyLjUyMjUzOTA0MTwvbWFyazpmYXg+PG1hcms6ZW1haWw+aW5mb0BleGFtcGxlLmV4YW1wbGU8
-L21hcms6ZW1haWw+PC9tYXJrOmhvbGRlcj48bWFyazpwcm90ZWN0aW9uPjxtYXJrOmNjPk1BPC9t
-YXJrOmNjPjxtYXJrOnJ1bGluZz5NQTwvbWFyazpydWxpbmc+PC9tYXJrOnByb3RlY3Rpb24+PG1h
-cms6bGFiZWw+eG4tLS0tLS1uemVhYWdwZjdhemIycHBhanIzZmE8L21hcms6bGFiZWw+PG1hcms6
-bGFiZWw+eG4tLS0tLWJ0ZGFhZm5lNGE3YXpwb2FpcThlYTwvbWFyazpsYWJlbD48bWFyazpsYWJl
-bD54bi0tLS15bWNhYWVsZDFhNGE2b25haHAzZWE8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4t
-LW1nYmFhZGpjeTFhOG1tYWdvOGRhPC9tYXJrOmxhYmVsPjxtYXJrOmdvb2RzQW5kU2VydmljZXM+
-2LrZitiq2KfYsTwvbWFyazpnb29kc0FuZFNlcnZpY2VzPjxtYXJrOnJlZk51bT4xMjM0PC9tYXJr
-OnJlZk51bT48bWFyazpwcm9EYXRlPjIwMTMtMDItMDJUMDA6MDA6MDAuMDAwWjwvbWFyazpwcm9E
-YXRlPjxtYXJrOnRpdGxlPlRlc3QgVHJlYXR5PC9tYXJrOnRpdGxlPjxtYXJrOmV4ZWNEYXRlPjIw
-MTMtMDItMDJUMDA6MDA6MDAuMDAwWjwvbWFyazpleGVjRGF0ZT48L21hcms6dHJlYXR5T3JTdGF0
-dXRlPjwvbWFyazptYXJrPjxkczpTaWduYXR1cmUgeG1sbnM6ZHM9Imh0dHA6Ly93d3cudzMub3Jn
-LzIwMDAvMDkveG1sZHNpZyMiIElkPSJfYWNhNzFiMDYtYzQwMC00ZDgzLTg1MWEtYzE2Njk1YWIz
-MzMyIj48ZHM6U2lnbmVkSW5mbz48ZHM6Q2Fub25pY2FsaXphdGlvbk1ldGhvZCBBbGdvcml0aG09
-Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjxkczpTaWduYXR1cmVN
-ZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGRzaWctbW9yZSNy
-c2Etc2hhMjU2Ii8+PGRzOlJlZmVyZW5jZSBVUkk9IiNfYTQ5OTBiN2YtZTRiZC00ZGViLWI4ZmEt
-NmRlNGFlOGIwMWI3Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0
-cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48ZHM6
-VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMx
-NG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8v
-d3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+cWc4cjNF
-VFFHTk56TlpzZXpqZ3BvNmJGRlBHanJzUm1UTUtSUzdjcXlpZz08L2RzOkRpZ2VzdFZhbHVlPjwv
-ZHM6UmVmZXJlbmNlPjxkczpSZWZlcmVuY2UgVVJJPSIjXzBiOTk3ZmM1LTkwNzAtNDU2Zi04YTJk
-LWU4MDQ5MzBhZmExNSI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0
-dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48
-ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxl
-bmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPittR1lvZURJeHJ6RzFnMmM3b1d0N3RHUG5RaEg5
-TytXZktBUTg4VXE1Ums9PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48L2RzOlNpZ25l
-ZEluZm8+PGRzOlNpZ25hdHVyZVZhbHVlIElkPSJfODU5NmU5ZjctN2M3Yy00ZDZlLTg0MWItMTM0
-OTZiN2E0NjhkIj5yM2l2SzJ0V1A5WHNPUmpRdWpKeXJLRUFESGg0cE42NXFuMCt1bTRvMDdibWtx
-eWx5OTJRUGZrWGpjakVqZm8rQkkrb21rOS9NMm9WCld4SHpIQVdSMzBnTjhzSzhkS056MERDNFV2
-NlViL2NaS29MQzZsbHpzZFFmdXZjaWJHMVo5N3N2NkhXWHZ3MXl1QXlEQmV3UFdkWDcKMFYvQjIy
-V1FPVkRqK0dyb3lwUmN3eDVrd1h0Rkc4UjhYS2I3ZVlvbGh2SWdSK0RnYnNCd29CL1lPdnBTOFF1
-Ty9acEErTFFhMTB4WAp5OW1QaGdoczA5NTlkVnNKcHBkQmU3UkVWRk01NGZtVmxsS2Z1dkRZZW42
-OXdMY2Yvd2pFcDJrUzlpcTZsbUN5SUMybGh1TVBHYzZhCnlsbkZ5cEJXMktPZ0QzSm05OUVKdUNH
-V242empKYnIwTWc1V2pnPT08L2RzOlNpZ25hdHVyZVZhbHVlPjxkczpLZXlJbmZvIElkPSJfMGI5
-OTdmYzUtOTA3MC00NTZmLThhMmQtZTgwNDkzMGFmYTE1Ij48ZHM6WDUwOURhdGE+PGRzOlg1MDlD
-ZXJ0aWZpY2F0ZT5NSUlGT3pDQ0JDT2dBd0lCQWdJZ0xyQWJldm9hZTUyeTNmNkMydEIwU24zcDdY
-Sm0wVDAyRm9neEtDZk5oWmN3RFFZSktvWklodmNOCkFRRUxCUUF3ZkRFTE1Ba0dBMVVFQmhNQ1ZW
-TXhQREE2QmdOVkJBb1RNMGx1ZEdWeWJtVjBJRU52Y25CdmNtRjBhVzl1SUdadmNpQkIKYzNOcFoy
-NWxaQ0JPWVcxbGN5QmhibVFnVG5WdFltVnljekV2TUMwR0ExVUVBeE1tU1VOQlRrNGdWSEpoWkdW
-dFlYSnJJRU5zWldGeQphVzVuYUc5MWMyVWdVR2xzYjNRZ1EwRXdIaGNOTVRnd01qSTRNREF3TURB
-d1doY05Nak13TXpBeE1qTTFPVFU1V2pDQmp6RUxNQWtHCkExVUVCaE1DUWtVeElEQWVCZ05WQkFn
-VEYwSnlkWE56Wld4ekxVTmhjR2wwWVd3Z1VtVm5hVzl1TVJFd0R3WURWUVFIRXdoQ2NuVnoKYzJW
-c2N6RVJNQThHQTFVRUNoTUlSR1ZzYjJsMGRHVXhPREEyQmdOVkJBTVRMMGxEUVU1T0lGUk5RMGdn
-UVhWMGFHOXlhWHBsWkNCVQpjbUZrWlcxaGNtc2dVR2xzYjNRZ1ZtRnNhV1JoZEc5eU1JSUJJakFO
-QmdrcWhraUc5dzBCQVFFRkFBT0NBUThBTUlJQkNnS0NBUUVBCnhscDNLcFlIWDNXeUFzRmhTazNM
-d1dmbkdseG5VREZxRlpBM1VvdU1Zai9YaWdiTWtOZUVYSWpsa1JPS1Q0T1BHZlJ4L0xBeVJsUVEK
-akNNdjRxaGJrY1gxcDdhcjYzZmxxNFNaTlZjbDE1bDdoMHVUNThGelNmbmx6MHU1cmtIZkpJbUQ0
-MyttYVAvOGd2MzZGUjI3alc4Ugo5d1k0aGsrV3M0SUIwaUZTZDhTWHYxS3I4dy9KbU1RU0RraXVH
-K1JmSWl1YndRL2Z5N0VrajVRV2hQWncrbU14TktuSFVMeTN4WXoyCkx3VmZmdGp3VXVlYWN2cU5S
-Q2tNWGxDbE9BRHFmVDhvU1pvZURYZWhIdmxQc0xDZW1HQm9US3Vyc2tJUzY5RjB5UEVINWd6ZTBI
-K2YKOEZST3NJb0tTc1ZRMzRCNFMvam9FNjducHNKUFRkS3NOUEpUeVFJREFRQUJvNElCa3pDQ0FZ
-OHdEQVlEVlIwVEFRSC9CQUl3QURBZApCZ05WSFE0RUZnUVVvRnBZNzZwNXlvTkRSR3RRcHpWdVI4
-MVVXUTB3Z2NZR0ExVWRJd1NCdmpDQnU0QVV3NjArcHRZUkFFV0FYRHBYClNvcHQzREVObm5HaGdZ
-Q2tmakI4TVFzd0NRWURWUVFHRXdKVlV6RThNRG9HQTFVRUNoTXpTVzUwWlhKdVpYUWdRMjl5Y0c5
-eVlYUnAKYjI0Z1ptOXlJRUZ6YzJsbmJtVmtJRTVoYldWeklHRnVaQ0JPZFcxaVpYSnpNUzh3TFFZ
-RFZRUURFeVpKUTBGT1RpQlVjbUZrWlcxaApjbXNnUTJ4bFlYSnBibWRvYjNWelpTQlFhV3h2ZENC
-RFFZSWdMckFiZXZvYWU1MnkzZjZDMnRCMFNuM3A3WEptMFQwMkZvZ3hLQ2ZOCmhYa3dEZ1lEVlIw
-UEFRSC9CQVFEQWdlQU1EUUdBMVVkSHdRdE1Dc3dLYUFub0NXR0kyaDBkSEE2THk5amNtd3VhV05o
-Ym00dWIzSm4KTDNSdFkyaGZjR2xzYjNRdVkzSnNNRkVHQTFVZElBUktNRWd3RUFZT0t3WUJCQUdD
-eVJzQkJZTTdEQW93TkFZSUt3WUJCUVVIQWdFdwpLREFtQmdnckJnRUZCUWNDQVJZYWFIUjBjSE02
-THk5allTNXBZMkZ1Ymk1dmNtY3ZjR2xzYjNRd0RRWUpLb1pJaHZjTkFRRUxCUUFECmdnRUJBQXVq
-WjJJY1IyRFZydGFSckE1OWVOWUNsNHhjc0pNdThEUUNIdjI4ZlRmaS9CaVpZNElyN0Y5a0Z5OTZE
-N09aOG9MWTV6amYKNGRIeEZ3SFBxSDhEaDZKV3N6WHVIVzFaYTNYbWwwUGFIeENXUlMwWG9sOFdz
-SEhwTnlnak1CWWZKMG9kVk04ODVUWjFFbDlTaXVFSApueW5GQmdTbWlGYzk5dVFkL1lEUlp1R3Yv
-QTBIeXY3eVI5dGtMRWREM0ExdU5KQlc0UCtISkdwZEtrWUwxUTVyVTcrb0hWUHRNS0tJCjNpRmtV
-RXNiTzQ1QVZkN3ZQL2ovN0p0QVpQYjZrb09WNWxaaTJIMVJMY2NHd3pkZXpuaEpnZDBOOW9iYjB2
-bkU0MS9VU1dhZmRXUloKVkdrd1B1cVRobDdzQ3R6ckpIOFhZMHhjdW0rY2ZMeDJFQUl3VW5PY2Fi
-ND08L2RzOlg1MDlDZXJ0aWZpY2F0ZT48L2RzOlg1MDlEYXRhPjwvZHM6S2V5SW5mbz48L2RzOlNp
-Z25hdHVyZT48L3NtZDpzaWduZWRNYXJrPg==
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/active/TreatyStatute-Holder-Chinese-Active.smd b/core/src/test/resources/google/registry/tmch/active/TreatyStatute-Holder-Chinese-Active.smd
deleted file mode 100644
index e5a5d124b..000000000
--- a/core/src/test/resources/google/registry/tmch/active/TreatyStatute-Holder-Chinese-Active.smd
+++ /dev/null
@@ -1,95 +0,0 @@
-Marks: 错误&证明
-smdID: 000000721526320365276-65535
-U-labels: xn----wp6bo72ihfa346b, xn--and-k58f177n1hah08c, xn--2hv125f6d788a
-notBefore: 2018-05-14T17:52:45.276Z
-notAfter: 2022-08-21T08:12:01.925Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il9hZDE2
-Y2M1Yy03YjAxLTQ5NTgtOTEzZS0xNDYxNDM3YWMyMzciPjxzbWQ6aWQ+MDAwMDAwNzIxNTI2MzIw
-MzY1Mjc2LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo1Mjo0NS4yNzZaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0yMVQwODoxMjowMS45MjVaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
-cmVhdHlPclN0YXR1dGU+PG1hcms6aWQ+MDAwMTQ1MTUwMzA2NDk2NTE1MDMwNjQ5NjUtMTwvbWFy
-azppZD48bWFyazptYXJrTmFtZT7plJnor68mYW1wO+ivgeaYjjwvbWFyazptYXJrTmFtZT48bWFy
-azpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpuYW1lPuadjuWwj+aWuTwvbWFyazpu
-YW1lPjxtYXJrOm9yZz7mtYvor5U8L21hcms6b3JnPjxtYXJrOmFkZHI+PG1hcms6c3RyZWV0Pumm
-mea4r+S4nOi3rzblj7fvvIw15Y+35qW877yMOOWPt+WupCA8L21hcms6c3RyZWV0PjxtYXJrOmNp
-dHk+6Z2S5bKb5biCPC9tYXJrOmNpdHk+PG1hcms6cGM+MTAwMDwvbWFyazpwYz48bWFyazpjYz5D
-TjwvbWFyazpjYz48L21hcms6YWRkcj48bWFyazp2b2ljZT4rODYuMTA4NDY1NzE3MzwvbWFyazp2
-b2ljZT48bWFyazpmYXg+Kzg2LjEwODQ2NTcxNzM8L21hcms6ZmF4PjxtYXJrOmVtYWlsPmluZm9A
-ZXhhbXBsZS5leGFtcGxlPC9tYXJrOmVtYWlsPjwvbWFyazpob2xkZXI+PG1hcms6cHJvdGVjdGlv
-bj48bWFyazpjYz5VUzwvbWFyazpjYz48bWFyazpydWxpbmc+Q048L21hcms6cnVsaW5nPjwvbWFy
-azpwcm90ZWN0aW9uPjxtYXJrOmxhYmVsPnhuLS0tLXdwNmJvNzJpaGZhMzQ2YjwvbWFyazpsYWJl
-bD48bWFyazpsYWJlbD54bi0tYW5kLWs1OGYxNzduMWhhaDA4YzwvbWFyazpsYWJlbD48bWFyazps
-YWJlbD54bi0tMmh2MTI1ZjZkNzg4YTwvbWFyazpsYWJlbD48bWFyazpnb29kc0FuZFNlcnZpY2Vz
-PiDlkInku5Y8L21hcms6Z29vZHNBbmRTZXJ2aWNlcz48bWFyazpyZWZOdW0+MTIzNDwvbWFyazpy
-ZWZOdW0+PG1hcms6cHJvRGF0ZT4yMDAwLTAxLTAxVDAwOjAwOjAwLjAwMFo8L21hcms6cHJvRGF0
-ZT48bWFyazp0aXRsZT5UZXN0IFRyZWF0eTwvbWFyazp0aXRsZT48bWFyazpleGVjRGF0ZT4yMDEz
-LTAyLTAyVDAwOjAwOjAwLjAwMFo8L21hcms6ZXhlY0RhdGU+PC9tYXJrOnRyZWF0eU9yU3RhdHV0
-ZT48L21hcms6bWFyaz48ZHM6U2lnbmF0dXJlIHhtbG5zOmRzPSJodHRwOi8vd3d3LnczLm9yZy8y
-MDAwLzA5L3htbGRzaWcjIiBJZD0iXzdlZDJlMzgyLTRiOWUtNGZiOC1hNDUyLWU4NGQ2ZGRjNThj
-MiI+PGRzOlNpZ25lZEluZm8+PGRzOkNhbm9uaWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGhtPSJo
-dHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJlTWV0
-aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxkc2lnLW1vcmUjcnNh
-LXNoYTI1NiIvPjxkczpSZWZlcmVuY2UgVVJJPSIjX2FkMTZjYzVjLTdiMDEtNDk1OC05MTNlLTE0
-NjE0MzdhYzIzNyI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6
-Ly93d3cudzMub3JnLzIwMDAvMDkveG1sZHNpZyNlbnZlbG9wZWQtc2lnbmF0dXJlIi8+PGRzOlRy
-YW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRu
-IyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3
-dy53My5vcmcvMjAwMS8wNC94bWxlbmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPmVPeTVpYVpU
-OG9GeVV4Uk1DYitIQXhKbUc0L1l2bjVibEtMRm5oSm9IOHM9PC9kczpEaWdlc3RWYWx1ZT48L2Rz
-OlJlZmVyZW5jZT48ZHM6UmVmZXJlbmNlIFVSST0iI19jZjU2MTA1OS0yZjJjLTRhMDktOTUxMC0z
-NTQ1OGEzZDY2YTgiPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRw
-Oi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRz
-OkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5j
-I3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1ZT5rbXJkamJzR0ZpcUUxQ2hoYkJieTlRTU5udjEzb3Qx
-QXpWdkN3YzBhcmNRPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PC9kczpTaWduZWRJ
-bmZvPjxkczpTaWduYXR1cmVWYWx1ZSBJZD0iXzdjNzAzYjI5LTE1ZjEtNDQ1NC1iN2Q5LWJjYzA3
-MDJkZjVkZSI+ZFVOTDVVM3MvU1ZFNTVGbFRWRGFmMlJxVHdGQ1RReThwNUw3SGFMNCtWUFlwMEtJ
-ZGpRckpvSHdLYkd5dWJ4MEZjRlNkenV1bm5qbQorclhNa1packlSL2EydTV1QnhKcTJUb2dNZkpy
-dCtYS0dTQ0UwS1NJWUs4cFREVFgyMGhTR0thQ1h5UDBYUlR5aXI2NTExR1FudlpECnZpa1VHd1VI
-WkR4eVJKTHB5ZjdTckR3S2hZb21McWw0QWFENERsOGhjVkR5bXpKREdCdjJheG5UZThEWFlsWko4
-MEF2RDBtWFBoSUMKTGkvWk9hNlZVcy90TlBXdCtHTmhaZlF4MkxJTzhDaVh3VGdiWmxaanQvakJF
-aEdrUndldGZmL1BlQ0toY1BHazNGVjk0TDRYVHJzTgprYXR3OGRFbWJGdHhGY2hqOTkzOE92MWRB
-MG1FdDJSSGx2ZkFQdz09PC9kczpTaWduYXR1cmVWYWx1ZT48ZHM6S2V5SW5mbyBJZD0iX2NmNTYx
-MDU5LTJmMmMtNGEwOS05NTEwLTM1NDU4YTNkNjZhOCI+PGRzOlg1MDlEYXRhPjxkczpYNTA5Q2Vy
-dGlmaWNhdGU+TUlJRk96Q0NCQ09nQXdJQkFnSWdMckFiZXZvYWU1MnkzZjZDMnRCMFNuM3A3WEpt
-MFQwMkZvZ3hLQ2ZOaFpjd0RRWUpLb1pJaHZjTgpBUUVMQlFBd2ZERUxNQWtHQTFVRUJoTUNWVk14
-UERBNkJnTlZCQW9UTTBsdWRHVnlibVYwSUVOdmNuQnZjbUYwYVc5dUlHWnZjaUJCCmMzTnBaMjVs
-WkNCT1lXMWxjeUJoYm1RZ1RuVnRZbVZ5Y3pFdk1DMEdBMVVFQXhNbVNVTkJUazRnVkhKaFpHVnRZ
-WEpySUVOc1pXRnkKYVc1bmFHOTFjMlVnVUdsc2IzUWdRMEV3SGhjTk1UZ3dNakk0TURBd01EQXdX
-aGNOTWpNd016QXhNak0xT1RVNVdqQ0JqekVMTUFrRwpBMVVFQmhNQ1FrVXhJREFlQmdOVkJBZ1RG
-MEp5ZFhOelpXeHpMVU5oY0dsMFlXd2dVbVZuYVc5dU1SRXdEd1lEVlFRSEV3aENjblZ6CmMyVnNj
-ekVSTUE4R0ExVUVDaE1JUkdWc2IybDBkR1V4T0RBMkJnTlZCQU1UTDBsRFFVNU9JRlJOUTBnZ1FY
-VjBhRzl5YVhwbFpDQlUKY21Ga1pXMWhjbXNnVUdsc2IzUWdWbUZzYVdSaGRHOXlNSUlCSWpBTkJn
-a3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQQp4bHAzS3BZSFgzV3lBc0ZoU2szTHdX
-Zm5HbHhuVURGcUZaQTNVb3VNWWovWGlnYk1rTmVFWElqbGtST0tUNE9QR2ZSeC9MQXlSbFFRCmpD
-TXY0cWhia2NYMXA3YXI2M2ZscTRTWk5WY2wxNWw3aDB1VDU4RnpTZm5sejB1NXJrSGZKSW1ENDMr
-bWFQLzhndjM2RlIyN2pXOFIKOXdZNGhrK1dzNElCMGlGU2Q4U1h2MUtyOHcvSm1NUVNEa2l1RytS
-ZklpdWJ3US9meTdFa2o1UVdoUFp3K21NeE5LbkhVTHkzeFl6MgpMd1ZmZnRqd1V1ZWFjdnFOUkNr
-TVhsQ2xPQURxZlQ4b1Nab2VEWGVoSHZsUHNMQ2VtR0JvVEt1cnNrSVM2OUYweVBFSDVnemUwSCtm
-CjhGUk9zSW9LU3NWUTM0QjRTL2pvRTY3bnBzSlBUZEtzTlBKVHlRSURBUUFCbzRJQmt6Q0NBWTh3
-REFZRFZSMFRBUUgvQkFJd0FEQWQKQmdOVkhRNEVGZ1FVb0ZwWTc2cDV5b05EUkd0UXB6VnVSODFV
-V1Ewd2djWUdBMVVkSXdTQnZqQ0J1NEFVdzYwK3B0WVJBRVdBWERwWApTb3B0M0RFTm5uR2hnWUNr
-ZmpCOE1Rc3dDUVlEVlFRR0V3SlZVekU4TURvR0ExVUVDaE16U1c1MFpYSnVaWFFnUTI5eWNHOXlZ
-WFJwCmIyNGdabTl5SUVGemMybG5ibVZrSUU1aGJXVnpJR0Z1WkNCT2RXMWlaWEp6TVM4d0xRWURW
-UVFERXlaSlEwRk9UaUJVY21Ga1pXMWgKY21zZ1EyeGxZWEpwYm1kb2IzVnpaU0JRYVd4dmRDQkRR
-WUlnTHJBYmV2b2FlNTJ5M2Y2QzJ0QjBTbjNwN1hKbTBUMDJGb2d4S0NmTgpoWGt3RGdZRFZSMFBB
-UUgvQkFRREFnZUFNRFFHQTFVZEh3UXRNQ3N3S2FBbm9DV0dJMmgwZEhBNkx5OWpjbXd1YVdOaGJt
-NHViM0puCkwzUnRZMmhmY0dsc2IzUXVZM0pzTUZFR0ExVWRJQVJLTUVnd0VBWU9Ld1lCQkFHQ3lS
-c0JCWU03REFvd05BWUlLd1lCQlFVSEFnRXcKS0RBbUJnZ3JCZ0VGQlFjQ0FSWWFhSFIwY0hNNkx5
-OWpZUzVwWTJGdWJpNXZjbWN2Y0dsc2IzUXdEUVlKS29aSWh2Y05BUUVMQlFBRApnZ0VCQUF1aloy
-SWNSMkRWcnRhUnJBNTllTllDbDR4Y3NKTXU4RFFDSHYyOGZUZmkvQmlaWTRJcjdGOWtGeTk2RDdP
-WjhvTFk1empmCjRkSHhGd0hQcUg4RGg2Sldzelh1SFcxWmEzWG1sMFBhSHhDV1JTMFhvbDhXc0hI
-cE55Z2pNQllmSjBvZFZNODg1VFoxRWw5U2l1RUgKbnluRkJnU21pRmM5OXVRZC9ZRFJadUd2L0Ew
-SHl2N3lSOXRrTEVkRDNBMXVOSkJXNFArSEpHcGRLa1lMMVE1clU3K29IVlB0TUtLSQozaUZrVUVz
-Yk80NUFWZDd2UC9qLzdKdEFaUGI2a29PVjVsWmkySDFSTGNjR3d6ZGV6bmhKZ2QwTjlvYmIwdm5F
-NDEvVVNXYWZkV1JaClZHa3dQdXFUaGw3c0N0enJKSDhYWTB4Y3VtK2NmTHgyRUFJd1VuT2NhYjQ9
-PC9kczpYNTA5Q2VydGlmaWNhdGU+PC9kczpYNTA5RGF0YT48L2RzOktleUluZm8+PC9kczpTaWdu
-YXR1cmU+PC9zbWQ6c2lnbmVkTWFyaz4=
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/active/TreatyStatute-Holder-English-Active.smd b/core/src/test/resources/google/registry/tmch/active/TreatyStatute-Holder-English-Active.smd
deleted file mode 100644
index 2d59b5acc..000000000
--- a/core/src/test/resources/google/registry/tmch/active/TreatyStatute-Holder-English-Active.smd
+++ /dev/null
@@ -1,99 +0,0 @@
-Marks: Test & Validate
-smdID: 000000551526320347725-65535
-U-labels: test---validate, test--validate, test-and-validate, test-andvalidate, test-validate, testand-validate, testandvalidate, testvalidate
-notBefore: 2018-05-14T17:52:27.725Z
-notAfter: 2022-08-21T08:12:19.525Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il8xYTVk
-MjQ4MS0wOGI2LTQ3YjMtYWNiMi05Y2Q0M2YxMzY5NjUiPjxzbWQ6aWQ+MDAwMDAwNTUxNTI2MzIw
-MzQ3NzI1LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo1MjoyNy43MjVaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0yMVQwODoxMjoxOS41MjVaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
-cmVhdHlPclN0YXR1dGU+PG1hcms6aWQ+MDAwMTM2MTUwMzA1NzMwNTE1MDMwNTczMDUtMTwvbWFy
-azppZD48bWFyazptYXJrTmFtZT5UZXN0ICZhbXA7IFZhbGlkYXRlPC9tYXJrOm1hcmtOYW1lPjxt
-YXJrOmhvbGRlciBlbnRpdGxlbWVudD0ib3duZXIiPjxtYXJrOm5hbWU+RnJhbmsgV2hpdGU8L21h
-cms6bmFtZT48bWFyazpvcmc+VGVzdCBPcmdhbml6YXRpb248L21hcms6b3JnPjxtYXJrOmFkZHI+
-PG1hcms6c3RyZWV0Pldlc3QgQXJxdWVzIEF2ZW51ZSAxMDEgPC9tYXJrOnN0cmVldD48bWFyazpj
-aXR5PlN1bm55dmFsZTwvbWFyazpjaXR5PjxtYXJrOnNwPkNBPC9tYXJrOnNwPjxtYXJrOnBjPjEw
-MDIzLTMyNDE8L21hcms6cGM+PG1hcms6Y2M+VVM8L21hcms6Y2M+PC9tYXJrOmFkZHI+PG1hcms6
-dm9pY2U+KzEuMzAxNDU1NjYwMDwvbWFyazp2b2ljZT48bWFyazpmYXg+KzEuMzAxNDU1NjYwMTwv
-bWFyazpmYXg+PG1hcms6ZW1haWw+aW5mb0BleGFtcGxlLmV4YW1wbGU8L21hcms6ZW1haWw+PC9t
-YXJrOmhvbGRlcj48bWFyazpwcm90ZWN0aW9uPjxtYXJrOmNjPlVTPC9tYXJrOmNjPjxtYXJrOnJ1
-bGluZz5VUzwvbWFyazpydWxpbmc+PC9tYXJrOnByb3RlY3Rpb24+PG1hcms6bGFiZWw+dGVzdC0t
-LXZhbGlkYXRlPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnRlc3QtLXZhbGlkYXRlPC9tYXJrOmxh
-YmVsPjxtYXJrOmxhYmVsPnRlc3QtYW5kLXZhbGlkYXRlPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVs
-PnRlc3QtYW5kdmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+dGVzdC12YWxpZGF0ZTwv
-bWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0YW5kLXZhbGlkYXRlPC9tYXJrOmxhYmVsPjxtYXJr
-OmxhYmVsPnRlc3RhbmR2YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0dmFsaWRh
-dGU8L21hcms6bGFiZWw+PG1hcms6Z29vZHNBbmRTZXJ2aWNlcz5ndWl0YXI8L21hcms6Z29vZHNB
-bmRTZXJ2aWNlcz48bWFyazpyZWZOdW0+MTIzNDwvbWFyazpyZWZOdW0+PG1hcms6cHJvRGF0ZT4y
-MDAwLTAxLTAxVDAwOjAwOjAwLjAwMFo8L21hcms6cHJvRGF0ZT48bWFyazp0aXRsZT5NdXNpY2Fs
-IGluc3RydW1lbnRzPC9tYXJrOnRpdGxlPjxtYXJrOmV4ZWNEYXRlPjIwMTMtMDItMDJUMDA6MDA6
-MDAuMDAwWjwvbWFyazpleGVjRGF0ZT48L21hcms6dHJlYXR5T3JTdGF0dXRlPjwvbWFyazptYXJr
-PjxkczpTaWduYXR1cmUgeG1sbnM6ZHM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1sZHNp
-ZyMiIElkPSJfZjBlY2YyMzEtNWMxYy00MWI3LTg3MDEtOWIwMWUwNmM1YThhIj48ZHM6U2lnbmVk
-SW5mbz48ZHM6Q2Fub25pY2FsaXphdGlvbk1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMu
-b3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjxkczpTaWduYXR1cmVNZXRob2QgQWxnb3JpdGht
-PSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGRzaWctbW9yZSNyc2Etc2hhMjU2Ii8+PGRz
-OlJlZmVyZW5jZSBVUkk9IiNfMWE1ZDI0ODEtMDhiNi00N2IzLWFjYjItOWNkNDNmMTM2OTY1Ij48
-ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcv
-MjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48ZHM6VHJhbnNmb3JtIEFsZ29y
-aXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFu
-c2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAx
-LzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+SFkyMjZ2enBoS2hGNjdNMHA1ZjhN
-NTlvQytORWR4T1BTNGNSMWxIVFhVRT08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNlPjxk
-czpSZWZlcmVuY2UgVVJJPSIjXzIwZTkxYWU1LTA0MTktNDJjZi04M2E5LTM0NGUyZWJmNjE4ZiI+
-PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3Jn
-LzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6RGlnZXN0TWV0aG9k
-IEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxlbmMjc2hhMjU2Ii8+PGRz
-OkRpZ2VzdFZhbHVlPlIxNGsvZTlEeXRtSmt4VVowRzRXMzlaY3R2bUZmRmtQS1dDREhWTTIvNmc9
-PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48L2RzOlNpZ25lZEluZm8+PGRzOlNpZ25h
-dHVyZVZhbHVlIElkPSJfNzQwYjRmMGItODI1Yi00Yzc2LWJhOWEtODkxMzE5NGZmYjEzIj5RT1JI
-Q0FBa0dENnQyM081d2VTVjV0a0kvdmJjU2k3ZHNJU2NxS09uMjhQc2pYYUllcThhMUx6NHBrcXZq
-N1NQYlhLZGw5SDVuV2dlClVwcXRiMW4yTDlURUpiUUh1d2M1ckxGS3FFTXN0Qy9TYXl0UFU1YnNZ
-MU9JcEJuRzAxNW41QnFqSVN1bjVkOHVaaDhwajg2QXcvUHYKekVRbzQ1VEcrbk1zTENQNDN6dkFL
-RzVrUFVHa1ZVQWNnczNRdmpVRFBlb2tORnFCa2J3OW8xSERkK1ArRFViYkNOK0tDaFdoUXkwZApU
-Z21McVVsWHJ2LzNFQlhPblAyZUNDQzdiemx2R1hRclhMc2xxaCtBMTkreUFYWnZzMzROT3FFeENX
-Qmo0bHEybTlGNDc5cXA2WnZFCkh3NE5JQWpYU1pKVDlkb1RteFkwTHpYUDBJNGk2RVZkVkVxUjBB
-PT08L2RzOlNpZ25hdHVyZVZhbHVlPjxkczpLZXlJbmZvIElkPSJfMjBlOTFhZTUtMDQxOS00MmNm
-LTgzYTktMzQ0ZTJlYmY2MThmIj48ZHM6WDUwOURhdGE+PGRzOlg1MDlDZXJ0aWZpY2F0ZT5NSUlG
-T3pDQ0JDT2dBd0lCQWdJZ0xyQWJldm9hZTUyeTNmNkMydEIwU24zcDdYSm0wVDAyRm9neEtDZk5o
-WmN3RFFZSktvWklodmNOCkFRRUxCUUF3ZkRFTE1Ba0dBMVVFQmhNQ1ZWTXhQREE2QmdOVkJBb1RN
-MGx1ZEdWeWJtVjBJRU52Y25CdmNtRjBhVzl1SUdadmNpQkIKYzNOcFoyNWxaQ0JPWVcxbGN5Qmhi
-bVFnVG5WdFltVnljekV2TUMwR0ExVUVBeE1tU1VOQlRrNGdWSEpoWkdWdFlYSnJJRU5zWldGeQph
-VzVuYUc5MWMyVWdVR2xzYjNRZ1EwRXdIaGNOTVRnd01qSTRNREF3TURBd1doY05Nak13TXpBeE1q
-TTFPVFU1V2pDQmp6RUxNQWtHCkExVUVCaE1DUWtVeElEQWVCZ05WQkFnVEYwSnlkWE56Wld4ekxV
-TmhjR2wwWVd3Z1VtVm5hVzl1TVJFd0R3WURWUVFIRXdoQ2NuVnoKYzJWc2N6RVJNQThHQTFVRUNo
-TUlSR1ZzYjJsMGRHVXhPREEyQmdOVkJBTVRMMGxEUVU1T0lGUk5RMGdnUVhWMGFHOXlhWHBsWkNC
-VQpjbUZrWlcxaGNtc2dVR2xzYjNRZ1ZtRnNhV1JoZEc5eU1JSUJJakFOQmdrcWhraUc5dzBCQVFF
-RkFBT0NBUThBTUlJQkNnS0NBUUVBCnhscDNLcFlIWDNXeUFzRmhTazNMd1dmbkdseG5VREZxRlpB
-M1VvdU1Zai9YaWdiTWtOZUVYSWpsa1JPS1Q0T1BHZlJ4L0xBeVJsUVEKakNNdjRxaGJrY1gxcDdh
-cjYzZmxxNFNaTlZjbDE1bDdoMHVUNThGelNmbmx6MHU1cmtIZkpJbUQ0MyttYVAvOGd2MzZGUjI3
-alc4Ugo5d1k0aGsrV3M0SUIwaUZTZDhTWHYxS3I4dy9KbU1RU0RraXVHK1JmSWl1YndRL2Z5N0Vr
-ajVRV2hQWncrbU14TktuSFVMeTN4WXoyCkx3VmZmdGp3VXVlYWN2cU5SQ2tNWGxDbE9BRHFmVDhv
-U1pvZURYZWhIdmxQc0xDZW1HQm9US3Vyc2tJUzY5RjB5UEVINWd6ZTBIK2YKOEZST3NJb0tTc1ZR
-MzRCNFMvam9FNjducHNKUFRkS3NOUEpUeVFJREFRQUJvNElCa3pDQ0FZOHdEQVlEVlIwVEFRSC9C
-QUl3QURBZApCZ05WSFE0RUZnUVVvRnBZNzZwNXlvTkRSR3RRcHpWdVI4MVVXUTB3Z2NZR0ExVWRJ
-d1NCdmpDQnU0QVV3NjArcHRZUkFFV0FYRHBYClNvcHQzREVObm5HaGdZQ2tmakI4TVFzd0NRWURW
-UVFHRXdKVlV6RThNRG9HQTFVRUNoTXpTVzUwWlhKdVpYUWdRMjl5Y0c5eVlYUnAKYjI0Z1ptOXlJ
-RUZ6YzJsbmJtVmtJRTVoYldWeklHRnVaQ0JPZFcxaVpYSnpNUzh3TFFZRFZRUURFeVpKUTBGT1Rp
-QlVjbUZrWlcxaApjbXNnUTJ4bFlYSnBibWRvYjNWelpTQlFhV3h2ZENCRFFZSWdMckFiZXZvYWU1
-MnkzZjZDMnRCMFNuM3A3WEptMFQwMkZvZ3hLQ2ZOCmhYa3dEZ1lEVlIwUEFRSC9CQVFEQWdlQU1E
-UUdBMVVkSHdRdE1Dc3dLYUFub0NXR0kyaDBkSEE2THk5amNtd3VhV05oYm00dWIzSm4KTDNSdFky
-aGZjR2xzYjNRdVkzSnNNRkVHQTFVZElBUktNRWd3RUFZT0t3WUJCQUdDeVJzQkJZTTdEQW93TkFZ
-SUt3WUJCUVVIQWdFdwpLREFtQmdnckJnRUZCUWNDQVJZYWFIUjBjSE02THk5allTNXBZMkZ1Ymk1
-dmNtY3ZjR2xzYjNRd0RRWUpLb1pJaHZjTkFRRUxCUUFECmdnRUJBQXVqWjJJY1IyRFZydGFSckE1
-OWVOWUNsNHhjc0pNdThEUUNIdjI4ZlRmaS9CaVpZNElyN0Y5a0Z5OTZEN09aOG9MWTV6amYKNGRI
-eEZ3SFBxSDhEaDZKV3N6WHVIVzFaYTNYbWwwUGFIeENXUlMwWG9sOFdzSEhwTnlnak1CWWZKMG9k
-Vk04ODVUWjFFbDlTaXVFSApueW5GQmdTbWlGYzk5dVFkL1lEUlp1R3YvQTBIeXY3eVI5dGtMRWRE
-M0ExdU5KQlc0UCtISkdwZEtrWUwxUTVyVTcrb0hWUHRNS0tJCjNpRmtVRXNiTzQ1QVZkN3ZQL2ov
-N0p0QVpQYjZrb09WNWxaaTJIMVJMY2NHd3pkZXpuaEpnZDBOOW9iYjB2bkU0MS9VU1dhZmRXUloK
-Vkdrd1B1cVRobDdzQ3R6ckpIOFhZMHhjdW0rY2ZMeDJFQUl3VW5PY2FiND08L2RzOlg1MDlDZXJ0
-aWZpY2F0ZT48L2RzOlg1MDlEYXRhPjwvZHM6S2V5SW5mbz48L2RzOlNpZ25hdHVyZT48L3NtZDpz
-aWduZWRNYXJrPg==
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/active/TreatyStatute-Holder-French-Active.smd b/core/src/test/resources/google/registry/tmch/active/TreatyStatute-Holder-French-Active.smd
deleted file mode 100644
index d658ea164..000000000
--- a/core/src/test/resources/google/registry/tmch/active/TreatyStatute-Holder-French-Active.smd
+++ /dev/null
@@ -1,100 +0,0 @@
-Marks: Essai & évaluation
-smdID: 000000661526320353590-65535
-U-labels: xn--essai---valuation-itb, xn--essai--valuation-hqb, xn--essai-and-valuation-kzb, xn--essai-andvaluation-jwb, xn--essai-valuation-gnb, xn--essaiand-valuation-jwb, xn--essaiandvaluation-itb, xn--essaivaluation-fkb
-notBefore: 2018-05-14T17:52:33.590Z
-notAfter: 2022-08-21T08:12:14.116Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il81NDVl
-NmMxYS1mZmVjLTQ1OWEtOWE1My03YTdkOGY0NGZmODUiPjxzbWQ6aWQ+MDAwMDAwNjYxNTI2MzIw
-MzUzNTkwLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo1MjozMy41OTBaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0yMVQwODoxMjoxNC4xMTZaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
-cmVhdHlPclN0YXR1dGU+PG1hcms6aWQ+MDAwMTM4MTUwMzA2MTEzMDE1MDMwNjExMzAtMTwvbWFy
-azppZD48bWFyazptYXJrTmFtZT5Fc3NhaSAmYW1wOyDDqXZhbHVhdGlvbjwvbWFyazptYXJrTmFt
-ZT48bWFyazpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpuYW1lPkplYW4gTGVibGFu
-YzwvbWFyazpuYW1lPjxtYXJrOm9yZz5PcmFuaXNhdGlvbiBkZSB0ZXN0PC9tYXJrOm9yZz48bWFy
-azphZGRyPjxtYXJrOnN0cmVldD5SVUUgUk9HTkUgNDAgPC9tYXJrOnN0cmVldD48bWFyazpjaXR5
-PkFSVE9JUzwvbWFyazpjaXR5PjxtYXJrOnBjPjIxMzAxPC9tYXJrOnBjPjxtYXJrOmNjPkZSPC9t
-YXJrOmNjPjwvbWFyazphZGRyPjxtYXJrOnZvaWNlPiszMy4yNjQ5OTUwMzI8L21hcms6dm9pY2U+
-PG1hcms6ZmF4PiszMy4yNjQ5OTUwMzM8L21hcms6ZmF4PjxtYXJrOmVtYWlsPmluZm9AZXhhbXBs
-ZS5leGFtcGxlPC9tYXJrOmVtYWlsPjwvbWFyazpob2xkZXI+PG1hcms6cHJvdGVjdGlvbj48bWFy
-azpjYz5VUzwvbWFyazpjYz48bWFyazpydWxpbmc+RlI8L21hcms6cnVsaW5nPjwvbWFyazpwcm90
-ZWN0aW9uPjxtYXJrOmxhYmVsPnhuLS1lc3NhaS0tLXZhbHVhdGlvbi1pdGI8L21hcms6bGFiZWw+
-PG1hcms6bGFiZWw+eG4tLWVzc2FpLS12YWx1YXRpb24taHFiPC9tYXJrOmxhYmVsPjxtYXJrOmxh
-YmVsPnhuLS1lc3NhaS1hbmQtdmFsdWF0aW9uLWt6YjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54
-bi0tZXNzYWktYW5kdmFsdWF0aW9uLWp3YjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tZXNz
-YWktdmFsdWF0aW9uLWduYjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tZXNzYWlhbmQtdmFs
-dWF0aW9uLWp3YjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tZXNzYWlhbmR2YWx1YXRpb24t
-aXRiPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1lc3NhaXZhbHVhdGlvbi1ma2I8L21hcms6
-bGFiZWw+PG1hcms6Z29vZHNBbmRTZXJ2aWNlcz5ndWl0YXJlPC9tYXJrOmdvb2RzQW5kU2Vydmlj
-ZXM+PG1hcms6cmVmTnVtPkVzc2FpICZhbXA7IMOpdmFsdWF0aW9uPC9tYXJrOnJlZk51bT48bWFy
-azpwcm9EYXRlPjIwMDAtMDEtMDFUMDA6MDA6MDAuMDAwWjwvbWFyazpwcm9EYXRlPjxtYXJrOnRp
-dGxlPjEyMzQ8L21hcms6dGl0bGU+PG1hcms6ZXhlY0RhdGU+MjAxMy0wMi0wMlQwMDowMDowMC4w
-MDBaPC9tYXJrOmV4ZWNEYXRlPjwvbWFyazp0cmVhdHlPclN0YXR1dGU+PC9tYXJrOm1hcms+PGRz
-OlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyIg
-SWQ9Il8xYjIzMGIwNy1hYzBhLTQ4MTEtYmU2Mi1mNjczYjY1MzM4MDUiPjxkczpTaWduZWRJbmZv
-PjxkczpDYW5vbmljYWxpemF0aW9uTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcv
-MjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PGRzOlNpZ25hdHVyZU1ldGhvZCBBbGdvcml0aG09Imh0
-dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZHNpZy1tb3JlI3JzYS1zaGEyNTYiLz48ZHM6UmVm
-ZXJlbmNlIFVSST0iI181NDVlNmMxYS1mZmVjLTQ1OWEtOWE1My03YTdkOGY0NGZmODUiPjxkczpU
-cmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAw
-LzA5L3htbGRzaWcjZW52ZWxvcGVkLXNpZ25hdHVyZSIvPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGht
-PSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9y
-bXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQv
-eG1sZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1ZT5QdUE2bEhmMEtRUGxTbDFJSWFuNmF3ZUJ4
-emMvRUFVUlRBcTIxN09KZVZVPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PGRzOlJl
-ZmVyZW5jZSBVUkk9IiNfZjc2YzUwMmYtNjUzMS00MTIwLTg0MWMtOWQ4MmNmY2IxYTFkIj48ZHM6
-VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAw
-MS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxn
-b3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGln
-ZXN0VmFsdWU+NGRZTmhjK21wR25BelV0MlZZbVExa0NTOG9vSklxdldkc2ljNnVZdm1nQT08L2Rz
-OkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNlPjwvZHM6U2lnbmVkSW5mbz48ZHM6U2lnbmF0dXJl
-VmFsdWUgSWQ9Il80ZDVlNGU5MC01NTcxLTQ0ODQtODE5NS0wMTZjNTcyNzdlZmMiPnNzMEJUQlpG
-NnFYQVFXbFE3cEplS1VHaTdiNko2R1NTMlhRa3JpYVdqVkxBcGxzQ1F2ZFpJTnh1cmhibExMdDBD
-K2dnWlduS0h5SUQKd1V5blVqSktVbU5pL2xCaDVvWkVKY3hRdTBFZjJnWnkxeXJUeHVyeGtMRURX
-VmdLVTB6THRPa3U3SFNReU92ZUpEMXZqc1pvWmluWgpua2FjUiswdHk0NDhSRjFDYVNoZEUxQTZS
-VGZVZThXZm5CeGtEMEkyWW1URmtlZW84MFFFOXgrSXJBdCs4RUU1TW5MMXFEZ2xoOFhPCnl3OU5x
-NjEzZ2V4TEdUbnU3WTIxR1k3TThnZUlSd2grY0E4azFFUkhUek4rNHdEcyt0bWlCeWlsN2N2Q1VR
-Z040UjVZU1pXVFVyblQKR1RBMnBHUzBrbzJMaEdpU3BoZjFoNzZ5M2p0MGZZY2VWUms3ZGc9PTwv
-ZHM6U2lnbmF0dXJlVmFsdWU+PGRzOktleUluZm8gSWQ9Il9mNzZjNTAyZi02NTMxLTQxMjAtODQx
-Yy05ZDgyY2ZjYjFhMWQiPjxkczpYNTA5RGF0YT48ZHM6WDUwOUNlcnRpZmljYXRlPk1JSUZPekND
-QkNPZ0F3SUJBZ0lnTHJBYmV2b2FlNTJ5M2Y2QzJ0QjBTbjNwN1hKbTBUMDJGb2d4S0NmTmhaY3dE
-UVlKS29aSWh2Y04KQVFFTEJRQXdmREVMTUFrR0ExVUVCaE1DVlZNeFBEQTZCZ05WQkFvVE0wbHVk
-R1Z5Ym1WMElFTnZjbkJ2Y21GMGFXOXVJR1p2Y2lCQgpjM05wWjI1bFpDQk9ZVzFsY3lCaGJtUWdU
-blZ0WW1WeWN6RXZNQzBHQTFVRUF4TW1TVU5CVGs0Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5CmFXNW5h
-RzkxYzJVZ1VHbHNiM1FnUTBFd0hoY05NVGd3TWpJNE1EQXdNREF3V2hjTk1qTXdNekF4TWpNMU9U
-VTVXakNCanpFTE1Ba0cKQTFVRUJoTUNRa1V4SURBZUJnTlZCQWdURjBKeWRYTnpaV3h6TFVOaGNH
-bDBZV3dnVW1WbmFXOXVNUkV3RHdZRFZRUUhFd2hDY25WegpjMlZzY3pFUk1BOEdBMVVFQ2hNSVJH
-VnNiMmwwZEdVeE9EQTJCZ05WQkFNVEwwbERRVTVPSUZSTlEwZ2dRWFYwYUc5eWFYcGxaQ0JVCmNt
-RmtaVzFoY21zZ1VHbHNiM1FnVm1Gc2FXUmhkRzl5TUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFP
-Q0FROEFNSUlCQ2dLQ0FRRUEKeGxwM0twWUhYM1d5QXNGaFNrM0x3V2ZuR2x4blVERnFGWkEzVW91
-TVlqL1hpZ2JNa05lRVhJamxrUk9LVDRPUEdmUngvTEF5UmxRUQpqQ012NHFoYmtjWDFwN2FyNjNm
-bHE0U1pOVmNsMTVsN2gwdVQ1OEZ6U2ZubHowdTVya0hmSkltRDQzK21hUC84Z3YzNkZSMjdqVzhS
-Cjl3WTRoaytXczRJQjBpRlNkOFNYdjFLcjh3L0ptTVFTRGtpdUcrUmZJaXVid1EvZnk3RWtqNVFX
-aFBadyttTXhOS25IVUx5M3hZejIKTHdWZmZ0andVdWVhY3ZxTlJDa01YbENsT0FEcWZUOG9TWm9l
-RFhlaEh2bFBzTENlbUdCb1RLdXJza0lTNjlGMHlQRUg1Z3plMEgrZgo4RlJPc0lvS1NzVlEzNEI0
-Uy9qb0U2N25wc0pQVGRLc05QSlR5UUlEQVFBQm80SUJrekNDQVk4d0RBWURWUjBUQVFIL0JBSXdB
-REFkCkJnTlZIUTRFRmdRVW9GcFk3NnA1eW9ORFJHdFFwelZ1UjgxVVdRMHdnY1lHQTFVZEl3U0J2
-akNCdTRBVXc2MCtwdFlSQUVXQVhEcFgKU29wdDNERU5ubkdoZ1lDa2ZqQjhNUXN3Q1FZRFZRUUdF
-d0pWVXpFOE1Eb0dBMVVFQ2hNelNXNTBaWEp1WlhRZ1EyOXljRzl5WVhScApiMjRnWm05eUlFRnpj
-MmxuYm1Wa0lFNWhiV1Z6SUdGdVpDQk9kVzFpWlhKek1TOHdMUVlEVlFRREV5WkpRMEZPVGlCVWNt
-RmtaVzFoCmNtc2dRMnhsWVhKcGJtZG9iM1Z6WlNCUWFXeHZkQ0JEUVlJZ0xyQWJldm9hZTUyeTNm
-NkMydEIwU24zcDdYSm0wVDAyRm9neEtDZk4KaFhrd0RnWURWUjBQQVFIL0JBUURBZ2VBTURRR0Ex
-VWRId1F0TUNzd0thQW5vQ1dHSTJoMGRIQTZMeTlqY213dWFXTmhibTR1YjNKbgpMM1J0WTJoZmNH
-bHNiM1F1WTNKc01GRUdBMVVkSUFSS01FZ3dFQVlPS3dZQkJBR0N5UnNCQllNN0RBb3dOQVlJS3dZ
-QkJRVUhBZ0V3CktEQW1CZ2dyQmdFRkJRY0NBUllhYUhSMGNITTZMeTlqWVM1cFkyRnViaTV2Y21j
-dmNHbHNiM1F3RFFZSktvWklodmNOQVFFTEJRQUQKZ2dFQkFBdWpaMkljUjJEVnJ0YVJyQTU5ZU5Z
-Q2w0eGNzSk11OERRQ0h2MjhmVGZpL0JpWlk0SXI3RjlrRnk5NkQ3T1o4b0xZNXpqZgo0ZEh4RndI
-UHFIOERoNkpXc3pYdUhXMVphM1htbDBQYUh4Q1dSUzBYb2w4V3NISHBOeWdqTUJZZkowb2RWTTg4
-NVRaMUVsOVNpdUVICm55bkZCZ1NtaUZjOTl1UWQvWURSWnVHdi9BMEh5djd5Ujl0a0xFZEQzQTF1
-TkpCVzRQK0hKR3BkS2tZTDFRNXJVNytvSFZQdE1LS0kKM2lGa1VFc2JPNDVBVmQ3dlAvai83SnRB
-WlBiNmtvT1Y1bFppMkgxUkxjY0d3emRlem5oSmdkME45b2JiMHZuRTQxL1VTV2FmZFdSWgpWR2t3
-UHVxVGhsN3NDdHpySkg4WFkweGN1bStjZkx4MkVBSXdVbk9jYWI0PTwvZHM6WDUwOUNlcnRpZmlj
-YXRlPjwvZHM6WDUwOURhdGE+PC9kczpLZXlJbmZvPjwvZHM6U2lnbmF0dXJlPjwvc21kOnNpZ25l
-ZE1hcms+
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/active/TreatyStatute-Holder-Russian-Active.smd b/core/src/test/resources/google/registry/tmch/active/TreatyStatute-Holder-Russian-Active.smd
deleted file mode 100644
index 35ddc116b..000000000
--- a/core/src/test/resources/google/registry/tmch/active/TreatyStatute-Holder-Russian-Active.smd
+++ /dev/null
@@ -1,102 +0,0 @@
-Marks: Ошибки & доказательство
-smdID: 000000691526320359441-65535
-U-labels: xn------8cdabmnlsebzft8aih9crd8iye, xn-----8kcabklkqebxes6ahh6cqd3ite, xn---and--8veabqrnweb3ahv2bkh5dtd8j4e, xn---and-83dabopmueb1agu0bjh2dsd3jze, xn----8sbabijjoebvdr4agh3cpd8h9d, xn--and--83dabopmueb1agu0bjh2dsd3jze, xn--and-8cdabmnlsebzft8aih9crd8iye, xn--80aabghimebtcq2afh0cod3h7d
-notBefore: 2018-05-14T17:52:39.441Z
-notAfter: 2022-08-21T08:12:08.921Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il8xNWJl
-YTQ2My05NWYxLTQ4NTMtOTJiMC00OWFlYzUyMjdmMzUiPjxzbWQ6aWQ+MDAwMDAwNjkxNTI2MzIw
-MzU5NDQxLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo1MjozOS40NDFaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0yMVQwODoxMjowOC45MjFaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
-cmVhdHlPclN0YXR1dGU+PG1hcms6aWQ+MDAwMTQwMTUwMzA2MzkwMjE1MDMwNjM5MDItMTwvbWFy
-azppZD48bWFyazptYXJrTmFtZT7QntGI0LjQsdC60LggJmFtcDsg0LTQvtC60LDQt9Cw0YLQtdC7
-0YzRgdGC0LLQvjwvbWFyazptYXJrTmFtZT48bWFyazpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVy
-Ij48bWFyazpuYW1lPtCd0LDRgtCw0LvRjNGPINCQ0L3RgtC+0L3QvtCy0LA8L21hcms6bmFtZT48
-bWFyazpvcmc+0JDQvdGC0L7QvdC+0LLQsDwvbWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpzdHJl
-ZXQ+0J/RgNC+0YHQv9C10LrRgiDQktC10YDQvdCw0LTRgdC60L7Qs9C+IDE1PC9tYXJrOnN0cmVl
-dD48bWFyazpjaXR5PtCc0L7RgdC60LLQsDwvbWFyazpjaXR5PjxtYXJrOnBjPjExNzQ4NTwvbWFy
-azpwYz48bWFyazpjYz5SVTwvbWFyazpjYz48L21hcms6YWRkcj48bWFyazp2b2ljZT4rNy45MTg4
-MjIxNjc0PC9tYXJrOnZvaWNlPjxtYXJrOmVtYWlsPmluZm9AZXhhbXBsZS5leGFtcGxlPC9tYXJr
-OmVtYWlsPjwvbWFyazpob2xkZXI+PG1hcms6cHJvdGVjdGlvbj48bWFyazpjYz5VUzwvbWFyazpj
-Yz48bWFyazpydWxpbmc+UlU8L21hcms6cnVsaW5nPjwvbWFyazpwcm90ZWN0aW9uPjxtYXJrOmxh
-YmVsPnhuLS0tLS0tOGNkYWJtbmxzZWJ6ZnQ4YWloOWNyZDhpeWU8L21hcms6bGFiZWw+PG1hcms6
-bGFiZWw+eG4tLS0tLThrY2Fia2xrcWVieGVzNmFoaDZjcWQzaXRlPC9tYXJrOmxhYmVsPjxtYXJr
-OmxhYmVsPnhuLS0tYW5kLS04dmVhYnFybndlYjNhaHYyYmtoNWR0ZDhqNGU8L21hcms6bGFiZWw+
-PG1hcms6bGFiZWw+eG4tLS1hbmQtODNkYWJvcG11ZWIxYWd1MGJqaDJkc2QzanplPC9tYXJrOmxh
-YmVsPjxtYXJrOmxhYmVsPnhuLS0tLThzYmFiaWpqb2VidmRyNGFnaDNjcGQ4aDlkPC9tYXJrOmxh
-YmVsPjxtYXJrOmxhYmVsPnhuLS1hbmQtLTgzZGFib3BtdWViMWFndTBiamgyZHNkM2p6ZTwvbWFy
-azpsYWJlbD48bWFyazpsYWJlbD54bi0tYW5kLThjZGFibW5sc2ViemZ0OGFpaDljcmQ4aXllPC9t
-YXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS04MGFhYmdoaW1lYnRjcTJhZmgwY29kM2g3ZDwvbWFy
-azpsYWJlbD48bWFyazpnb29kc0FuZFNlcnZpY2VzPtCz0LjRgtCw0YDQsDwvbWFyazpnb29kc0Fu
-ZFNlcnZpY2VzPjxtYXJrOnJlZk51bT4xMjM0PC9tYXJrOnJlZk51bT48bWFyazpwcm9EYXRlPjIw
-MDAtMDEtMDFUMDA6MDA6MDAuMDAwWjwvbWFyazpwcm9EYXRlPjxtYXJrOnRpdGxlPlRlc3QgVHJl
-YXR5PC9tYXJrOnRpdGxlPjxtYXJrOmV4ZWNEYXRlPjIwMTMtMDItMDJUMDA6MDA6MDAuMDAwWjwv
-bWFyazpleGVjRGF0ZT48L21hcms6dHJlYXR5T3JTdGF0dXRlPjwvbWFyazptYXJrPjxkczpTaWdu
-YXR1cmUgeG1sbnM6ZHM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1sZHNpZyMiIElkPSJf
-NmQzZjNkOWMtZDI3OS00OTYzLWFjNDEtMGFkMDBhZDM3MTM4Ij48ZHM6U2lnbmVkSW5mbz48ZHM6
-Q2Fub25pY2FsaXphdGlvbk1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEv
-MTAveG1sLWV4Yy1jMTRuIyIvPjxkczpTaWduYXR1cmVNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8v
-d3d3LnczLm9yZy8yMDAxLzA0L3htbGRzaWctbW9yZSNyc2Etc2hhMjU2Ii8+PGRzOlJlZmVyZW5j
-ZSBVUkk9IiNfMTViZWE0NjMtOTVmMS00ODUzLTkyYjAtNDlhZWM1MjI3ZjM1Ij48ZHM6VHJhbnNm
-b3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94
-bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0
-cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxk
-czpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVu
-YyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+V0svV2V6MGlsT1JTYXgxNGROWDJ0dVVNMnBKZy9s
-dEdUaWIvNTFmTnpVYz08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNlPjxkczpSZWZlcmVu
-Y2UgVVJJPSIjX2E2NjFhZTBlLWZjNTgtNDI4Ni1iMTE5LTYxOTVlMDQwMDJlZCI+PGRzOlRyYW5z
-Zm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAv
-eG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRo
-bT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxlbmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZh
-bHVlPmI4QkdpMzAySlZmSEFpTEtScXNpUDRWT2c2dE1oSm1aVklWVTArRUJ5Qk09PC9kczpEaWdl
-c3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48L2RzOlNpZ25lZEluZm8+PGRzOlNpZ25hdHVyZVZhbHVl
-IElkPSJfZjhjNjhlMzQtMDIzMC00MWY1LTlkNjItNWQ2Yzg3Y2M4YmY1Ij5ESG8rN2xDUmNucU5P
-Y1RMYkl5ZkRpNVhXakl1NGZiRzhJZ0I2M2VTNlZIZjBJU3V1OVhabml5VGhqN1pnQVpvMlJudFM1
-VUFOcFZjCklqR2d3S3l4S1VnQ2YvY0NRK3crTmxtMW9vcW5JSitEa21OdTBzK25GUUpBNkpyeUhs
-MmdBY1NSUGUydyt3S2xqR2Y2RFRGbkpXU2UKbm00Y0dLbjdkWGpPZVNiYzl0Q0lUblQ0czBYN29n
-aEZ0RzdoM0ZXZk4wRGdqTmhIT3U5b0wwU1VHMC9CTmJHTlZiVUZYZHFYNGxiRwp3blI1Ymo3WWZr
-VitybEdsQ3BuWGhYeVExSTNSclRsaWhJQzNsL0FjdkZnNXFHVnhQcXo5SWl0ZFhTSUFCL2ZqWnV3
-U1dLUWwrRTR6CmJacTI4aERqQ09EL1hhbnNrWFVtV21jazZDejhacGFuckU5Q1RRPT08L2RzOlNp
-Z25hdHVyZVZhbHVlPjxkczpLZXlJbmZvIElkPSJfYTY2MWFlMGUtZmM1OC00Mjg2LWIxMTktNjE5
-NWUwNDAwMmVkIj48ZHM6WDUwOURhdGE+PGRzOlg1MDlDZXJ0aWZpY2F0ZT5NSUlGT3pDQ0JDT2dB
-d0lCQWdJZ0xyQWJldm9hZTUyeTNmNkMydEIwU24zcDdYSm0wVDAyRm9neEtDZk5oWmN3RFFZSktv
-WklodmNOCkFRRUxCUUF3ZkRFTE1Ba0dBMVVFQmhNQ1ZWTXhQREE2QmdOVkJBb1RNMGx1ZEdWeWJt
-VjBJRU52Y25CdmNtRjBhVzl1SUdadmNpQkIKYzNOcFoyNWxaQ0JPWVcxbGN5QmhibVFnVG5WdFlt
-VnljekV2TUMwR0ExVUVBeE1tU1VOQlRrNGdWSEpoWkdWdFlYSnJJRU5zWldGeQphVzVuYUc5MWMy
-VWdVR2xzYjNRZ1EwRXdIaGNOTVRnd01qSTRNREF3TURBd1doY05Nak13TXpBeE1qTTFPVFU1V2pD
-Qmp6RUxNQWtHCkExVUVCaE1DUWtVeElEQWVCZ05WQkFnVEYwSnlkWE56Wld4ekxVTmhjR2wwWVd3
-Z1VtVm5hVzl1TVJFd0R3WURWUVFIRXdoQ2NuVnoKYzJWc2N6RVJNQThHQTFVRUNoTUlSR1ZzYjJs
-MGRHVXhPREEyQmdOVkJBTVRMMGxEUVU1T0lGUk5RMGdnUVhWMGFHOXlhWHBsWkNCVQpjbUZrWlcx
-aGNtc2dVR2xzYjNRZ1ZtRnNhV1JoZEc5eU1JSUJJakFOQmdrcWhraUc5dzBCQVFFRkFBT0NBUThB
-TUlJQkNnS0NBUUVBCnhscDNLcFlIWDNXeUFzRmhTazNMd1dmbkdseG5VREZxRlpBM1VvdU1Zai9Y
-aWdiTWtOZUVYSWpsa1JPS1Q0T1BHZlJ4L0xBeVJsUVEKakNNdjRxaGJrY1gxcDdhcjYzZmxxNFNa
-TlZjbDE1bDdoMHVUNThGelNmbmx6MHU1cmtIZkpJbUQ0MyttYVAvOGd2MzZGUjI3alc4Ugo5d1k0
-aGsrV3M0SUIwaUZTZDhTWHYxS3I4dy9KbU1RU0RraXVHK1JmSWl1YndRL2Z5N0VrajVRV2hQWncr
-bU14TktuSFVMeTN4WXoyCkx3VmZmdGp3VXVlYWN2cU5SQ2tNWGxDbE9BRHFmVDhvU1pvZURYZWhI
-dmxQc0xDZW1HQm9US3Vyc2tJUzY5RjB5UEVINWd6ZTBIK2YKOEZST3NJb0tTc1ZRMzRCNFMvam9F
-NjducHNKUFRkS3NOUEpUeVFJREFRQUJvNElCa3pDQ0FZOHdEQVlEVlIwVEFRSC9CQUl3QURBZApC
-Z05WSFE0RUZnUVVvRnBZNzZwNXlvTkRSR3RRcHpWdVI4MVVXUTB3Z2NZR0ExVWRJd1NCdmpDQnU0
-QVV3NjArcHRZUkFFV0FYRHBYClNvcHQzREVObm5HaGdZQ2tmakI4TVFzd0NRWURWUVFHRXdKVlV6
-RThNRG9HQTFVRUNoTXpTVzUwWlhKdVpYUWdRMjl5Y0c5eVlYUnAKYjI0Z1ptOXlJRUZ6YzJsbmJt
-VmtJRTVoYldWeklHRnVaQ0JPZFcxaVpYSnpNUzh3TFFZRFZRUURFeVpKUTBGT1RpQlVjbUZrWlcx
-aApjbXNnUTJ4bFlYSnBibWRvYjNWelpTQlFhV3h2ZENCRFFZSWdMckFiZXZvYWU1MnkzZjZDMnRC
-MFNuM3A3WEptMFQwMkZvZ3hLQ2ZOCmhYa3dEZ1lEVlIwUEFRSC9CQVFEQWdlQU1EUUdBMVVkSHdR
-dE1Dc3dLYUFub0NXR0kyaDBkSEE2THk5amNtd3VhV05oYm00dWIzSm4KTDNSdFkyaGZjR2xzYjNR
-dVkzSnNNRkVHQTFVZElBUktNRWd3RUFZT0t3WUJCQUdDeVJzQkJZTTdEQW93TkFZSUt3WUJCUVVI
-QWdFdwpLREFtQmdnckJnRUZCUWNDQVJZYWFIUjBjSE02THk5allTNXBZMkZ1Ymk1dmNtY3ZjR2xz
-YjNRd0RRWUpLb1pJaHZjTkFRRUxCUUFECmdnRUJBQXVqWjJJY1IyRFZydGFSckE1OWVOWUNsNHhj
-c0pNdThEUUNIdjI4ZlRmaS9CaVpZNElyN0Y5a0Z5OTZEN09aOG9MWTV6amYKNGRIeEZ3SFBxSDhE
-aDZKV3N6WHVIVzFaYTNYbWwwUGFIeENXUlMwWG9sOFdzSEhwTnlnak1CWWZKMG9kVk04ODVUWjFF
-bDlTaXVFSApueW5GQmdTbWlGYzk5dVFkL1lEUlp1R3YvQTBIeXY3eVI5dGtMRWREM0ExdU5KQlc0
-UCtISkdwZEtrWUwxUTVyVTcrb0hWUHRNS0tJCjNpRmtVRXNiTzQ1QVZkN3ZQL2ovN0p0QVpQYjZr
-b09WNWxaaTJIMVJMY2NHd3pkZXpuaEpnZDBOOW9iYjB2bkU0MS9VU1dhZmRXUloKVkdrd1B1cVRo
-bDdzQ3R6ckpIOFhZMHhjdW0rY2ZMeDJFQUl3VW5PY2FiND08L2RzOlg1MDlDZXJ0aWZpY2F0ZT48
-L2RzOlg1MDlEYXRhPjwvZHM6S2V5SW5mbz48L2RzOlNpZ25hdHVyZT48L3NtZDpzaWduZWRNYXJr
-Pg==
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/active/smd-active-21aug20-en.smd b/core/src/test/resources/google/registry/tmch/active/smd-active-21aug20-en.smd
deleted file mode 100644
index 39fa1a7a6..000000000
--- a/core/src/test/resources/google/registry/tmch/active/smd-active-21aug20-en.smd
+++ /dev/null
@@ -1,102 +0,0 @@
-Marks: Test & Validate
-smdID: 000000851598037875889-65535
-U-labels: test---validate, test--validate, test-and-validate, test-andvalidate, test-validate, testand-validate, testandvalidate, testvalidate
-notBefore: 2020-08-21T19:24:35.889Z
-notAfter: 2023-08-18T14:57:36.681Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48c21kOnNpZ25lZE1hcmsgeG1s
-bnM6c21kPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOnNpZ25lZE1hcmstMS4wIiBpZD0iX2UwMGE3
-N2EyLTdjYWItNGNiOS1iYmJjLTg2MmYxZjQ4ODlmMSI+PHNtZDppZD4wMDAwMDA4NTE1OTgwMzc4
-NzU4ODktNjU1MzU8L3NtZDppZD48c21kOmlzc3VlckluZm8gaXNzdWVySUQ9IjY1NTM1Ij48c21k
-Om9yZz5JQ0FOTiBUTUNIIFRFU1RJTkcgVE1WPC9zbWQ6b3JnPjxzbWQ6ZW1haWw+bm90YXZhaWxh
-YmxlQGV4YW1wbGUuY29tPC9zbWQ6ZW1haWw+PHNtZDp1cmw+d3d3LmV4YW1wbGUuY29tPC9zbWQ6
-dXJsPjxzbWQ6dm9pY2UgeD0iIj4rMzIuMjAwMDAwMDA8L3NtZDp2b2ljZT48L3NtZDppc3N1ZXJJ
-bmZvPjxzbWQ6bm90QmVmb3JlPjIwMjAtMDgtMjFUMTk6MjQ6MzUuODg5Wjwvc21kOm5vdEJlZm9y
-ZT48c21kOm5vdEFmdGVyPjIwMjMtMDgtMThUMTQ6NTc6MzYuNjgxWjwvc21kOm5vdEFmdGVyPjxt
-YXJrOm1hcmsgeG1sbnM6bWFyaz0idXJuOmlldGY6cGFyYW1zOnhtbDpuczptYXJrLTEuMCI+PG1h
-cms6Y291cnQ+PG1hcms6aWQ+MDAwMTM3MTUwMzA2Nzg2ODE1MDMwNjc4NjgtMTwvbWFyazppZD48
-bWFyazptYXJrTmFtZT5UZXN0ICZhbXA7IFZhbGlkYXRlPC9tYXJrOm1hcmtOYW1lPjxtYXJrOmhv
-bGRlciBlbnRpdGxlbWVudD0ib3duZXIiPjxtYXJrOm5hbWU+VG9ueSBIb2xsYW5kPC9tYXJrOm5h
-bWU+PG1hcms6b3JnPkFnIGNvcnBvcmF0aW9uPC9tYXJrOm9yZz48bWFyazphZGRyPjxtYXJrOnN0
-cmVldD4xMzA1IEJyaWdodCBBdmVudWU8L21hcms6c3RyZWV0PjxtYXJrOnN0cmVldC8+PG1hcms6
-c3RyZWV0Lz48bWFyazpjaXR5PkFyY2FkaWE8L21hcms6Y2l0eT48bWFyazpzcC8+PG1hcms6cGM+
-OTAwMjg8L21hcms6cGM+PG1hcms6Y2M+VVM8L21hcms6Y2M+PC9tYXJrOmFkZHI+PC9tYXJrOmhv
-bGRlcj48bWFyazpjb250YWN0IHR5cGU9ImFnZW50Ij48bWFyazpuYW1lPlRvbnkgSG9sbGFuZDwv
-bWFyazpuYW1lPjxtYXJrOm9yZz5BZyBjb3Jwb3JhdGlvbjwvbWFyazpvcmc+PG1hcms6YWRkcj48
-bWFyazpzdHJlZXQ+QnJpZ2h0IEF2ZW51ZSAxMzA1IDwvbWFyazpzdHJlZXQ+PG1hcms6Y2l0eT5B
-cmNhZGlhPC9tYXJrOmNpdHk+PG1hcms6c3A+Q0E8L21hcms6c3A+PG1hcms6cGM+OTAwMjg8L21h
-cms6cGM+PG1hcms6Y2M+VVM8L21hcms6Y2M+PC9tYXJrOmFkZHI+PG1hcms6dm9pY2U+KzEuMjAy
-NTU2MjMwMjwvbWFyazp2b2ljZT48bWFyazpmYXg+KzEuMjAyNTU2MjMwMTwvbWFyazpmYXg+PG1h
-cms6ZW1haWw+aW5mb0BhZ2NvcnBvcmF0aW9uLmNvbTwvbWFyazplbWFpbD48L21hcms6Y29udGFj
-dD48bWFyazpsYWJlbD50ZXN0LS0tdmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+dGVz
-dC0tdmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+dGVzdC1hbmQtdmFsaWRhdGU8L21h
-cms6bGFiZWw+PG1hcms6bGFiZWw+dGVzdC1hbmR2YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazps
-YWJlbD50ZXN0LXZhbGlkYXRlPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnRlc3RhbmQtdmFsaWRh
-dGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+dGVzdGFuZHZhbGlkYXRlPC9tYXJrOmxhYmVsPjxt
-YXJrOmxhYmVsPnRlc3R2YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazpnb29kc0FuZFNlcnZpY2Vz
-Pmd1aXRhcjwvbWFyazpnb29kc0FuZFNlcnZpY2VzPjxtYXJrOnJlZk51bT4xMjM0PC9tYXJrOnJl
-Zk51bT48bWFyazpwcm9EYXRlPjIwMTMtMDEtMDFUMDA6MDA6MDAuMDAwWjwvbWFyazpwcm9EYXRl
-PjxtYXJrOmNjPlVTPC9tYXJrOmNjPjxtYXJrOmNvdXJ0TmFtZT5Ib3ZlPC9tYXJrOmNvdXJ0TmFt
-ZT48L21hcms6Y291cnQ+PC9tYXJrOm1hcms+PGRzOlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0cDov
-L3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyIgSWQ9Il9mZDVlNDkwNC00NjE3LTRhYWItYTZk
-ZS1kNzJmZjllZTBlMTEiPjxkczpTaWduZWRJbmZvPjxkczpDYW5vbmljYWxpemF0aW9uTWV0aG9k
-IEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PGRz
-OlNpZ25hdHVyZU1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1s
-ZHNpZy1tb3JlI3JzYS1zaGEyNTYiLz48ZHM6UmVmZXJlbmNlIFVSST0iI19lMDBhNzdhMi03Y2Fi
-LTRjYjktYmJiYy04NjJmMWY0ODg5ZjEiPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxn
-b3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjZW52ZWxvcGVkLXNpZ25h
-dHVyZSIvPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEw
-L3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0
-aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RW
-YWx1ZT5HeFhDcFpJTlQ3KzNJUmszQjBjYlZTTFBsaFVTUkV0MFppYlcyQWVMSDlBPTwvZHM6RGln
-ZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PGRzOlJlZmVyZW5jZSBVUkk9IiNfOTZmM2EyMzUtMDc2
-Ny00OTk5LWEwZDQtODM2ZDkxY2MxZjg0Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFs
-Z29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpU
-cmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8y
-MDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+Y2pXUTVtdlRPMzVlK3czczIr
-R1B0S1NIQzIxczc4Q1VwWWlCODVqOUdwbz08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNl
-PjwvZHM6U2lnbmVkSW5mbz48ZHM6U2lnbmF0dXJlVmFsdWUgSWQ9Il8zNGVkZDBlZS03MzBkLTQz
-YTQtYTNiZC0wNzA2ZGRmZWNkMDIiPjBaT2p0eDZWd1NnNlRhYXBTeWpiSitHdk5DSyszWElOWnUy
-MVlmWmNHYmZ5WmI2cGk3NCtqYkdaaFY4NzlSdlFPU1hoUmpNTWVHUHMKNDY0dU81WDROL1ZMUith
-dlZxWnFTSUxBTk4zSkFKVHlnSHoyUFV0T3VzYm5xdWtRZVI1dGdEckJWT0VPMElWZVpWb1A2UGJM
-ekVBZwpzQ1d4THowbXFQeUM1ZXVqZ284SGJlTmJoYXRFL00zNFV6WHJKSVM2YTNma1NTQWdjbnp4
-OG1Wd2VhUVlxQXF4Vit0ck9mWHYxYWxqCnBRTlFEWElFQnZ4U2NsMmhic01oZ1dLZmxITmJQVHZL
-a0lSQ3JBN3hFVVFyTjlFdDZKdkdKMU1BeW50eEpnLzl0ZjZKcEU1aDJCdHcKdEJNaDRRY2ZmN21G
-aUhCQ2RSeEg3d2tIa1ZSTmE2WXFCeE9XQ0E9PTwvZHM6U2lnbmF0dXJlVmFsdWU+PGRzOktleUlu
-Zm8gSWQ9Il85NmYzYTIzNS0wNzY3LTQ5OTktYTBkNC04MzZkOTFjYzFmODQiPjxkczpYNTA5RGF0
-YT48ZHM6WDUwOUNlcnRpZmljYXRlPk1JSUZYRENDQkVTZ0F3SUJBZ0lJZml1bERhR082NWd3RFFZ
-SktvWklodmNOQVFFTEJRQXdmREVMTUFrR0ExVUVCaE1DVlZNeFBEQTYKQmdOVkJBb1RNMGx1ZEdW
-eWJtVjBJRU52Y25CdmNtRjBhVzl1SUdadmNpQkJjM05wWjI1bFpDQk9ZVzFsY3lCaGJtUWdUblZ0
-WW1WeQpjekV2TUMwR0ExVUVBeE1tU1VOQlRrNGdWSEpoWkdWdFlYSnJJRU5zWldGeWFXNW5hRzkx
-YzJVZ1VHbHNiM1FnUTBFd0hoY05NakF3Ck9ERXpNREF3TURBd1doY05Nak13TXpNeE1qTTFPVFU1
-V2pDQnlERUxNQWtHQTFVRUJoTUNRa1V4RVRBUEJnTlZCQWdUQ0VKeWRYTnoKWld4ek1SSXdFQVlE
-VlFRSEV3bFdhV3gyYjI5eVpHVXhNVEF2QmdOVkJBb01LRVJsYkc5cGRIUmxJRU52Ym5OMWJIUnBi
-bWNnSmlCQgpaSFpwYzI5eWVTQkRWa0pCTDFORFVrd3hPREEyQmdOVkJBTVRMMGxEUVU1T0lGUk5R
-MGdnUVhWMGFHOXlhWHBsWkNCVWNtRmtaVzFoCmNtc2dVR2xzYjNRZ1ZtRnNhV1JoZEc5eU1TVXdJ
-d1lKS29aSWh2Y05BUWtCRmhaaVpYUnRZMmh6YldSQVpHVnNiMmwwZEdVdVkyOXQKTUlJQklqQU5C
-Z2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUEwNU9XdnFONWJlTG8yL29jSjVOZXNH
-dzFqVTF6a3FRdgorME5rTEw4UWx4Wmg5Y015bmYvbmlHVHlTeU94MTk0QlNyb1B2a3drd0xqZTNG
-TmhtVitCc1pvN2J5dGpVOUZDU2dkMzhvUjRnaHRRCjVhV2t4VkxyWW51cTlUTWQzYVBwWEswMTJD
-Wnd1ZzRsc3VpVkk5Y0lTTkxoK3RoZzZJVWtmQnNVRlRiQ2tvbVdhcjV1UXFoR3JjMWQKazhjUE1o
-VUxpUm85bnFRRDM1NjYxcFdlWTk4Z0MrTGEwVkZVOXFDUmpXMzcwK3dZZ25VY2ZMQ3NTYWx5dVZE
-STlYUGlHRmtXRkd3TwpyUklQRTY2MjBjTThPRGF3RFFlQTlCcUNVa0ZpUE91RXFGU2VrNExPTU9L
-ZFlNNXRSRUd4bHI3anJBQWVDNTRTejFDRlNsUWdIbXlZCncvbUVOd0lEQVFBQm80SUJrekNDQVk4
-d0RBWURWUjBUQVFIL0JBSXdBREFkQmdOVkhRNEVGZ1FVTlZkWFQ0SGZNSWIrcWgyU0duV28KTGRK
-dFhsZ3dnY1lHQTFVZEl3U0J2akNCdTRBVXc2MCtwdFlSQUVXQVhEcFhTb3B0M0RFTm5uR2hnWUNr
-ZmpCOE1Rc3dDUVlEVlFRRwpFd0pWVXpFOE1Eb0dBMVVFQ2hNelNXNTBaWEp1WlhRZ1EyOXljRzl5
-WVhScGIyNGdabTl5SUVGemMybG5ibVZrSUU1aGJXVnpJR0Z1ClpDQk9kVzFpWlhKek1TOHdMUVlE
-VlFRREV5WkpRMEZPVGlCVWNtRmtaVzFoY21zZ1EyeGxZWEpwYm1kb2IzVnpaU0JRYVd4dmRDQkQK
-UVlJZ0xyQWJldm9hZTUyeTNmNkMydEIwU24zcDdYSm0wVDAyRm9neEtDZk5oWGt3RGdZRFZSMFBB
-UUgvQkFRREFnZUFNRFFHQTFVZApId1F0TUNzd0thQW5vQ1dHSTJoMGRIQTZMeTlqY213dWFXTmhi
-bTR1YjNKbkwzUnRZMmhmY0dsc2IzUXVZM0pzTUZFR0ExVWRJQVJLCk1FZ3dFQVlPS3dZQkJBR0N5
-UnNCQllNN0RBb3dOQVlJS3dZQkJRVUhBZ0V3S0RBbUJnZ3JCZ0VGQlFjQ0FSWWFhSFIwY0hNNkx5
-OWoKWVM1cFkyRnViaTV2Y21jdmNHbHNiM1F3RFFZSktvWklodmNOQVFFTEJRQURnZ0VCQUYzektx
-dTBrUXZwT3RzVXAxMVIzRHlXdHRtagp5T1VsSnkvVTc0Vms3Z2JUVlJqZG85bTJTT2wyOERrVmgz
-TlVRSVZSSjk2QWhlTWEvN3hUM0F1UjZRYlJUZkN3ekh5N282R1dIZkg4Cjh4UDNRU1NwZ2wzcUVV
-ekRzMG1hRFJNUzNiZEQ3VzlKdWJzYzB5NmZaNm5hVWRxbFFUMXVJSEgvWW5hWXV5azRJSFRRTFRa
-NFhlVFMKQjZVR3pha1h0UFFLblZ3dDFCa2FSN281SVFVbXVDSUp0KzZrYjVNVlhhRnNGZDFYbm1t
-RGg0dDVlSWRyYnJGZTlMdzBxbXR4M3FhdApZRXFqbTdOcEJnOXp1dUNMN3JDWGF1Y3VMVDZmVHZB
-VXhHaTdEdlhQTUE2K2x2dVc5WURBcVAvY3FEYTYvdnBNMStHRnB5VEhMT2UwClY0T01PTy90U25n
-PTwvZHM6WDUwOUNlcnRpZmljYXRlPjwvZHM6WDUwOURhdGE+PC9kczpLZXlJbmZvPjwvZHM6U2ln
-bmF0dXJlPjwvc21kOnNpZ25lZE1hcms+Cg==
------END ENCODED SMD-----
diff --git a/core/src/main/java/google/registry/tmch/icann-tmch-pilot.crl b/core/src/test/resources/google/registry/tmch/crypto/icann-tmch-pilot-old.crl
similarity index 100%
rename from core/src/main/java/google/registry/tmch/icann-tmch-pilot.crl
rename to core/src/test/resources/google/registry/tmch/crypto/icann-tmch-pilot-old.crl
diff --git a/core/src/test/resources/google/registry/tmch/crypto/icann-tmv-test-good.crt b/core/src/test/resources/google/registry/tmch/crypto/icann-tmv-test-good.crt
new file mode 100644
index 000000000..3e362e36e
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/crypto/icann-tmv-test-good.crt
@@ -0,0 +1,36 @@
+-----BEGIN CERTIFICATE-----
+MIIHXzCCBUegAwIBAgIUXqI/vd18Cag98oNpdzV7Biy/6EAwDQYJKoZIhvcNAQENBQAwfDELMAkG
+A1UEBhMCVVMxPDA6BgNVBAoMM0ludGVybmV0IENvcnBvcmF0aW9uIGZvciBBc3NpZ25lZCBOYW1l
+cyBhbmQgTnVtYmVyczEvMC0GA1UEAwwmSUNBTk4gVHJhZGVtYXJrIENsZWFyaW5naG91c2UgUGls
+b3QgQ0EwHhcNMjIxMTE2MTMyODU5WhcNMjcxMTE1MTMyODU5WjCB0DELMAkGA1UEBhMCQkUxETAP
+BgNVBAgTCEJydXNzZWxzMRIwEAYDVQQHEwlWaWx2b29yZGUxMzAxBgNVBAoTKkRlbG9pdHRlIENv
+bnN1bHRpbmcgYW5kIEFkdmlzb3J5IENWQkEvU0NSTDE+MDwGA1UEAxM1SUNBTk4gVE1DSCBBdXRo
+b3JpemVkIFRyYWRlbWFyayBQaWxvdCBWYWxpZGF0b3IgVmFsaWQxJTAjBgkqhkiG9w0BCQEWFmJl
+dG1jaHNtZEBkZWxvaXR0ZS5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC6FJwz
+KqQVX6fG3/ELRSGWV9GrKaFMKmhWIxepwRZN6MxMqkd5DnYfiT+Wp98jEkqgTx2UMb9qugcGNV6g
+35/CrQb/F/mz3C4sfLNuDpSqK9QF8+paTH6hQmrOpqV+UTvdj9SMgKGyFizS88CDWMx4w3i4FAKe
+6NRsJRGTAtKDuMHcA4sj08Gje3lPWcgFvcQNDVeEBTuOHBG+Rhj7V1JiNGP/4epTXTFXgPFDgez3
+YAfxqpbuO4TX6bbYdk2nvMLFvLENkCFYulnYPzgnEBGSMKIaAIlb+scHCvWgWj2TLgwh2GJNczVM
+1LPMqGS+Uki9Mh79822/xoar498xDx2Yx/8swgENLSgCsQAW8nMgwWn6AbYl2RABXurayFsn4P1R
+uQNmUp/qrRKRvSJr1OLkHZfFTcSYQaViuMYPXzGz8tmMLlmI/B6ACH4AwRMdnYvFO3KI1RBnPKId
+wwfUpZ5ITIpbA7CGgTx1qxtM1wIUr7pHeKP6jVe3kdDLg+/BZ2xMEtBk5a8Y7B4v3xwHXGTvV8mN
+0Ag/SyT/QUyERhXUyAN2+EwZ+SQCUyNfzioWQ878eGykU+46+BbgI3IIr36XKPwmzt0SZ+KI3tnF
+Tln9mX0KC0idoj5ykzPoC/MIed0sp4TigxEbWNx7EF80PvR/DDEwVPEEkkjy63XFulxiCQIDAQAB
+o4IBgjCCAX4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0OBBYEFHn9s0DEa2kv
+gE/eIOTsqoW85MXFMIG6BgNVHSMEgbIwga+AFEd7T656UZG10b+dNumGfzYWBKlFoYGApH4wfDEL
+MAkGA1UEBhMCVVMxPDA6BgNVBAoMM0ludGVybmV0IENvcnBvcmF0aW9uIGZvciBBc3NpZ25lZCBO
+YW1lcyBhbmQgTnVtYmVyczEvMC0GA1UEAwwmSUNBTk4gVHJhZGVtYXJrIENsZWFyaW5naG91c2Ug
+UGlsb3QgQ0GCFHpqbTFeJcPtUC9XuuPKPsLwDR+MMDQGA1UdHwQtMCswKaAnoCWGI2h0dHA6Ly9j
+cmwuaWNhbm4ub3JnL3RtY2hfcGlsb3QuY3JsMEwGA1UdIARFMEMwEAYOKwYBBAGCyRsBBYM7DAow
+LwYIKwYBBQUHAgEwIzAhBggrBgEFBQcCARYVaHR0cHM6Ly9jcHMuaWNhbm4ub3JnMA0GCSqGSIb3
+DQEBDQUAA4ICAQBdSat56uejLnAjFIF95djYWI6s//N6YXxsrrMkGBP8EezPyhLh6awP4z7Q9QAI
+QZkYoxrl/1y0+byV2qnTUUCLRpK/BDp/hcfwPfKCA/2RQCHJrb6+z0enDPFRK0NKmwOcdlGtUk0m
+PgWGSKtuwVsPAhTDJuhosZOhkNf+nSOOHrQOn1E2rzOrd/kQlqiCwRH9796NpTA+HSMfOobJEEPq
+tpF7P5qbwtl95Ua5Op4Aha70HHfUFS4BOQKLBVfMZdOR+iPoh5OwAK+htYkFCG9P2WHu7wf8EC+W
+7k96gvTd8xE7ouoabT2x6YfYqElPHiU/IM9gVzWWL/svYDySVuoFwBjDNN1cdq0qOYR1yuS1c/9D
+FR7eo7GFECy+TBd7IiKRfBVeYGOOPMnoFfxRLWrpsWNnwD7lkPkLCgFCk+8yEcORg625mo65z4y6
+J4K8foda7qwmXNP3RS18on6BHt8lQ+bXgOHmxIHk0aO0qNDqgvLr2FlyLGJGiEMRqDMMR6/a06bt
+knUMHl7CqMfjIkjP4VNNyGPdJgwVk2keb9uNFvJCxT+M2fGXQ1NbJNftv5MgSsp9N1y+x6gA3Ehw
+yHlmJB4YMto8tTV1i84xPXxi2CAeDaGDuwost8YUCSjq7RCK8tGcaAYrkXQY2yQfX3cwDsExRqVW
+yrjyRt+N6mK99Q==
+-----END CERTIFICATE-----
diff --git a/core/src/test/resources/google/registry/tmch/crypto/icann-tmv-test-revoked.crt b/core/src/test/resources/google/registry/tmch/crypto/icann-tmv-test-revoked.crt
new file mode 100644
index 000000000..d7952f838
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/crypto/icann-tmv-test-revoked.crt
@@ -0,0 +1,36 @@
+-----BEGIN CERTIFICATE-----
+MIIHYTCCBUmgAwIBAgIUHOM7oEplV06TZIgZTi0RUkuqgZ4wDQYJKoZIhvcNAQENBQAwfDELMAkG
+A1UEBhMCVVMxPDA6BgNVBAoMM0ludGVybmV0IENvcnBvcmF0aW9uIGZvciBBc3NpZ25lZCBOYW1l
+cyBhbmQgTnVtYmVyczEvMC0GA1UEAwwmSUNBTk4gVHJhZGVtYXJrIENsZWFyaW5naG91c2UgUGls
+b3QgQ0EwHhcNMjIxMTE2MTMzMDIzWhcNMjcxMTE1MTMzMDIzWjCB0jELMAkGA1UEBhMCQkUxETAP
+BgNVBAgTCEJydXNzZWxzMRIwEAYDVQQHEwlWaWx2b29yZGUxMzAxBgNVBAoTKkRlbG9pdHRlIENv
+bnN1bHRpbmcgYW5kIEFkdmlzb3J5IENWQkEvU0NSTDFAMD4GA1UEAxM3SUNBTk4gVE1DSCBBdXRo
+b3JpemVkIFRyYWRlbWFyayBQaWxvdCBWYWxpZGF0b3IgUmV2b2tlZDElMCMGCSqGSIb3DQEJARYW
+YmV0bWNoc21kQGRlbG9pdHRlLmNvbTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAPzD
+z5OZziUlgJClE8YL7HSXJQT4aaZz1AmEo/++bZy0g71ABnGERWbrOT2Idm/56HT/QwUqWJ0TkBZb
+iqBiiD5r4EZyy9gzeOLioj5j4kE2E0wYPXVAMwjekOE80go9XNwBG09eAWW9Cmxcfw39yq1m/HDX
+wd5p7WbQe1PpSsOOkHooNBSS0IhFfZgGf6xoC9FuV1bsoeQ+W1HnyE3yqRgRx7wTHzNsHktr42cM
+qa9/iDWVXB3WDv9xOnFI1NV4cjaXDMJrkPemOk4S1KIR29cr98/JMaYVrwKjyg8Od+4FKn2wPDLF
+5+5h6k6AltoKdgQNLZNjJtzGwj1dcdizbqgqvG4a1v1KXnjd2s/fYRJNuT4pSLcr5pZGhZkmSat5
+uZQbyWiQ1LETwlHJctfurw0O1Lfau5G3QZNK1nD5hPWa+AYUU1g7KGlqYykgBSCFgN6xuz/PcpOA
++7BYAYuqCkYULfkLApVLXM9SNivS9ZyVk1XGZ3Qw+vdf0rd+11GelGRqdXwnoF1SSux8MRaVERiR
+T7B75LZvOU5IbNEKHGyysasP7WVMC2zPRpAGCM3+8rfu5AwdapSdmgGVa4/7enlOui2Uvye5cPOp
+KFDMtYd/hfCg2w/1WnT9E/zXMecgVXvqEKi6Yj/eXWS9hoYCCPmnHZkJEHfxdlQ2lNX7qgPnAgMB
+AAGjggGCMIIBfjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU2Q+NtbyM
+Yef0slflm1o9gox6irEwgboGA1UdIwSBsjCBr4AUR3tPrnpRkbXRv5026YZ/NhYEqUWhgYCkfjB8
+MQswCQYDVQQGEwJVUzE8MDoGA1UECgwzSW50ZXJuZXQgQ29ycG9yYXRpb24gZm9yIEFzc2lnbmVk
+IE5hbWVzIGFuZCBOdW1iZXJzMS8wLQYDVQQDDCZJQ0FOTiBUcmFkZW1hcmsgQ2xlYXJpbmdob3Vz
+ZSBQaWxvdCBDQYIUemptMV4lw+1QL1e648o+wvANH4wwNAYDVR0fBC0wKzApoCegJYYjaHR0cDov
+L2NybC5pY2Fubi5vcmcvdG1jaF9waWxvdC5jcmwwTAYDVR0gBEUwQzAQBg4rBgEEAYLJGwEFgzsM
+CjAvBggrBgEFBQcCATAjMCEGCCsGAQUFBwIBFhVodHRwczovL2Nwcy5pY2Fubi5vcmcwDQYJKoZI
+hvcNAQENBQADggIBAIT2/FgasgCiCSxOC+uz2C2kzFEfDb6E/H898ur3mcaSI2PaocKA0IwG+tin
+GBaB+lqO1zkyWuNetuciOiMPgZZ72n4BBa8Hv+cwudpbWbA/VZJZcGaCx4AXVI5Lo2bP9DUybx7x
+M2z0lpn52GaPNtsrau00bDbkoeZvgLYA/BKCu4cgdCEmIG83rPet6gdvZhmMQgX+Z+YsqbRCwTO/
+lXvG8Z5S1gJKOiV/O2L7zXDnPJxAP5Qk/zhP/CRwCwRDQvxoFEP6mgL6Io0rM/R5Anxy9SeR5d+k
+4LNCWPS4/I6aK/bL42+Nqdr2DQrDgZXd9Ou3Sfz69AFj1lnypaLcqaQIVpsQOZwNfP7IQtTjeBI+
+HyTx0oDzjD0mqWTmEGT60Ftg2mhKZHjtZ7W+trnuhomiDsLQ+b10EArZXq5C8sOKvOeHq+1DdwbL
+G1pf3gMackzuu11OzC1pi4x9p9UFseK1cBLq4p9eGvZp7KO0yQlWpo2rRui+sDttkhRZEwXCIL19
+S2/kKKv4Qvc90jgZHMWWPZCQ/ujOzbKAjny41rllFiW/LTmpI5RoaX7Ytwzcng50GYOTc2cVUsDT
+pfRogW+txa74G4bPwGopIhkwbLWDV7UMz1WM9igTJ6oLEHAvpOp518X7n5trRZEy8tOdCt/Ks9fW
+U1Al81soQwpP3ju7
+-----END CERTIFICATE-----
diff --git a/core/src/test/resources/google/registry/tmch/pubkey b/core/src/test/resources/google/registry/tmch/crypto/marksdb-public-key-test.asc
similarity index 100%
rename from core/src/test/resources/google/registry/tmch/pubkey
rename to core/src/test/resources/google/registry/tmch/crypto/marksdb-public-key-test.asc
diff --git a/core/src/test/resources/google/registry/tmch/dnl-latest.csv b/core/src/test/resources/google/registry/tmch/dnl/dnl-latest.csv
similarity index 100%
rename from core/src/test/resources/google/registry/tmch/dnl-latest.csv
rename to core/src/test/resources/google/registry/tmch/dnl/dnl-latest.csv
diff --git a/core/src/test/resources/google/registry/tmch/dnl-latest.sig b/core/src/test/resources/google/registry/tmch/dnl/dnl-latest.sig
similarity index 100%
rename from core/src/test/resources/google/registry/tmch/dnl-latest.sig
rename to core/src/test/resources/google/registry/tmch/dnl/dnl-latest.sig
diff --git a/core/src/test/resources/google/registry/tmch/icann-tmch-pilot-old.crl b/core/src/test/resources/google/registry/tmch/icann-tmch-pilot-old.crl
deleted file mode 100644
index 6643f518d..000000000
--- a/core/src/test/resources/google/registry/tmch/icann-tmch-pilot-old.crl
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN X509 CRL-----
-MIICVDCCATwCAQEwDQYJKoZIhvcNAQELBQAwfDELMAkGA1UEBhMCVVMxPDA6BgNV
-BAoTM0ludGVybmV0IENvcnBvcmF0aW9uIGZvciBBc3NpZ25lZCBOYW1lcyBhbmQg
-TnVtYmVyczEvMC0GA1UEAxMmSUNBTk4gVHJhZGVtYXJrIENsZWFyaW5naG91c2Ug
-UGlsb3QgQ0EXDTEzMDcwOTAwMDAwMFoXDTE4MDYyNTIzNTk1OVowWzBZAiAusBt6
-+hp7nbLd/oLa0HRKfentcmbRPTYWiDEoJ82FexcNMTMwNzA5MjIwMzIwWjAmMAoG
-A1UdFQQDCgEBMBgGA1UdGAQRGA8yMDEzMDcwOTIxMjcwMFqgLzAtMB8GA1UdIwQY
-MBaAFMOtPqbWEQBFgFw6V0qKbdwxDZ5xMAoGA1UdFAQDAgECMA0GCSqGSIb3DQEB
-CwUAA4IBAQCa3ZHr/qihqZ/M6Eo9SQ2G2dkvT6cs1L71YkiGmCpZdWvYm99sJ3yj
-iLe00vEyLWCPcq/qmgmhM0+Ou8ZHZ2nw2f4mzkjRwpzUn8oNMd5FHwlhpcRXHyjH
-DhPbX1a5xITPZj9UUq0Lhk+bciCtC+G/jtEIuaIWL5bW1KER+FxI3Tt3888xx17W
-0QoQiXEHltjl9zTj09YiVb4usGOQysLzAbhnyG5IBDBn11gWwx/g7rcXFO/z0KIp
-h3rKk5noar/kpp/qAzNDyByMfD2uJtHnxHLrafsK3HY6CDLCp6GqLNSA5zxSjVOq
-3sEaZYxI0Fg5DqBuN7efSCbM9bwFTYMy
------END X509 CRL-----
diff --git a/core/src/test/resources/google/registry/tmch/icann-tmch-test-good.crt b/core/src/test/resources/google/registry/tmch/icann-tmch-test-good.crt
deleted file mode 100644
index 1dc3375b9..000000000
--- a/core/src/test/resources/google/registry/tmch/icann-tmch-test-good.crt
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFLzCCBBegAwIBAgIgLrAbevoae52y3f6C2tB0Sn3p7XJm0T02FogxKCfNhXowDQYJKoZIhvcN
-AQELBQAwfDELMAkGA1UEBhMCVVMxPDA6BgNVBAoTM0ludGVybmV0IENvcnBvcmF0aW9uIGZvciBB
-c3NpZ25lZCBOYW1lcyBhbmQgTnVtYmVyczEvMC0GA1UEAxMmSUNBTk4gVHJhZGVtYXJrIENsZWFy
-aW5naG91c2UgUGlsb3QgQ0EwHhcNMTMwNjI2MDAwMDAwWhcNMTgwNjI1MjM1OTU5WjCBjzELMAkG
-A1UEBhMCQkUxIDAeBgNVBAgTF0JydXNzZWxzLUNhcGl0YWwgUmVnaW9uMREwDwYDVQQHEwhCcnVz
-c2VsczERMA8GA1UEChMIRGVsb2l0dGUxODA2BgNVBAMTL0lDQU5OIFRNQ0ggQXV0aG9yaXplZCBU
-cmFkZW1hcmsgUGlsb3QgVmFsaWRhdG9yMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-xlp3KpYHX3WyAsFhSk3LwWfnGlxnUDFqFZA3UouMYj/XigbMkNeEXIjlkROKT4OPGfRx/LAyRlQQ
-jCMv4qhbkcX1p7ar63flq4SZNVcl15l7h0uT58FzSfnlz0u5rkHfJImD43+maP/8gv36FR27jW8R
-9wY4hk+Ws4IB0iFSd8SXv1Kr8w/JmMQSDkiuG+RfIiubwQ/fy7Ekj5QWhPZw+mMxNKnHULy3xYz2
-LwVfftjwUueacvqNRCkMXlClOADqfT8oSZoeDXehHvlPsLCemGBoTKurskIS69F0yPEH5gze0H+f
-8FROsIoKSsVQ34B4S/joE67npsJPTdKsNPJTyQIDAQABo4IBhzCCAYMwDAYDVR0TAQH/BAIwADAd
-BgNVHQ4EFgQUoFpY76p5yoNDRGtQpzVuR81UWQ0wgcYGA1UdIwSBvjCBu4AUw60+ptYRAEWAXDpX
-Sopt3DENnnGhgYCkfjB8MQswCQYDVQQGEwJVUzE8MDoGA1UEChMzSW50ZXJuZXQgQ29ycG9yYXRp
-b24gZm9yIEFzc2lnbmVkIE5hbWVzIGFuZCBOdW1iZXJzMS8wLQYDVQQDEyZJQ0FOTiBUcmFkZW1h
-cmsgQ2xlYXJpbmdob3VzZSBQaWxvdCBDQYIgLrAbevoae52y3f6C2tB0Sn3p7XJm0T02FogxKCfN
-hXkwDgYDVR0PAQH/BAQDAgeAMDQGA1UdHwQtMCswKaAnoCWGI2h0dHA6Ly9jcmwuaWNhbm4ub3Jn
-L3RtY2hfcGlsb3QuY3JsMEUGA1UdIAQ+MDwwOgYDKgMEMDMwMQYIKwYBBQUHAgEWJWh0dHA6Ly93
-d3cuaWNhbm4ub3JnL3BpbG90X3JlcG9zaXRvcnkwDQYJKoZIhvcNAQELBQADggEBAIeDYYJr60W3
-y9Qs+3zRVI9kekKom5vkHOalB3wHaZIaAFYpI98tY0aVN9aGON0v6WQF+nvz1KRZQbAz01BXtaRJ
-4mPkarhhuLn9NkBxp8HR5qcc+KH7gv6r/c0iG3bCNJ+QSr7Qf+5MlMo6zL5UddU/T2jibMXCj/f2
-1Qw3x9QgoyXLFJ9ozaLgQ9RMkLlOmzkCAiXN5Ab43aJ9f7N2gE2NnRjNKmmC9ABQ0TRwEKVLhVl1
-UGqCHJ3AlBXWIXN5sjPQcD/+nHeEXMxYvlAyqxXoD3MWtQVj7j2oqlakOBMgG8+q2qYlmBts4FNi
-w748Il586HKBRqxHtZdRKW2VqaQ=
------END CERTIFICATE-----
diff --git a/core/src/test/resources/google/registry/tmch/icann-tmch-test-revoked.crt b/core/src/test/resources/google/registry/tmch/icann-tmch-test-revoked.crt
deleted file mode 100644
index f6aed7e56..000000000
--- a/core/src/test/resources/google/registry/tmch/icann-tmch-test-revoked.crt
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFNzCCBB+gAwIBAgIgLrAbevoae52y3f6C2tB0Sn3p7XJm0T02FogxKCfNhXswDQYJKoZIhvcN
-AQELBQAwfDELMAkGA1UEBhMCVVMxPDA6BgNVBAoTM0ludGVybmV0IENvcnBvcmF0aW9uIGZvciBB
-c3NpZ25lZCBOYW1lcyBhbmQgTnVtYmVyczEvMC0GA1UEAxMmSUNBTk4gVHJhZGVtYXJrIENsZWFy
-aW5naG91c2UgUGlsb3QgQ0EwHhcNMTMwNzA5MDAwMDAwWhcNMTgwNzA4MjM1OTU5WjCBlzELMAkG
-A1UEBhMCQkUxIDAeBgNVBAgTF0JydXNzZWxzLUNhcGl0YWwgUmVnaW9uMREwDwYDVQQHEwhCcnVz
-c2VsczERMA8GA1UEChMIRGVsb2l0dGUxQDA+BgNVBAMTN1JFVk9LRUQgSUNBTk4gVE1DSCBBdXRo
-b3JpemVkIFRyYWRlbWFyayBQaWxvdCBWYWxpZGF0b3IwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCtMtQSztROcQFeJHNn/yQMYnVZaqUpEGhuQz4s9CePQz1b03VlnYyjaNVk5LskGJFi
-sRgiZNBAjjjtl2AVzD5Y8mwmpCV24R0NtrKAflnG6CA15rBTsHUFDf6BaqyMaizAs4QIAGhdWOV7
-9Gy3wnxWSmvCkBt5BPkaMoV3xkUvXl/O+9CCFeH0UeBps5i3r7A53f7X5jjuUusghOD7GVvY0NN7
-icluS+cWEoRA5wPIM/f9bCAFFNgBvKKnXCtTtILnP3BcnStbJghtIObSejkaeidMD2Xlzmj8uwIP
-tpVbsdYVxAhgt52seQvzFS4EWXrpOx/lF7FPSLJ0i9rDT1bBAgMBAAGjggGHMIIBgzAMBgNVHRMB
-Af8EAjAAMB0GA1UdDgQWBBR88tgaGNIPWrFo5gffQu0ZfSfVhDCBxgYDVR0jBIG+MIG7gBTDrT6m
-1hEARYBcOldKim3cMQ2ecaGBgKR+MHwxCzAJBgNVBAYTAlVTMTwwOgYDVQQKEzNJbnRlcm5ldCBD
-b3Jwb3JhdGlvbiBmb3IgQXNzaWduZWQgTmFtZXMgYW5kIE51bWJlcnMxLzAtBgNVBAMTJklDQU5O
-IFRyYWRlbWFyayBDbGVhcmluZ2hvdXNlIFBpbG90IENBgiAusBt6+hp7nbLd/oLa0HRKfentcmbR
-PTYWiDEoJ82FeTAOBgNVHQ8BAf8EBAMCB4AwNAYDVR0fBC0wKzApoCegJYYjaHR0cDovL2NybC5p
-Y2Fubi5vcmcvdG1jaF9waWxvdC5jcmwwRQYDVR0gBD4wPDA6BgMqAwQwMzAxBggrBgEFBQcCARYl
-aHR0cDovL3d3dy5pY2Fubi5vcmcvcGlsb3RfcmVwb3NpdG9yeTANBgkqhkiG9w0BAQsFAAOCAQEA
-ujl6f6e6D+IJuFeBR4RPhVogELJG6/X+4n1dnLSDp/v2koInfQqSqRcRk3xuthYjz7v6y3p7oW6b
-ts3BTvQIMeu5J4TIkbOjNlVgao/je9f/gT7iK5DaJWHFQpnYnvjXhQ3V6RkS7dJl4FZEiy6pL8m5
-X1p5pCzcFqOyM/wR8KzfBUX+KhXaAWgtuDekATmR5yCFgPmAoZfPkpUFgMJpY5YcRu+K24WVnt4Y
-W7yw/GF5i6dpTUtpFM7/YUArzpdfU+econY4dMKdZ6sK8faj4iUIG+KEczsY1m989VIbptgxDVs5
-FeM4gV/H7waMmmZdyYP4pYRC3ydHOkbbZglXZw==
------END CERTIFICATE-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Agent-Arab/Court-Agent-Arab-Active.smd b/core/src/test/resources/google/registry/tmch/idn/Agent-Arab/Court-Agent-Arab-Active.smd
new file mode 100644
index 000000000..1c9572d91
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Agent-Arab/Court-Agent-Arab-Active.smd
@@ -0,0 +1,118 @@
+Marks: الاختبار & لتقييم
+smdID: 000000761669082586289-65535
+U-labels:
+notBefore: 2022-11-22T02:03:06.289Z
+notAfter: 2027-10-18T14:27:18.209Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il8yYmJj
+OTVlMy1jZTQwLTQ2ZDYtOTU2ZS0yNDhjOTZiZTI2YjciPjxzbWQ6aWQ+MDAwMDAwNzYxNjY5MDgy
+NTg2Mjg5LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMjowMzowNi4yODlaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0xOFQxNDoyNzoxOC4yMDlaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazpj
+b3VydD48bWFyazppZD4wMDAxNDQxNTAzMDY2MDIyMTUwMzA2NjAyMi0xPC9tYXJrOmlkPjxtYXJr
+Om1hcmtOYW1lPtin2YTYp9iu2KrYqNin2LEgJmFtcDsg2YTYqtmC2YrZitmFPC9tYXJrOm1hcmtO
+YW1lPjxtYXJrOmhvbGRlciBlbnRpdGxlbWVudD0ib3duZXIiPjxtYXJrOm9yZz7ZiNmD2KfZhNip
+PC9tYXJrOm9yZz48bWFyazphZGRyPjxtYXJrOnN0cmVldD7YrNi52YHYsSDYp9io2YYg2LPZitmG
+2KfYoSA3NTwvbWFyazpzdHJlZXQ+PG1hcms6Y2l0eT7ZhdmD2YbYp9izPC9tYXJrOmNpdHk+PG1h
+cms6cGM+MjkwMDwvbWFyazpwYz48bWFyazpjYz5NQTwvbWFyazpjYz48L21hcms6YWRkcj48L21h
+cms6aG9sZGVyPjxtYXJrOmNvbnRhY3QgdHlwZT0iYWdlbnQiPjxtYXJrOm5hbWU+2YXZh9mG2K/Y
+syDYp9mE2YXYudmE2YjZhdin2KrZitipPC9tYXJrOm5hbWU+PG1hcms6b3JnPtmI2YPYp9mE2Kk8
+L21hcms6b3JnPjxtYXJrOmFkZHI+PG1hcms6c3RyZWV0Pti02KfYsdi5INis2LnZgdixINin2KjZ
+hiDYs9mK2YbYp9ihIDc1PC9tYXJrOnN0cmVldD48bWFyazpjaXR5PtmF2YPZhtin2LM8L21hcms6
+Y2l0eT48bWFyazpwYz4yOTAwPC9tYXJrOnBjPjxtYXJrOmNjPk1BPC9tYXJrOmNjPjwvbWFyazph
+ZGRyPjxtYXJrOnZvaWNlPisyMTIuNTIyNTM5MDQwPC9tYXJrOnZvaWNlPjxtYXJrOmZheD4rMjEy
+LjUyMjUzOTA0MTwvbWFyazpmYXg+PG1hcms6ZW1haWw+dGVzdHRtY2graWRuQGdtYWlsLmNvbTwv
+bWFyazplbWFpbD48L21hcms6Y29udGFjdD48bWFyazpnb29kc0FuZFNlcnZpY2VzPti62YrYqtin
+2LHCpzwvbWFyazpnb29kc0FuZFNlcnZpY2VzPjxtYXJrOnJlZk51bT4xMjM0PC9tYXJrOnJlZk51
+bT48bWFyazpwcm9EYXRlPjIwMTQtMDktMDhUMDA6MDA6MDAuMDAwWjwvbWFyazpwcm9EYXRlPjxt
+YXJrOmNjPlVTPC9tYXJrOmNjPjxtYXJrOmNvdXJ0TmFtZT7Yp9mE2K/Yp9ixINin2YTYqNmK2LbY
+p9ihPC9tYXJrOmNvdXJ0TmFtZT48L21hcms6Y291cnQ+PC9tYXJrOm1hcms+PGRzOlNpZ25hdHVy
+ZSB4bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyIgSWQ9Il80MzVj
+YzExMS1hN2RiLTQyMDMtOGMzMC00Y2ZjMjgxNTlmZmYiPjxkczpTaWduZWRJbmZvPjxkczpDYW5v
+bmljYWxpemF0aW9uTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94
+bWwtZXhjLWMxNG4jIi8+PGRzOlNpZ25hdHVyZU1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cu
+dzMub3JnLzIwMDEvMDQveG1sZHNpZy1tb3JlI3JzYS1zaGEyNTYiLz48ZHM6UmVmZXJlbmNlIFVS
+ST0iI18yYmJjOTVlMy1jZTQwLTQ2ZDYtOTU2ZS0yNDhjOTZiZTI2YjciPjxkczpUcmFuc2Zvcm1z
+PjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRz
+aWcjZW52ZWxvcGVkLXNpZ25hdHVyZSIvPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8v
+d3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRp
+Z2VzdE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3No
+YTI1NiIvPjxkczpEaWdlc3RWYWx1ZT5wNURuNk4rZElIN1pvT2YxTlIvSVpvWDJjWTRSdk1xZ3VF
+b3RJWkdlL0IwPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PGRzOlJlZmVyZW5jZSBV
+Ukk9IiNfNmRlMGMzN2MtYTE4My00OGVkLTljMTktOGRiY2QxZGZkNzE4Ij48ZHM6VHJhbnNmb3Jt
+cz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwt
+ZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJo
+dHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+
+VVZKbDc0dkZzSGx2d3RvYVAyMWVtM0JFeWp4aW93dklmb1VFcUhTVkxiST08L2RzOkRpZ2VzdFZh
+bHVlPjwvZHM6UmVmZXJlbmNlPjwvZHM6U2lnbmVkSW5mbz48ZHM6U2lnbmF0dXJlVmFsdWUgSWQ9
+Il9jYzc1NGU4Yi00MDQ2LTRiNmItYmQ1Yi1mZjAwM2I3NzIzY2IiPm9Cbmdnc0QyLzNpR09iN1lj
+ZUphbWozT3J1bU0rQ2xMeGFGN3Z1OWFqcG9rVytoQy8yNFJDenhvZGZBSFVzbFAyU3padmNQUHZr
+cWYmIzEzOwpkbWlFNXVWVGMrcWd2ajFNTHoyamxPOU1FQlgrT1JZOHIycFFKQ1ZraUxyTHpqc0Yx
+NTRxenR3Zng2MnB2ZmhQZzl2ck44dnc2NFdyJiMxMzsKdHBVbXhZcGZBVDl0ZGJjTDhHWi95OTJ6
+WnpZa3dEL1B2bHgyT1UzZlVDUkxYcS9ZbDc3Ny8zbEIwY0ZXUnI5VitoMFNYcS9XVWw5diYjMTM7
+ClpNWXhTQlpXbUtZbENldExGc0VRaEhybHdacmtwc2diVkhnS2N3Yld1SmJXZHp4NEFuUmE2blVD
+N05DMTFvcmNyV3QydWdRVzRhWTImIzEzOwpQdDNzTUg4Q09XeG4wdG1mSTZaQnpsdkdOeW1pVkwv
+TnFTVXFTWk1YUmtqZEVPeUlZNVlobE9QSCtSRnF1NUJjYlZXZEtWZ255RmVZJiMxMzsKYzJ6VEFr
+T3JOV3dLbXVDNkpQSGVZcEhSNDFTT0N6S0RlNkN0TXZKSThlY1R1WTl6YmlySXFSZHBYdVFnYVBD
+Z2gvWEoxTis5ZlJEbyYjMTM7Cld2ODhBM2lvb3VWc3c0d1pOalRzNXN5cEZJNjdsQmF2MkV2UC8x
+Q3lNbXJFcU5FN20xNHlrSDltTFRwMytwVlllbjNsZDFEaTFObkUmIzEzOwpVK1lGMTF6MmhCb0Zn
+WGVMUVhVcVpReis5MGcrTVVEUG9mVnpHMWowMzI4NFRQbkpSL2llL1p2UndXeWxBbUtKR0dtN2Vy
+VTRLNkhrJiMxMzsKejI2bm5ITDRoNjdHZEtkTGFJT3p6R1ZHbmZPNGFUd2hSVmt6U3kwa3lvWGRL
+bEtCTThYcUdZVnozV0xSUEQvc1NuUVVRSjg4NU0wPTwvZHM6U2lnbmF0dXJlVmFsdWU+PGRzOktl
+eUluZm8gSWQ9Il82ZGUwYzM3Yy1hMTgzLTQ4ZWQtOWMxOS04ZGJjZDFkZmQ3MTgiPjxkczpYNTA5
+RGF0YT48ZHM6WDUwOUNlcnRpZmljYXRlPk1JSUhYekNDQlVlZ0F3SUJBZ0lVWHFJL3ZkMThDYWc5
+OG9OcGR6VjdCaXkvNkVBd0RRWUpLb1pJaHZjTkFRRU5CUUF3ZkRFTE1Ba0cmIzEzOwpBMVVFQmhN
+Q1ZWTXhQREE2QmdOVkJBb01NMGx1ZEdWeWJtVjBJRU52Y25CdmNtRjBhVzl1SUdadmNpQkJjM05w
+WjI1bFpDQk9ZVzFsJiMxMzsKY3lCaGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF3d21TVU5CVGs0
+Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5YVc1bmFHOTFjMlVnVUdscyYjMTM7CmIzUWdRMEV3SGhjTk1q
+SXhNVEUyTVRNeU9EVTVXaGNOTWpjeE1URTFNVE15T0RVNVdqQ0IwREVMTUFrR0ExVUVCaE1DUWtV
+eEVUQVAmIzEzOwpCZ05WQkFnVENFSnlkWE56Wld4ek1SSXdFQVlEVlFRSEV3bFdhV3gyYjI5eVpH
+VXhNekF4QmdOVkJBb1RLa1JsYkc5cGRIUmxJRU52JiMxMzsKYm5OMWJIUnBibWNnWVc1a0lFRmtk
+bWx6YjNKNUlFTldRa0V2VTBOU1RERStNRHdHQTFVRUF4TTFTVU5CVGs0Z1ZFMURTQ0JCZFhSbyYj
+MTM7CmIzSnBlbVZrSUZSeVlXUmxiV0Z5YXlCUWFXeHZkQ0JXWVd4cFpHRjBiM0lnVm1Gc2FXUXhK
+VEFqQmdrcWhraUc5dzBCQ1FFV0ZtSmwmIzEzOwpkRzFqYUhOdFpFQmtaV3h2YVhSMFpTNWpiMjB3
+Z2dJaU1BMEdDU3FHU0liM0RRRUJBUVVBQTRJQ0R3QXdnZ0lLQW9JQ0FRQzZGSnd6JiMxMzsKS3FR
+Vlg2ZkczL0VMUlNHV1Y5R3JLYUZNS21oV0l4ZXB3UlpONk14TXFrZDVEbllmaVQrV3A5OGpFa3Fn
+VHgyVU1iOXF1Z2NHTlY2ZyYjMTM7CjM1L0NyUWIvRi9tejNDNHNmTE51RHBTcUs5UUY4K3BhVEg2
+aFFtck9wcVYrVVR2ZGo5U01nS0d5Rml6Uzg4Q0RXTXg0dzNpNEZBS2UmIzEzOwo2TlJzSlJHVEF0
+S0R1TUhjQTRzajA4R2plM2xQV2NnRnZjUU5EVmVFQlR1T0hCRytSaGo3VjFKaU5HUC80ZXBUWFRG
+WGdQRkRnZXozJiMxMzsKWUFmeHFwYnVPNFRYNmJiWWRrMm52TUxGdkxFTmtDRll1bG5ZUHpnbkVC
+R1NNS0lhQUlsYitzY0hDdldnV2oyVExnd2gyR0pOY3pWTSYjMTM7CjFMUE1xR1MrVWtpOU1oNzk4
+MjIveG9hcjQ5OHhEeDJZeC84c3dnRU5MU2dDc1FBVzhuTWd3V242QWJZbDJSQUJYdXJheUZzbjRQ
+MVImIzEzOwp1UU5tVXAvcXJSS1J2U0pyMU9Ma0haZkZUY1NZUWFWaXVNWVBYekd6OHRtTUxsbUkv
+QjZBQ0g0QXdSTWRuWXZGTzNLSTFSQm5QS0lkJiMxMzsKd3dmVXBaNUlUSXBiQTdDR2dUeDFxeHRN
+MXdJVXI3cEhlS1A2alZlM2tkRExnKy9CWjJ4TUV0Qms1YThZN0I0djN4d0hYR1R2VjhtTiYjMTM7
+CjBBZy9TeVQvUVV5RVJoWFV5QU4yK0V3WitTUUNVeU5memlvV1E4NzhlR3lrVSs0NitCYmdJM0lJ
+cjM2WEtQd216dDBTWitLSTN0bkYmIzEzOwpUbG45bVgwS0MwaWRvajV5a3pQb0MvTUllZDBzcDRU
+aWd4RWJXTng3RUY4MFB2Ui9EREV3VlBFRWtrank2M1hGdWx4aUNRSURBUUFCJiMxMzsKbzRJQmdq
+Q0NBWDR3REFZRFZSMFRBUUgvQkFJd0FEQU9CZ05WSFE4QkFmOEVCQU1DQjRBd0hRWURWUjBPQkJZ
+RUZIbjlzMERFYTJrdiYjMTM7CmdFL2VJT1RzcW9XODVNWEZNSUc2QmdOVkhTTUVnYkl3Z2ErQUZF
+ZDdUNjU2VVpHMTBiK2ROdW1HZnpZV0JLbEZvWUdBcEg0d2ZERUwmIzEzOwpNQWtHQTFVRUJoTUNW
+Vk14UERBNkJnTlZCQW9NTTBsdWRHVnlibVYwSUVOdmNuQnZjbUYwYVc5dUlHWnZjaUJCYzNOcFoy
+NWxaQ0JPJiMxMzsKWVcxbGN5QmhibVFnVG5WdFltVnljekV2TUMwR0ExVUVBd3dtU1VOQlRrNGdW
+SEpoWkdWdFlYSnJJRU5zWldGeWFXNW5hRzkxYzJVZyYjMTM7ClVHbHNiM1FnUTBHQ0ZIcHFiVEZl
+SmNQdFVDOVh1dVBLUHNMd0RSK01NRFFHQTFVZEh3UXRNQ3N3S2FBbm9DV0dJMmgwZEhBNkx5OWom
+IzEzOwpjbXd1YVdOaGJtNHViM0puTDNSdFkyaGZjR2xzYjNRdVkzSnNNRXdHQTFVZElBUkZNRU13
+RUFZT0t3WUJCQUdDeVJzQkJZTTdEQW93JiMxMzsKTHdZSUt3WUJCUVVIQWdFd0l6QWhCZ2dyQmdF
+RkJRY0NBUllWYUhSMGNITTZMeTlqY0hNdWFXTmhibTR1YjNKbk1BMEdDU3FHU0liMyYjMTM7CkRR
+RUJEUVVBQTRJQ0FRQmRTYXQ1NnVlakxuQWpGSUY5NWRqWVdJNnMvL042WVh4c3JyTWtHQlA4RWV6
+UHloTGg2YXdQNHo3UTlRQUkmIzEzOwpRWmtZb3hybC8xeTArYnlWMnFuVFVVQ0xScEsvQkRwL2hj
+ZndQZktDQS8yUlFDSEpyYjYrejBlbkRQRlJLME5LbXdPY2RsR3RVazBtJiMxMzsKUGdXR1NLdHV3
+VnNQQWhUREp1aG9zWk9oa05mK25TT09IclFPbjFFMnJ6T3JkL2tRbHFpQ3dSSDk3OTZOcFRBK0hT
+TWZPb2JKRUVQcSYjMTM7CnRwRjdQNXFid3RsOTVVYTVPcDRBaGE3MEhIZlVGUzRCT1FLTEJWZk1a
+ZE9SK2lQb2g1T3dBSytodFlrRkNHOVAyV0h1N3dmOEVDK1cmIzEzOwo3azk2Z3ZUZDh4RTdvdW9h
+YlQyeDZZZllxRWxQSGlVL0lNOWdWeldXTC9zdllEeVNWdW9Gd0JqRE5OMWNkcTBxT1lSMXl1UzFj
+LzlEJiMxMzsKRlI3ZW83R0ZFQ3krVEJkN0lpS1JmQlZlWUdPT1BNbm9GZnhSTFdycHNXTm53RDds
+a1BrTENnRkNrKzh5RWNPUmc2MjVtbzY1ejR5NiYjMTM7Cko0Szhmb2RhN3F3bVhOUDNSUzE4b242
+Qkh0OGxRK2JYZ09IbXhJSGswYU8wcU5EcWd2THIyRmx5TEdKR2lFTVJxRE1NUjYvYTA2YnQmIzEz
+OwprblVNSGw3Q3FNZmpJa2pQNFZOTnlHUGRKZ3dWazJrZWI5dU5GdkpDeFQrTTJmR1hRMU5iSk5m
+dHY1TWdTc3A5TjF5K3g2Z0EzRWh3JiMxMzsKeUhsbUpCNFlNdG84dFRWMWk4NHhQWHhpMkNBZURh
+R0R1d29zdDhZVUNTanE3UkNLOHRHY2FBWXJrWFFZMnlRZlgzY3dEc0V4UnFWVyYjMTM7CnlyanlS
+dCtONm1LOTlRPT08L2RzOlg1MDlDZXJ0aWZpY2F0ZT48L2RzOlg1MDlEYXRhPjwvZHM6S2V5SW5m
+bz48L2RzOlNpZ25hdHVyZT48L3NtZDpzaWduZWRNYXJrPgo=
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Agent-Arab/Court-Agent-Arab-Revoked.smd b/core/src/test/resources/google/registry/tmch/idn/Agent-Arab/Court-Agent-Arab-Revoked.smd
new file mode 100644
index 000000000..8bce631b6
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Agent-Arab/Court-Agent-Arab-Revoked.smd
@@ -0,0 +1,118 @@
+Marks: الاختبار & لتقييم
+smdID: 000000761669082551615-65535
+U-labels:
+notBefore: 2022-11-22T02:02:31.615Z
+notAfter: 2027-10-18T14:27:18.209Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il8wNzY2
+MzA4MS01ZTE2LTQ3OTctOTBkYy1kMjZlZWQ1MWUwODYiPjxzbWQ6aWQ+MDAwMDAwNzYxNjY5MDgy
+NTUxNjE1LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMjowMjozMS42MTVaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0xOFQxNDoyNzoxOC4yMDlaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazpj
+b3VydD48bWFyazppZD4wMDAxNDQxNTAzMDY2MDIyMTUwMzA2NjAyMi0xPC9tYXJrOmlkPjxtYXJr
+Om1hcmtOYW1lPtin2YTYp9iu2KrYqNin2LEgJmFtcDsg2YTYqtmC2YrZitmFPC9tYXJrOm1hcmtO
+YW1lPjxtYXJrOmhvbGRlciBlbnRpdGxlbWVudD0ib3duZXIiPjxtYXJrOm9yZz7ZiNmD2KfZhNip
+PC9tYXJrOm9yZz48bWFyazphZGRyPjxtYXJrOnN0cmVldD7YrNi52YHYsSDYp9io2YYg2LPZitmG
+2KfYoSA3NTwvbWFyazpzdHJlZXQ+PG1hcms6Y2l0eT7ZhdmD2YbYp9izPC9tYXJrOmNpdHk+PG1h
+cms6cGM+MjkwMDwvbWFyazpwYz48bWFyazpjYz5NQTwvbWFyazpjYz48L21hcms6YWRkcj48L21h
+cms6aG9sZGVyPjxtYXJrOmNvbnRhY3QgdHlwZT0iYWdlbnQiPjxtYXJrOm5hbWU+2YXZh9mG2K/Y
+syDYp9mE2YXYudmE2YjZhdin2KrZitipPC9tYXJrOm5hbWU+PG1hcms6b3JnPtmI2YPYp9mE2Kk8
+L21hcms6b3JnPjxtYXJrOmFkZHI+PG1hcms6c3RyZWV0Pti02KfYsdi5INis2LnZgdixINin2KjZ
+hiDYs9mK2YbYp9ihIDc1PC9tYXJrOnN0cmVldD48bWFyazpjaXR5PtmF2YPZhtin2LM8L21hcms6
+Y2l0eT48bWFyazpwYz4yOTAwPC9tYXJrOnBjPjxtYXJrOmNjPk1BPC9tYXJrOmNjPjwvbWFyazph
+ZGRyPjxtYXJrOnZvaWNlPisyMTIuNTIyNTM5MDQwPC9tYXJrOnZvaWNlPjxtYXJrOmZheD4rMjEy
+LjUyMjUzOTA0MTwvbWFyazpmYXg+PG1hcms6ZW1haWw+dGVzdHRtY2graWRuQGdtYWlsLmNvbTwv
+bWFyazplbWFpbD48L21hcms6Y29udGFjdD48bWFyazpnb29kc0FuZFNlcnZpY2VzPti62YrYqtin
+2LHCpzwvbWFyazpnb29kc0FuZFNlcnZpY2VzPjxtYXJrOnJlZk51bT4xMjM0PC9tYXJrOnJlZk51
+bT48bWFyazpwcm9EYXRlPjIwMTQtMDktMDhUMDA6MDA6MDAuMDAwWjwvbWFyazpwcm9EYXRlPjxt
+YXJrOmNjPlVTPC9tYXJrOmNjPjxtYXJrOmNvdXJ0TmFtZT7Yp9mE2K/Yp9ixINin2YTYqNmK2LbY
+p9ihPC9tYXJrOmNvdXJ0TmFtZT48L21hcms6Y291cnQ+PC9tYXJrOm1hcms+PGRzOlNpZ25hdHVy
+ZSB4bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyIgSWQ9Il84YWJk
+ZTY3Ny01NmRkLTQ3ZjctOTZiZS03NDY2MTM5MWZmNmUiPjxkczpTaWduZWRJbmZvPjxkczpDYW5v
+bmljYWxpemF0aW9uTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94
+bWwtZXhjLWMxNG4jIi8+PGRzOlNpZ25hdHVyZU1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cu
+dzMub3JnLzIwMDEvMDQveG1sZHNpZy1tb3JlI3JzYS1zaGEyNTYiLz48ZHM6UmVmZXJlbmNlIFVS
+ST0iI18wNzY2MzA4MS01ZTE2LTQ3OTctOTBkYy1kMjZlZWQ1MWUwODYiPjxkczpUcmFuc2Zvcm1z
+PjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRz
+aWcjZW52ZWxvcGVkLXNpZ25hdHVyZSIvPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8v
+d3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRp
+Z2VzdE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3No
+YTI1NiIvPjxkczpEaWdlc3RWYWx1ZT5GWW5XdmJQS3JIM3lkeXRaclZHNVZWd2pNRVhFd0FUOUwv
+aS8yOWhXaDdVPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PGRzOlJlZmVyZW5jZSBV
+Ukk9IiNfY2U3NmJmM2YtOWM1MS00ZDQ2LTk2ZjctZDIyZmM0NWNiYjdkIj48ZHM6VHJhbnNmb3Jt
+cz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwt
+ZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJo
+dHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+
+YmF6Yzd0QkcveUVULyt2anFJeWhrSkY5QlZ5M0k5eXFza2h4eU91UEhGQT08L2RzOkRpZ2VzdFZh
+bHVlPjwvZHM6UmVmZXJlbmNlPjwvZHM6U2lnbmVkSW5mbz48ZHM6U2lnbmF0dXJlVmFsdWUgSWQ9
+Il83Nzc0Y2U5ZC1kYTNhLTQxYzctODVmMy1mYzk5ZjlmZGM3ZTMiPmlrdlpZTE4wbzJYTEFBUWd3
+RE95OU1OUzBNOXJSSURXcE92eFVnQzNtQ0lWNm5lYWNWcmcxeEdFN2ljQkFRZ3o3NnVqM0lLL0cw
+UXEmIzEzOwpMS0VjOHNyazBORi8xbnFmYkxjOUZTM3kyWm42SThlZ3hmeEw2NTlZM2V0SlpMSFNT
+VTVVUXQ4TS9NQmRHb3RNaE9kcmc3cU5kcmFVJiMxMzsKVjNOMElOOWc5MC9yM3Zoc2xYOEFEZ1RO
+U1NMM05sUkNLSTQrN2ZMVDBEbkdkaTJnckRpeGhtNFhNV3pWdXo0cnYxbzZ1ZXJVUS9SUCYjMTM7
+CkJhSUJqcWUrQk1XVG1aM1RXbnNuN3NxUXZBVXFpYXFUZlNKRHpNaHlNcmtXN2tCbktLWE4vMFBp
+dEIwN0VmVDBtSjZGMzNHdFlPSDcmIzEzOwpBTWZOUS9leGdwNHR1NHVLdVB0STNibVVMVHZjY1Rn
+UTVZTmg4OHZpYmdrRVdGVHJvTHJDc0F1eTlaVklZSisyeUhYazNMUUQwN1IwJiMxMzsKVnluQWhT
+OUpUWThydTFTMjRra1IxeXdNL0RxdU9HSXNsVzVRRXFJZHhRQkpEUGZ0N2wrV2dYTjd6djg5ZGJi
+WkFEaXRFQkp0TURCVSYjMTM7CmkwdlluUW5ZR25aVUpNSjlLQ1ZnSVQzSitXeGdCbGdxdWdDa3Ni
+U08rZjQ1b1VDYkN4ZDJQdXk1VitoVG5meGtTSFQzN2JFLy85c3YmIzEzOwpOdUlraGdNb2VPNm8w
+UlpTaHdtMlNybVhsVlBoWnZtZk1kQWl0V05kL2FRZFZiYTRkYVRXWFQvMlJpZ1JSRXg1TGtkRWR4
+aHJNOEhqJiMxMzsKdEhJUlZUUVM3YytYWlVoeUJRMERYc2RhZEJLOWk4Ung0c09LYzJZUXRzaldk
+TWZTM1pvL0ZkWExJdEtISnMyc0lHcUJVTmRnd2kwPTwvZHM6U2lnbmF0dXJlVmFsdWU+PGRzOktl
+eUluZm8gSWQ9Il9jZTc2YmYzZi05YzUxLTRkNDYtOTZmNy1kMjJmYzQ1Y2JiN2QiPjxkczpYNTA5
+RGF0YT48ZHM6WDUwOUNlcnRpZmljYXRlPk1JSUhYekNDQlVlZ0F3SUJBZ0lVWHFJL3ZkMThDYWc5
+OG9OcGR6VjdCaXkvNkVBd0RRWUpLb1pJaHZjTkFRRU5CUUF3ZkRFTE1Ba0cmIzEzOwpBMVVFQmhN
+Q1ZWTXhQREE2QmdOVkJBb01NMGx1ZEdWeWJtVjBJRU52Y25CdmNtRjBhVzl1SUdadmNpQkJjM05w
+WjI1bFpDQk9ZVzFsJiMxMzsKY3lCaGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF3d21TVU5CVGs0
+Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5YVc1bmFHOTFjMlVnVUdscyYjMTM7CmIzUWdRMEV3SGhjTk1q
+SXhNVEUyTVRNeU9EVTVXaGNOTWpjeE1URTFNVE15T0RVNVdqQ0IwREVMTUFrR0ExVUVCaE1DUWtV
+eEVUQVAmIzEzOwpCZ05WQkFnVENFSnlkWE56Wld4ek1SSXdFQVlEVlFRSEV3bFdhV3gyYjI5eVpH
+VXhNekF4QmdOVkJBb1RLa1JsYkc5cGRIUmxJRU52JiMxMzsKYm5OMWJIUnBibWNnWVc1a0lFRmtk
+bWx6YjNKNUlFTldRa0V2VTBOU1RERStNRHdHQTFVRUF4TTFTVU5CVGs0Z1ZFMURTQ0JCZFhSbyYj
+MTM7CmIzSnBlbVZrSUZSeVlXUmxiV0Z5YXlCUWFXeHZkQ0JXWVd4cFpHRjBiM0lnVm1Gc2FXUXhK
+VEFqQmdrcWhraUc5dzBCQ1FFV0ZtSmwmIzEzOwpkRzFqYUhOdFpFQmtaV3h2YVhSMFpTNWpiMjB3
+Z2dJaU1BMEdDU3FHU0liM0RRRUJBUVVBQTRJQ0R3QXdnZ0lLQW9JQ0FRQzZGSnd6JiMxMzsKS3FR
+Vlg2ZkczL0VMUlNHV1Y5R3JLYUZNS21oV0l4ZXB3UlpONk14TXFrZDVEbllmaVQrV3A5OGpFa3Fn
+VHgyVU1iOXF1Z2NHTlY2ZyYjMTM7CjM1L0NyUWIvRi9tejNDNHNmTE51RHBTcUs5UUY4K3BhVEg2
+aFFtck9wcVYrVVR2ZGo5U01nS0d5Rml6Uzg4Q0RXTXg0dzNpNEZBS2UmIzEzOwo2TlJzSlJHVEF0
+S0R1TUhjQTRzajA4R2plM2xQV2NnRnZjUU5EVmVFQlR1T0hCRytSaGo3VjFKaU5HUC80ZXBUWFRG
+WGdQRkRnZXozJiMxMzsKWUFmeHFwYnVPNFRYNmJiWWRrMm52TUxGdkxFTmtDRll1bG5ZUHpnbkVC
+R1NNS0lhQUlsYitzY0hDdldnV2oyVExnd2gyR0pOY3pWTSYjMTM7CjFMUE1xR1MrVWtpOU1oNzk4
+MjIveG9hcjQ5OHhEeDJZeC84c3dnRU5MU2dDc1FBVzhuTWd3V242QWJZbDJSQUJYdXJheUZzbjRQ
+MVImIzEzOwp1UU5tVXAvcXJSS1J2U0pyMU9Ma0haZkZUY1NZUWFWaXVNWVBYekd6OHRtTUxsbUkv
+QjZBQ0g0QXdSTWRuWXZGTzNLSTFSQm5QS0lkJiMxMzsKd3dmVXBaNUlUSXBiQTdDR2dUeDFxeHRN
+MXdJVXI3cEhlS1A2alZlM2tkRExnKy9CWjJ4TUV0Qms1YThZN0I0djN4d0hYR1R2VjhtTiYjMTM7
+CjBBZy9TeVQvUVV5RVJoWFV5QU4yK0V3WitTUUNVeU5memlvV1E4NzhlR3lrVSs0NitCYmdJM0lJ
+cjM2WEtQd216dDBTWitLSTN0bkYmIzEzOwpUbG45bVgwS0MwaWRvajV5a3pQb0MvTUllZDBzcDRU
+aWd4RWJXTng3RUY4MFB2Ui9EREV3VlBFRWtrank2M1hGdWx4aUNRSURBUUFCJiMxMzsKbzRJQmdq
+Q0NBWDR3REFZRFZSMFRBUUgvQkFJd0FEQU9CZ05WSFE4QkFmOEVCQU1DQjRBd0hRWURWUjBPQkJZ
+RUZIbjlzMERFYTJrdiYjMTM7CmdFL2VJT1RzcW9XODVNWEZNSUc2QmdOVkhTTUVnYkl3Z2ErQUZF
+ZDdUNjU2VVpHMTBiK2ROdW1HZnpZV0JLbEZvWUdBcEg0d2ZERUwmIzEzOwpNQWtHQTFVRUJoTUNW
+Vk14UERBNkJnTlZCQW9NTTBsdWRHVnlibVYwSUVOdmNuQnZjbUYwYVc5dUlHWnZjaUJCYzNOcFoy
+NWxaQ0JPJiMxMzsKWVcxbGN5QmhibVFnVG5WdFltVnljekV2TUMwR0ExVUVBd3dtU1VOQlRrNGdW
+SEpoWkdWdFlYSnJJRU5zWldGeWFXNW5hRzkxYzJVZyYjMTM7ClVHbHNiM1FnUTBHQ0ZIcHFiVEZl
+SmNQdFVDOVh1dVBLUHNMd0RSK01NRFFHQTFVZEh3UXRNQ3N3S2FBbm9DV0dJMmgwZEhBNkx5OWom
+IzEzOwpjbXd1YVdOaGJtNHViM0puTDNSdFkyaGZjR2xzYjNRdVkzSnNNRXdHQTFVZElBUkZNRU13
+RUFZT0t3WUJCQUdDeVJzQkJZTTdEQW93JiMxMzsKTHdZSUt3WUJCUVVIQWdFd0l6QWhCZ2dyQmdF
+RkJRY0NBUllWYUhSMGNITTZMeTlqY0hNdWFXTmhibTR1YjNKbk1BMEdDU3FHU0liMyYjMTM7CkRR
+RUJEUVVBQTRJQ0FRQmRTYXQ1NnVlakxuQWpGSUY5NWRqWVdJNnMvL042WVh4c3JyTWtHQlA4RWV6
+UHloTGg2YXdQNHo3UTlRQUkmIzEzOwpRWmtZb3hybC8xeTArYnlWMnFuVFVVQ0xScEsvQkRwL2hj
+ZndQZktDQS8yUlFDSEpyYjYrejBlbkRQRlJLME5LbXdPY2RsR3RVazBtJiMxMzsKUGdXR1NLdHV3
+VnNQQWhUREp1aG9zWk9oa05mK25TT09IclFPbjFFMnJ6T3JkL2tRbHFpQ3dSSDk3OTZOcFRBK0hT
+TWZPb2JKRUVQcSYjMTM7CnRwRjdQNXFid3RsOTVVYTVPcDRBaGE3MEhIZlVGUzRCT1FLTEJWZk1a
+ZE9SK2lQb2g1T3dBSytodFlrRkNHOVAyV0h1N3dmOEVDK1cmIzEzOwo3azk2Z3ZUZDh4RTdvdW9h
+YlQyeDZZZllxRWxQSGlVL0lNOWdWeldXTC9zdllEeVNWdW9Gd0JqRE5OMWNkcTBxT1lSMXl1UzFj
+LzlEJiMxMzsKRlI3ZW83R0ZFQ3krVEJkN0lpS1JmQlZlWUdPT1BNbm9GZnhSTFdycHNXTm53RDds
+a1BrTENnRkNrKzh5RWNPUmc2MjVtbzY1ejR5NiYjMTM7Cko0Szhmb2RhN3F3bVhOUDNSUzE4b242
+Qkh0OGxRK2JYZ09IbXhJSGswYU8wcU5EcWd2THIyRmx5TEdKR2lFTVJxRE1NUjYvYTA2YnQmIzEz
+OwprblVNSGw3Q3FNZmpJa2pQNFZOTnlHUGRKZ3dWazJrZWI5dU5GdkpDeFQrTTJmR1hRMU5iSk5m
+dHY1TWdTc3A5TjF5K3g2Z0EzRWh3JiMxMzsKeUhsbUpCNFlNdG84dFRWMWk4NHhQWHhpMkNBZURh
+R0R1d29zdDhZVUNTanE3UkNLOHRHY2FBWXJrWFFZMnlRZlgzY3dEc0V4UnFWVyYjMTM7CnlyanlS
+dCtONm1LOTlRPT08L2RzOlg1MDlDZXJ0aWZpY2F0ZT48L2RzOlg1MDlEYXRhPjwvZHM6S2V5SW5m
+bz48L2RzOlNpZ25hdHVyZT48L3NtZDpzaWduZWRNYXJrPgo=
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Agent-Arab/Trademark-Agent-Arab-Active.smd b/core/src/test/resources/google/registry/tmch/idn/Agent-Arab/Trademark-Agent-Arab-Active.smd
new file mode 100644
index 000000000..776aaf8f3
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Agent-Arab/Trademark-Agent-Arab-Active.smd
@@ -0,0 +1,122 @@
+Marks: الاختبار & لتقييم
+smdID: 000000771669082590146-65535
+U-labels: xn------nzeaagpf7azb2ppajr3fa, xn-----btdaafne4a7azpoaiq8ea, xn----ymcaaeld1a4a6onahp3ea, xn--mgbaadjcy1a8mmago8da
+notBefore: 2022-11-22T02:03:10.146Z
+notAfter: 2027-10-18T14:27:18.209Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il9lODRj
+YmI2ZS00OTdhLTQ3Y2ItYWYxYi0zMzc3MWU3MzYxZTEiPjxzbWQ6aWQ+MDAwMDAwNzcxNjY5MDgy
+NTkwMTQ2LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMjowMzoxMC4xNDZaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0xOFQxNDoyNzoxOC4yMDlaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
+cmFkZW1hcms+PG1hcms6aWQ+MDAwMTQ0MTUwMzA2NjE5NTE1MDMwNjYxOTUtMTwvbWFyazppZD48
+bWFyazptYXJrTmFtZT7Yp9mE2KfYrtiq2KjYp9ixICZhbXA7INmE2KrZgtmK2YrZhTwvbWFyazpt
+YXJrTmFtZT48bWFyazpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpuYW1lPtmF2YfZ
+htiv2LMg2KfZhNmF2LnZhNmI2YXYp9iq2YrYqTwvbWFyazpuYW1lPjxtYXJrOmFkZHI+PG1hcms6
+c3RyZWV0Ptis2LnZgdixINin2KjZhiDYs9mK2YbYp9ihIDc1PC9tYXJrOnN0cmVldD48bWFyazpj
+aXR5PtmF2YPZhtin2LM8L21hcms6Y2l0eT48bWFyazpwYz4yOTAwPC9tYXJrOnBjPjxtYXJrOmNj
+Pk1BPC9tYXJrOmNjPjwvbWFyazphZGRyPjwvbWFyazpob2xkZXI+PG1hcms6Y29udGFjdCB0eXBl
+PSJhZ2VudCI+PG1hcms6bmFtZT7ZhdmH2YbYr9izINin2YTZhdi52YTZiNmF2KfYqtmK2Kk8L21h
+cms6bmFtZT48bWFyazpvcmc+2YjZg9in2YTYqTwvbWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpz
+dHJlZXQ+2LTYp9ix2Lkg2KzYudmB2LEg2KfYqNmGINiz2YrZhtin2KEgNzU8L21hcms6c3RyZWV0
+PjxtYXJrOmNpdHk+2YXZg9mG2KfYszwvbWFyazpjaXR5PjxtYXJrOnBjPjI5MDA8L21hcms6cGM+
+PG1hcms6Y2M+TUE8L21hcms6Y2M+PC9tYXJrOmFkZHI+PG1hcms6dm9pY2U+KzIxMi41MjI1Mzkw
+NDA8L21hcms6dm9pY2U+PG1hcms6ZmF4PisyMTIuNTIyNTM5MDQxPC9tYXJrOmZheD48bWFyazpl
+bWFpbD50ZXN0dG1jaCtpZG5AZ21haWwuY29tPC9tYXJrOmVtYWlsPjwvbWFyazpjb250YWN0Pjxt
+YXJrOmp1cmlzZGljdGlvbj5VUzwvbWFyazpqdXJpc2RpY3Rpb24+PG1hcms6Y2xhc3M+MTU8L21h
+cms6Y2xhc3M+PG1hcms6bGFiZWw+eG4tLS0tLS1uemVhYWdwZjdhemIycHBhanIzZmE8L21hcms6
+bGFiZWw+PG1hcms6bGFiZWw+eG4tLS0tLWJ0ZGFhZm5lNGE3YXpwb2FpcThlYTwvbWFyazpsYWJl
+bD48bWFyazpsYWJlbD54bi0tLS15bWNhYWVsZDFhNGE2b25haHAzZWE8L21hcms6bGFiZWw+PG1h
+cms6bGFiZWw+eG4tLW1nYmFhZGpjeTFhOG1tYWdvOGRhPC9tYXJrOmxhYmVsPjxtYXJrOmdvb2Rz
+QW5kU2VydmljZXM+2LrZitiq2KfYsTwvbWFyazpnb29kc0FuZFNlcnZpY2VzPjxtYXJrOnJlZ051
+bT4xMjM0PC9tYXJrOnJlZ051bT48bWFyazpyZWdEYXRlPjIwMTMtMDEtMDFUMDA6MDA6MDAuMDAw
+WjwvbWFyazpyZWdEYXRlPjwvbWFyazp0cmFkZW1hcms+PC9tYXJrOm1hcms+PGRzOlNpZ25hdHVy
+ZSB4bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyIgSWQ9Il8zNzQy
+MDFmYS04YzU0LTRkN2EtYTNlOS1lZWU5YzIxMzY3N2EiPjxkczpTaWduZWRJbmZvPjxkczpDYW5v
+bmljYWxpemF0aW9uTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94
+bWwtZXhjLWMxNG4jIi8+PGRzOlNpZ25hdHVyZU1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cu
+dzMub3JnLzIwMDEvMDQveG1sZHNpZy1tb3JlI3JzYS1zaGEyNTYiLz48ZHM6UmVmZXJlbmNlIFVS
+ST0iI19lODRjYmI2ZS00OTdhLTQ3Y2ItYWYxYi0zMzc3MWU3MzYxZTEiPjxkczpUcmFuc2Zvcm1z
+PjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRz
+aWcjZW52ZWxvcGVkLXNpZ25hdHVyZSIvPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8v
+d3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRp
+Z2VzdE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3No
+YTI1NiIvPjxkczpEaWdlc3RWYWx1ZT4rb2d2N243Q1lIeDlTamdnQ3UwSk5Nc294VHFTblp0UkpU
+YzV0UUFmemtjPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PGRzOlJlZmVyZW5jZSBV
+Ukk9IiNfNjYyMGY4Y2ItYjljNi00YWVlLWE4MjYtOGVkNDc1NzcxYTZiIj48ZHM6VHJhbnNmb3Jt
+cz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwt
+ZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJo
+dHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+
+aTdBU0p1TXlEQVU3eng0dXliR05DNzVQQjBDT0R3bStmaVNoKzZMZlJZRT08L2RzOkRpZ2VzdFZh
+bHVlPjwvZHM6UmVmZXJlbmNlPjwvZHM6U2lnbmVkSW5mbz48ZHM6U2lnbmF0dXJlVmFsdWUgSWQ9
+Il9kMTcxYTdiMS0xMGEzLTQ1NjItOWY4ZS1lYmFkMWQyZDgyMDAiPm5xQUxmcEJxMUZGaENpZmQ0
+bnYzeEdFMFBlMTQyS1hPaFNlZXVXRkVZNDNqclhLZ212d1NWb3BpaU84WVZnZWpxN0pIWmlDdnY4
+VEcmIzEzOwpXSUtPdnlWRzBPM2MzNkhaNE1uQ05sbHFDd0xpYTExQlhLMGRXbzRnajBWSVFNeVU1
+T3JJdjMvUkdnM2RTTVFFOTgwalo2Ui93eDdmJiMxMzsKdGdGWU9hWThvY2ZmSi9wMGN1UE9ncEx5
+d0RlcndEaHFvcnNIWnhEMmlCQnBqVWxiWEZMUlhybHpXQlRnSHVyV21ka28yNnR2N0hteiYjMTM7
+Ci8xSjdERk1LZ2owNC9ZQThxbm14Y1NlTVJZZ2ExUWowWkd5M1dzRXAzUDRUdFZ3K2svV3NZWldU
+aGFrb1lpakorS3A4MDlLZ2UwODAmIzEzOwpCU1VWR3lDNnR1NGVveGtveXFhelpaRzhzelNrMnZz
+bGJoTVZTOExCSmduWGpacGZob0pFOXZIZTB1VGo1dzZRa2k5cXVlUE8wZUloJiMxMzsKTk1CYnhV
+bjhYbmVRTVNPdE9VNy9rZ1hsdU9TRWVRaUZZWkhsM1lmM1krbGpCU1dsVm10V1I2UHZNRDJZb09J
+bEp0bzRsUHdXdGZXYSYjMTM7Cmk1Z3JZZmlRM250aC9WaHF5end2OUs0YTRzZmI1U1BxN3E0SjFz
+ZGtFdHdzWm1jY0kvRzJFTHd5VW5mUU9INUNpVW9PaTFYUWZCdnYmIzEzOwo4UjZZTk83dnFRYlgx
+bVFLUFlnVlh0TVhYSGFGUi93UE40aXBCbU5ZSHcxOTR4NFdqbWRYNFg3U2cvZHh4THd0NUFlRmNH
+MEI5anRJJiMxMzsKTFAzL29ROXBKNDZaYXdvc0RwczV6WXh2M0ZabFVHZWc2ZmtYbDJnQktIa1Fo
+SXoxdTh6OE5SK2RtMTROay8xdFpnZ2lWKy83Wlh3PTwvZHM6U2lnbmF0dXJlVmFsdWU+PGRzOktl
+eUluZm8gSWQ9Il82NjIwZjhjYi1iOWM2LTRhZWUtYTgyNi04ZWQ0NzU3NzFhNmIiPjxkczpYNTA5
+RGF0YT48ZHM6WDUwOUNlcnRpZmljYXRlPk1JSUhYekNDQlVlZ0F3SUJBZ0lVWHFJL3ZkMThDYWc5
+OG9OcGR6VjdCaXkvNkVBd0RRWUpLb1pJaHZjTkFRRU5CUUF3ZkRFTE1Ba0cmIzEzOwpBMVVFQmhN
+Q1ZWTXhQREE2QmdOVkJBb01NMGx1ZEdWeWJtVjBJRU52Y25CdmNtRjBhVzl1SUdadmNpQkJjM05w
+WjI1bFpDQk9ZVzFsJiMxMzsKY3lCaGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF3d21TVU5CVGs0
+Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5YVc1bmFHOTFjMlVnVUdscyYjMTM7CmIzUWdRMEV3SGhjTk1q
+SXhNVEUyTVRNeU9EVTVXaGNOTWpjeE1URTFNVE15T0RVNVdqQ0IwREVMTUFrR0ExVUVCaE1DUWtV
+eEVUQVAmIzEzOwpCZ05WQkFnVENFSnlkWE56Wld4ek1SSXdFQVlEVlFRSEV3bFdhV3gyYjI5eVpH
+VXhNekF4QmdOVkJBb1RLa1JsYkc5cGRIUmxJRU52JiMxMzsKYm5OMWJIUnBibWNnWVc1a0lFRmtk
+bWx6YjNKNUlFTldRa0V2VTBOU1RERStNRHdHQTFVRUF4TTFTVU5CVGs0Z1ZFMURTQ0JCZFhSbyYj
+MTM7CmIzSnBlbVZrSUZSeVlXUmxiV0Z5YXlCUWFXeHZkQ0JXWVd4cFpHRjBiM0lnVm1Gc2FXUXhK
+VEFqQmdrcWhraUc5dzBCQ1FFV0ZtSmwmIzEzOwpkRzFqYUhOdFpFQmtaV3h2YVhSMFpTNWpiMjB3
+Z2dJaU1BMEdDU3FHU0liM0RRRUJBUVVBQTRJQ0R3QXdnZ0lLQW9JQ0FRQzZGSnd6JiMxMzsKS3FR
+Vlg2ZkczL0VMUlNHV1Y5R3JLYUZNS21oV0l4ZXB3UlpONk14TXFrZDVEbllmaVQrV3A5OGpFa3Fn
+VHgyVU1iOXF1Z2NHTlY2ZyYjMTM7CjM1L0NyUWIvRi9tejNDNHNmTE51RHBTcUs5UUY4K3BhVEg2
+aFFtck9wcVYrVVR2ZGo5U01nS0d5Rml6Uzg4Q0RXTXg0dzNpNEZBS2UmIzEzOwo2TlJzSlJHVEF0
+S0R1TUhjQTRzajA4R2plM2xQV2NnRnZjUU5EVmVFQlR1T0hCRytSaGo3VjFKaU5HUC80ZXBUWFRG
+WGdQRkRnZXozJiMxMzsKWUFmeHFwYnVPNFRYNmJiWWRrMm52TUxGdkxFTmtDRll1bG5ZUHpnbkVC
+R1NNS0lhQUlsYitzY0hDdldnV2oyVExnd2gyR0pOY3pWTSYjMTM7CjFMUE1xR1MrVWtpOU1oNzk4
+MjIveG9hcjQ5OHhEeDJZeC84c3dnRU5MU2dDc1FBVzhuTWd3V242QWJZbDJSQUJYdXJheUZzbjRQ
+MVImIzEzOwp1UU5tVXAvcXJSS1J2U0pyMU9Ma0haZkZUY1NZUWFWaXVNWVBYekd6OHRtTUxsbUkv
+QjZBQ0g0QXdSTWRuWXZGTzNLSTFSQm5QS0lkJiMxMzsKd3dmVXBaNUlUSXBiQTdDR2dUeDFxeHRN
+MXdJVXI3cEhlS1A2alZlM2tkRExnKy9CWjJ4TUV0Qms1YThZN0I0djN4d0hYR1R2VjhtTiYjMTM7
+CjBBZy9TeVQvUVV5RVJoWFV5QU4yK0V3WitTUUNVeU5memlvV1E4NzhlR3lrVSs0NitCYmdJM0lJ
+cjM2WEtQd216dDBTWitLSTN0bkYmIzEzOwpUbG45bVgwS0MwaWRvajV5a3pQb0MvTUllZDBzcDRU
+aWd4RWJXTng3RUY4MFB2Ui9EREV3VlBFRWtrank2M1hGdWx4aUNRSURBUUFCJiMxMzsKbzRJQmdq
+Q0NBWDR3REFZRFZSMFRBUUgvQkFJd0FEQU9CZ05WSFE4QkFmOEVCQU1DQjRBd0hRWURWUjBPQkJZ
+RUZIbjlzMERFYTJrdiYjMTM7CmdFL2VJT1RzcW9XODVNWEZNSUc2QmdOVkhTTUVnYkl3Z2ErQUZF
+ZDdUNjU2VVpHMTBiK2ROdW1HZnpZV0JLbEZvWUdBcEg0d2ZERUwmIzEzOwpNQWtHQTFVRUJoTUNW
+Vk14UERBNkJnTlZCQW9NTTBsdWRHVnlibVYwSUVOdmNuQnZjbUYwYVc5dUlHWnZjaUJCYzNOcFoy
+NWxaQ0JPJiMxMzsKWVcxbGN5QmhibVFnVG5WdFltVnljekV2TUMwR0ExVUVBd3dtU1VOQlRrNGdW
+SEpoWkdWdFlYSnJJRU5zWldGeWFXNW5hRzkxYzJVZyYjMTM7ClVHbHNiM1FnUTBHQ0ZIcHFiVEZl
+SmNQdFVDOVh1dVBLUHNMd0RSK01NRFFHQTFVZEh3UXRNQ3N3S2FBbm9DV0dJMmgwZEhBNkx5OWom
+IzEzOwpjbXd1YVdOaGJtNHViM0puTDNSdFkyaGZjR2xzYjNRdVkzSnNNRXdHQTFVZElBUkZNRU13
+RUFZT0t3WUJCQUdDeVJzQkJZTTdEQW93JiMxMzsKTHdZSUt3WUJCUVVIQWdFd0l6QWhCZ2dyQmdF
+RkJRY0NBUllWYUhSMGNITTZMeTlqY0hNdWFXTmhibTR1YjNKbk1BMEdDU3FHU0liMyYjMTM7CkRR
+RUJEUVVBQTRJQ0FRQmRTYXQ1NnVlakxuQWpGSUY5NWRqWVdJNnMvL042WVh4c3JyTWtHQlA4RWV6
+UHloTGg2YXdQNHo3UTlRQUkmIzEzOwpRWmtZb3hybC8xeTArYnlWMnFuVFVVQ0xScEsvQkRwL2hj
+ZndQZktDQS8yUlFDSEpyYjYrejBlbkRQRlJLME5LbXdPY2RsR3RVazBtJiMxMzsKUGdXR1NLdHV3
+VnNQQWhUREp1aG9zWk9oa05mK25TT09IclFPbjFFMnJ6T3JkL2tRbHFpQ3dSSDk3OTZOcFRBK0hT
+TWZPb2JKRUVQcSYjMTM7CnRwRjdQNXFid3RsOTVVYTVPcDRBaGE3MEhIZlVGUzRCT1FLTEJWZk1a
+ZE9SK2lQb2g1T3dBSytodFlrRkNHOVAyV0h1N3dmOEVDK1cmIzEzOwo3azk2Z3ZUZDh4RTdvdW9h
+YlQyeDZZZllxRWxQSGlVL0lNOWdWeldXTC9zdllEeVNWdW9Gd0JqRE5OMWNkcTBxT1lSMXl1UzFj
+LzlEJiMxMzsKRlI3ZW83R0ZFQ3krVEJkN0lpS1JmQlZlWUdPT1BNbm9GZnhSTFdycHNXTm53RDds
+a1BrTENnRkNrKzh5RWNPUmc2MjVtbzY1ejR5NiYjMTM7Cko0Szhmb2RhN3F3bVhOUDNSUzE4b242
+Qkh0OGxRK2JYZ09IbXhJSGswYU8wcU5EcWd2THIyRmx5TEdKR2lFTVJxRE1NUjYvYTA2YnQmIzEz
+OwprblVNSGw3Q3FNZmpJa2pQNFZOTnlHUGRKZ3dWazJrZWI5dU5GdkpDeFQrTTJmR1hRMU5iSk5m
+dHY1TWdTc3A5TjF5K3g2Z0EzRWh3JiMxMzsKeUhsbUpCNFlNdG84dFRWMWk4NHhQWHhpMkNBZURh
+R0R1d29zdDhZVUNTanE3UkNLOHRHY2FBWXJrWFFZMnlRZlgzY3dEc0V4UnFWVyYjMTM7CnlyanlS
+dCtONm1LOTlRPT08L2RzOlg1MDlDZXJ0aWZpY2F0ZT48L2RzOlg1MDlEYXRhPjwvZHM6S2V5SW5m
+bz48L2RzOlNpZ25hdHVyZT48L3NtZDpzaWduZWRNYXJrPgo=
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Agent-Arab/Trademark-Agent-Arab-Revoked.smd b/core/src/test/resources/google/registry/tmch/idn/Agent-Arab/Trademark-Agent-Arab-Revoked.smd
new file mode 100644
index 000000000..f60d6032a
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Agent-Arab/Trademark-Agent-Arab-Revoked.smd
@@ -0,0 +1,122 @@
+Marks: الاختبار & لتقييم
+smdID: 000000771669082555441-65535
+U-labels: xn------nzeaagpf7azb2ppajr3fa, xn-----btdaafne4a7azpoaiq8ea, xn----ymcaaeld1a4a6onahp3ea, xn--mgbaadjcy1a8mmago8da
+notBefore: 2022-11-22T02:02:35.441Z
+notAfter: 2027-10-18T14:27:18.209Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il9iYzE3
+Y2Q3YS0xZTc4LTQ3MDMtYjg1OC00OTY0OGUyYzVlYjgiPjxzbWQ6aWQ+MDAwMDAwNzcxNjY5MDgy
+NTU1NDQxLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMjowMjozNS40NDFaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0xOFQxNDoyNzoxOC4yMDlaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
+cmFkZW1hcms+PG1hcms6aWQ+MDAwMTQ0MTUwMzA2NjE5NTE1MDMwNjYxOTUtMTwvbWFyazppZD48
+bWFyazptYXJrTmFtZT7Yp9mE2KfYrtiq2KjYp9ixICZhbXA7INmE2KrZgtmK2YrZhTwvbWFyazpt
+YXJrTmFtZT48bWFyazpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpuYW1lPtmF2YfZ
+htiv2LMg2KfZhNmF2LnZhNmI2YXYp9iq2YrYqTwvbWFyazpuYW1lPjxtYXJrOmFkZHI+PG1hcms6
+c3RyZWV0Ptis2LnZgdixINin2KjZhiDYs9mK2YbYp9ihIDc1PC9tYXJrOnN0cmVldD48bWFyazpj
+aXR5PtmF2YPZhtin2LM8L21hcms6Y2l0eT48bWFyazpwYz4yOTAwPC9tYXJrOnBjPjxtYXJrOmNj
+Pk1BPC9tYXJrOmNjPjwvbWFyazphZGRyPjwvbWFyazpob2xkZXI+PG1hcms6Y29udGFjdCB0eXBl
+PSJhZ2VudCI+PG1hcms6bmFtZT7ZhdmH2YbYr9izINin2YTZhdi52YTZiNmF2KfYqtmK2Kk8L21h
+cms6bmFtZT48bWFyazpvcmc+2YjZg9in2YTYqTwvbWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpz
+dHJlZXQ+2LTYp9ix2Lkg2KzYudmB2LEg2KfYqNmGINiz2YrZhtin2KEgNzU8L21hcms6c3RyZWV0
+PjxtYXJrOmNpdHk+2YXZg9mG2KfYszwvbWFyazpjaXR5PjxtYXJrOnBjPjI5MDA8L21hcms6cGM+
+PG1hcms6Y2M+TUE8L21hcms6Y2M+PC9tYXJrOmFkZHI+PG1hcms6dm9pY2U+KzIxMi41MjI1Mzkw
+NDA8L21hcms6dm9pY2U+PG1hcms6ZmF4PisyMTIuNTIyNTM5MDQxPC9tYXJrOmZheD48bWFyazpl
+bWFpbD50ZXN0dG1jaCtpZG5AZ21haWwuY29tPC9tYXJrOmVtYWlsPjwvbWFyazpjb250YWN0Pjxt
+YXJrOmp1cmlzZGljdGlvbj5VUzwvbWFyazpqdXJpc2RpY3Rpb24+PG1hcms6Y2xhc3M+MTU8L21h
+cms6Y2xhc3M+PG1hcms6bGFiZWw+eG4tLS0tLS1uemVhYWdwZjdhemIycHBhanIzZmE8L21hcms6
+bGFiZWw+PG1hcms6bGFiZWw+eG4tLS0tLWJ0ZGFhZm5lNGE3YXpwb2FpcThlYTwvbWFyazpsYWJl
+bD48bWFyazpsYWJlbD54bi0tLS15bWNhYWVsZDFhNGE2b25haHAzZWE8L21hcms6bGFiZWw+PG1h
+cms6bGFiZWw+eG4tLW1nYmFhZGpjeTFhOG1tYWdvOGRhPC9tYXJrOmxhYmVsPjxtYXJrOmdvb2Rz
+QW5kU2VydmljZXM+2LrZitiq2KfYsTwvbWFyazpnb29kc0FuZFNlcnZpY2VzPjxtYXJrOnJlZ051
+bT4xMjM0PC9tYXJrOnJlZ051bT48bWFyazpyZWdEYXRlPjIwMTMtMDEtMDFUMDA6MDA6MDAuMDAw
+WjwvbWFyazpyZWdEYXRlPjwvbWFyazp0cmFkZW1hcms+PC9tYXJrOm1hcms+PGRzOlNpZ25hdHVy
+ZSB4bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyIgSWQ9Il84YWY5
+N2UzYy02MGFhLTQxNGUtYTE3OS1kYmMxOTZlMWQ2YzgiPjxkczpTaWduZWRJbmZvPjxkczpDYW5v
+bmljYWxpemF0aW9uTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94
+bWwtZXhjLWMxNG4jIi8+PGRzOlNpZ25hdHVyZU1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cu
+dzMub3JnLzIwMDEvMDQveG1sZHNpZy1tb3JlI3JzYS1zaGEyNTYiLz48ZHM6UmVmZXJlbmNlIFVS
+ST0iI19iYzE3Y2Q3YS0xZTc4LTQ3MDMtYjg1OC00OTY0OGUyYzVlYjgiPjxkczpUcmFuc2Zvcm1z
+PjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRz
+aWcjZW52ZWxvcGVkLXNpZ25hdHVyZSIvPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8v
+d3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRp
+Z2VzdE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3No
+YTI1NiIvPjxkczpEaWdlc3RWYWx1ZT5aOGtGU0w1ZTY3Q29WSks1NlVxbEJMdS95dkJ6aW1MUExX
+THM4VmU1dS9jPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PGRzOlJlZmVyZW5jZSBV
+Ukk9IiNfY2M2ZGFjMTAtMmU1Yi00NzllLThjZGYtZTVlMTYyOGU4YTAwIj48ZHM6VHJhbnNmb3Jt
+cz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwt
+ZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJo
+dHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+
+ZXVzNmJsbHdQYUhiOWZvY2YxMUJXc21nbHE1UlY4bUpZUFNQOWpsanRHST08L2RzOkRpZ2VzdFZh
+bHVlPjwvZHM6UmVmZXJlbmNlPjwvZHM6U2lnbmVkSW5mbz48ZHM6U2lnbmF0dXJlVmFsdWUgSWQ9
+Il8zMjgwZDhjZS1mZGUwLTRlNjMtODhkNS0yZDhhNzBlOWY2ZDQiPlNqM3M4elVGdHRzeEV1ZWpx
+QXdMcEdwSStXSXplNXRkcTdha3A0OGpWeUVVMVpoSEFWelFQL3R6c2lkZ2JDdk9Sd0w0YUd2ZnFT
+cjUmIzEzOwoyTVVDbG9kb3N5SWRCV2V5MWJTYjl1U0RVM3QzUGpZcVdPeDdkalJvRVR1dzhEam9s
+RmhRc01VNHNZK3dicHgyVnd5bkw4cmg1NzRYJiMxMzsKSFV4eVJFaUs3OTZBVHdHbS9sY1UyQ3RT
+dXFRSHZXWFE3Yy9uUGpFeVR2REpWNmFoNFNUM1lGekM2ZWVTOHlYcnlmQkFXZWZ4bjlUZSYjMTM7
+ClVGQ2VsZGNHN0w1Y2YyWlIyMWpIQlJxV1hqanhzZlZsSFJ4clhBYm55YXdPVmlTblUyeHRQbWEr
+djM0YlIrSWVIVTJsamRTRmFGU1EmIzEzOwp4UVloNEN4ODQ3dmo2UUlja0FDa3F0MlkxK3B0b0dr
+dFlmbE52RVczU3VUTnd3Mlhkak1RY1JvV3Jkb3JMSFNLT2hNR0ZXL0xTUVdIJiMxMzsKQ0QwMVNu
+MzBySEdkOW1zMkpiQWd4UkpkSW1ZNEExeW5uMGp6LzhBcXViZzFFV2RCMVY1QmdObENMVUVVOWhR
+QnB0WlA3QmZhVUJkMSYjMTM7CmF5bGFKdTJCQkZpR2JWY3pUQkpLT3cvekRwMjZzWHZsV3VRRWZS
+eUFFMDVOMDlWRWw4d0tyeFN3dVU1c2hSSHBIL3piS1l0a0d4TmcmIzEzOwptL29XRi9JTmQ5OXlV
+M2VkdHlVYzcyRVYwanlIYlhQQUpsUCtWcklDMWgyK1haS210Zm44UEVybEFLZHZ2TlhNOHlWVXdz
+Qlk4TE5BJiMxMzsKZFp1Z1JPWEcrZFBqRzU0NXh1bnIzNlF4SDdURk9saTR3SXpWenprbE5WQWRv
+bk1zY3ZHOTduNTE2cmo0TnY0U3pTUFFWamwxeEdnPTwvZHM6U2lnbmF0dXJlVmFsdWU+PGRzOktl
+eUluZm8gSWQ9Il9jYzZkYWMxMC0yZTViLTQ3OWUtOGNkZi1lNWUxNjI4ZThhMDAiPjxkczpYNTA5
+RGF0YT48ZHM6WDUwOUNlcnRpZmljYXRlPk1JSUhYekNDQlVlZ0F3SUJBZ0lVWHFJL3ZkMThDYWc5
+OG9OcGR6VjdCaXkvNkVBd0RRWUpLb1pJaHZjTkFRRU5CUUF3ZkRFTE1Ba0cmIzEzOwpBMVVFQmhN
+Q1ZWTXhQREE2QmdOVkJBb01NMGx1ZEdWeWJtVjBJRU52Y25CdmNtRjBhVzl1SUdadmNpQkJjM05w
+WjI1bFpDQk9ZVzFsJiMxMzsKY3lCaGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF3d21TVU5CVGs0
+Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5YVc1bmFHOTFjMlVnVUdscyYjMTM7CmIzUWdRMEV3SGhjTk1q
+SXhNVEUyTVRNeU9EVTVXaGNOTWpjeE1URTFNVE15T0RVNVdqQ0IwREVMTUFrR0ExVUVCaE1DUWtV
+eEVUQVAmIzEzOwpCZ05WQkFnVENFSnlkWE56Wld4ek1SSXdFQVlEVlFRSEV3bFdhV3gyYjI5eVpH
+VXhNekF4QmdOVkJBb1RLa1JsYkc5cGRIUmxJRU52JiMxMzsKYm5OMWJIUnBibWNnWVc1a0lFRmtk
+bWx6YjNKNUlFTldRa0V2VTBOU1RERStNRHdHQTFVRUF4TTFTVU5CVGs0Z1ZFMURTQ0JCZFhSbyYj
+MTM7CmIzSnBlbVZrSUZSeVlXUmxiV0Z5YXlCUWFXeHZkQ0JXWVd4cFpHRjBiM0lnVm1Gc2FXUXhK
+VEFqQmdrcWhraUc5dzBCQ1FFV0ZtSmwmIzEzOwpkRzFqYUhOdFpFQmtaV3h2YVhSMFpTNWpiMjB3
+Z2dJaU1BMEdDU3FHU0liM0RRRUJBUVVBQTRJQ0R3QXdnZ0lLQW9JQ0FRQzZGSnd6JiMxMzsKS3FR
+Vlg2ZkczL0VMUlNHV1Y5R3JLYUZNS21oV0l4ZXB3UlpONk14TXFrZDVEbllmaVQrV3A5OGpFa3Fn
+VHgyVU1iOXF1Z2NHTlY2ZyYjMTM7CjM1L0NyUWIvRi9tejNDNHNmTE51RHBTcUs5UUY4K3BhVEg2
+aFFtck9wcVYrVVR2ZGo5U01nS0d5Rml6Uzg4Q0RXTXg0dzNpNEZBS2UmIzEzOwo2TlJzSlJHVEF0
+S0R1TUhjQTRzajA4R2plM2xQV2NnRnZjUU5EVmVFQlR1T0hCRytSaGo3VjFKaU5HUC80ZXBUWFRG
+WGdQRkRnZXozJiMxMzsKWUFmeHFwYnVPNFRYNmJiWWRrMm52TUxGdkxFTmtDRll1bG5ZUHpnbkVC
+R1NNS0lhQUlsYitzY0hDdldnV2oyVExnd2gyR0pOY3pWTSYjMTM7CjFMUE1xR1MrVWtpOU1oNzk4
+MjIveG9hcjQ5OHhEeDJZeC84c3dnRU5MU2dDc1FBVzhuTWd3V242QWJZbDJSQUJYdXJheUZzbjRQ
+MVImIzEzOwp1UU5tVXAvcXJSS1J2U0pyMU9Ma0haZkZUY1NZUWFWaXVNWVBYekd6OHRtTUxsbUkv
+QjZBQ0g0QXdSTWRuWXZGTzNLSTFSQm5QS0lkJiMxMzsKd3dmVXBaNUlUSXBiQTdDR2dUeDFxeHRN
+MXdJVXI3cEhlS1A2alZlM2tkRExnKy9CWjJ4TUV0Qms1YThZN0I0djN4d0hYR1R2VjhtTiYjMTM7
+CjBBZy9TeVQvUVV5RVJoWFV5QU4yK0V3WitTUUNVeU5memlvV1E4NzhlR3lrVSs0NitCYmdJM0lJ
+cjM2WEtQd216dDBTWitLSTN0bkYmIzEzOwpUbG45bVgwS0MwaWRvajV5a3pQb0MvTUllZDBzcDRU
+aWd4RWJXTng3RUY4MFB2Ui9EREV3VlBFRWtrank2M1hGdWx4aUNRSURBUUFCJiMxMzsKbzRJQmdq
+Q0NBWDR3REFZRFZSMFRBUUgvQkFJd0FEQU9CZ05WSFE4QkFmOEVCQU1DQjRBd0hRWURWUjBPQkJZ
+RUZIbjlzMERFYTJrdiYjMTM7CmdFL2VJT1RzcW9XODVNWEZNSUc2QmdOVkhTTUVnYkl3Z2ErQUZF
+ZDdUNjU2VVpHMTBiK2ROdW1HZnpZV0JLbEZvWUdBcEg0d2ZERUwmIzEzOwpNQWtHQTFVRUJoTUNW
+Vk14UERBNkJnTlZCQW9NTTBsdWRHVnlibVYwSUVOdmNuQnZjbUYwYVc5dUlHWnZjaUJCYzNOcFoy
+NWxaQ0JPJiMxMzsKWVcxbGN5QmhibVFnVG5WdFltVnljekV2TUMwR0ExVUVBd3dtU1VOQlRrNGdW
+SEpoWkdWdFlYSnJJRU5zWldGeWFXNW5hRzkxYzJVZyYjMTM7ClVHbHNiM1FnUTBHQ0ZIcHFiVEZl
+SmNQdFVDOVh1dVBLUHNMd0RSK01NRFFHQTFVZEh3UXRNQ3N3S2FBbm9DV0dJMmgwZEhBNkx5OWom
+IzEzOwpjbXd1YVdOaGJtNHViM0puTDNSdFkyaGZjR2xzYjNRdVkzSnNNRXdHQTFVZElBUkZNRU13
+RUFZT0t3WUJCQUdDeVJzQkJZTTdEQW93JiMxMzsKTHdZSUt3WUJCUVVIQWdFd0l6QWhCZ2dyQmdF
+RkJRY0NBUllWYUhSMGNITTZMeTlqY0hNdWFXTmhibTR1YjNKbk1BMEdDU3FHU0liMyYjMTM7CkRR
+RUJEUVVBQTRJQ0FRQmRTYXQ1NnVlakxuQWpGSUY5NWRqWVdJNnMvL042WVh4c3JyTWtHQlA4RWV6
+UHloTGg2YXdQNHo3UTlRQUkmIzEzOwpRWmtZb3hybC8xeTArYnlWMnFuVFVVQ0xScEsvQkRwL2hj
+ZndQZktDQS8yUlFDSEpyYjYrejBlbkRQRlJLME5LbXdPY2RsR3RVazBtJiMxMzsKUGdXR1NLdHV3
+VnNQQWhUREp1aG9zWk9oa05mK25TT09IclFPbjFFMnJ6T3JkL2tRbHFpQ3dSSDk3OTZOcFRBK0hT
+TWZPb2JKRUVQcSYjMTM7CnRwRjdQNXFid3RsOTVVYTVPcDRBaGE3MEhIZlVGUzRCT1FLTEJWZk1a
+ZE9SK2lQb2g1T3dBSytodFlrRkNHOVAyV0h1N3dmOEVDK1cmIzEzOwo3azk2Z3ZUZDh4RTdvdW9h
+YlQyeDZZZllxRWxQSGlVL0lNOWdWeldXTC9zdllEeVNWdW9Gd0JqRE5OMWNkcTBxT1lSMXl1UzFj
+LzlEJiMxMzsKRlI3ZW83R0ZFQ3krVEJkN0lpS1JmQlZlWUdPT1BNbm9GZnhSTFdycHNXTm53RDds
+a1BrTENnRkNrKzh5RWNPUmc2MjVtbzY1ejR5NiYjMTM7Cko0Szhmb2RhN3F3bVhOUDNSUzE4b242
+Qkh0OGxRK2JYZ09IbXhJSGswYU8wcU5EcWd2THIyRmx5TEdKR2lFTVJxRE1NUjYvYTA2YnQmIzEz
+OwprblVNSGw3Q3FNZmpJa2pQNFZOTnlHUGRKZ3dWazJrZWI5dU5GdkpDeFQrTTJmR1hRMU5iSk5m
+dHY1TWdTc3A5TjF5K3g2Z0EzRWh3JiMxMzsKeUhsbUpCNFlNdG84dFRWMWk4NHhQWHhpMkNBZURh
+R0R1d29zdDhZVUNTanE3UkNLOHRHY2FBWXJrWFFZMnlRZlgzY3dEc0V4UnFWVyYjMTM7CnlyanlS
+dCtONm1LOTlRPT08L2RzOlg1MDlDZXJ0aWZpY2F0ZT48L2RzOlg1MDlEYXRhPjwvZHM6S2V5SW5m
+bz48L2RzOlNpZ25hdHVyZT48L3NtZDpzaWduZWRNYXJrPgo=
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Agent-Arab/TreatyStatute-Agent-Arab-Active.smd b/core/src/test/resources/google/registry/tmch/idn/Agent-Arab/TreatyStatute-Agent-Arab-Active.smd
new file mode 100644
index 000000000..438801e83
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Agent-Arab/TreatyStatute-Agent-Arab-Active.smd
@@ -0,0 +1,122 @@
+Marks: الاختبار & لتقييم
+smdID: 000000781669082593608-65535
+U-labels: xn------nzeaagpf7azb2ppajr3fa, xn-----btdaafne4a7azpoaiq8ea, xn----ymcaaeld1a4a6onahp3ea, xn--mgbaadjcy1a8mmago8da
+notBefore: 2022-11-22T02:03:13.608Z
+notAfter: 2027-10-18T14:27:18.209Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il8wNzA5
+ZThkYS1hNDdmLTRlNjMtOGFiOS1kYjRkYWJmOGE3MWYiPjxzbWQ6aWQ+MDAwMDAwNzgxNjY5MDgy
+NTkzNjA4LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMjowMzoxMy42MDhaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0xOFQxNDoyNzoxOC4yMDlaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazpj
+b3VydD48bWFyazppZD4wMDAxNDQxNTAzMDY2NDE3MTUwMzA2NjQxNy0xPC9tYXJrOmlkPjxtYXJr
+Om1hcmtOYW1lPtin2YTYp9iu2KrYqNin2LEgJmFtcDsg2YTYqtmC2YrZitmFPC9tYXJrOm1hcmtO
+YW1lPjxtYXJrOmhvbGRlciBlbnRpdGxlbWVudD0ib3duZXIiPjxtYXJrOm5hbWU+2YXZh9mG2K/Y
+syDYp9mE2YXYudmE2YjZhdin2KrZitipPC9tYXJrOm5hbWU+PG1hcms6YWRkcj48bWFyazpzdHJl
+ZXQ+2KzYudmB2LEg2KfYqNmGINiz2YrZhtin2KEgNzU8L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+
+2YXZg9mG2KfYszwvbWFyazpjaXR5PjxtYXJrOnBjPjI5MDA8L21hcms6cGM+PG1hcms6Y2M+VVM8
+L21hcms6Y2M+PC9tYXJrOmFkZHI+PC9tYXJrOmhvbGRlcj48bWFyazpjb250YWN0IHR5cGU9ImFn
+ZW50Ij48bWFyazpuYW1lPtmF2YfZhtiv2LMg2KfZhNmF2LnZhNmI2YXYp9iq2YrYqTwvbWFyazpu
+YW1lPjxtYXJrOm9yZz7ZiNmD2KfZhNipPC9tYXJrOm9yZz48bWFyazphZGRyPjxtYXJrOnN0cmVl
+dD7YtNin2LHYuSDYrNi52YHYsSDYp9io2YYg2LPZitmG2KfYoSA3NTwvbWFyazpzdHJlZXQ+PG1h
+cms6Y2l0eT7ZhdmD2YbYp9izPC9tYXJrOmNpdHk+PG1hcms6cGM+MjkwMDwvbWFyazpwYz48bWFy
+azpjYz5NQTwvbWFyazpjYz48L21hcms6YWRkcj48bWFyazp2b2ljZT4rMjEyLjUyMjUzOTA0MDwv
+bWFyazp2b2ljZT48bWFyazpmYXg+KzIxMi41MjI1MzkwNDE8L21hcms6ZmF4PjxtYXJrOmVtYWls
+PnRlc3R0bWNoK2lkbkBnbWFpbC5jb208L21hcms6ZW1haWw+PC9tYXJrOmNvbnRhY3Q+PG1hcms6
+bGFiZWw+eG4tLS0tLS1uemVhYWdwZjdhemIycHBhanIzZmE8L21hcms6bGFiZWw+PG1hcms6bGFi
+ZWw+eG4tLS0tLWJ0ZGFhZm5lNGE3YXpwb2FpcThlYTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54
+bi0tLS15bWNhYWVsZDFhNGE2b25haHAzZWE8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLW1n
+YmFhZGpjeTFhOG1tYWdvOGRhPC9tYXJrOmxhYmVsPjxtYXJrOmdvb2RzQW5kU2VydmljZXM+2LrZ
+itiq2KfYsTwvbWFyazpnb29kc0FuZFNlcnZpY2VzPjxtYXJrOnJlZk51bT4xOTg8L21hcms6cmVm
+TnVtPjxtYXJrOnByb0RhdGU+MjAxNS0wOS0xNVQwMDowMDowMC4wMDBaPC9tYXJrOnByb0RhdGU+
+PG1hcms6Y2M+VVM8L21hcms6Y2M+PG1hcms6Y291cnROYW1lPtin2YTYr9in2LEg2KfZhNio2YrY
+ttin2KE8L21hcms6Y291cnROYW1lPjwvbWFyazpjb3VydD48L21hcms6bWFyaz48ZHM6U2lnbmF0
+dXJlIHhtbG5zOmRzPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjIiBJZD0iXzBk
+YTYxZDVkLTlmZjAtNDU3Ni04YmZmLTI3NjRlNTg5YmJlYSI+PGRzOlNpZ25lZEluZm8+PGRzOkNh
+bm9uaWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEw
+L3htbC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJlTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3
+dy53My5vcmcvMjAwMS8wNC94bWxkc2lnLW1vcmUjcnNhLXNoYTI1NiIvPjxkczpSZWZlcmVuY2Ug
+VVJJPSIjXzA3MDllOGRhLWE0N2YtNGU2My04YWI5LWRiNGRhYmY4YTcxZiI+PGRzOlRyYW5zZm9y
+bXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1s
+ZHNpZyNlbnZlbG9wZWQtc2lnbmF0dXJlIi8+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6
+Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6
+RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxlbmMj
+c2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPk5XVkEwZzdRczl0cTBnMzR1SUUrZjM4ZXd0c01hV1hJ
+UG93VE9iajFFNE09PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48ZHM6UmVmZXJlbmNl
+IFVSST0iI181ZWM3MjJlYS1mMWViLTQ4N2YtYTljOS1hZDYwZjIyMjE4YTgiPjxkczpUcmFuc2Zv
+cm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3ht
+bC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09
+Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1
+ZT5IT2N6OTFnVlJTZGZ2dktjVTJROFhZcVFVK1FSNTlBcUJFbHI0MmRyQkVzPTwvZHM6RGlnZXN0
+VmFsdWU+PC9kczpSZWZlcmVuY2U+PC9kczpTaWduZWRJbmZvPjxkczpTaWduYXR1cmVWYWx1ZSBJ
+ZD0iXzYwYTZmM2ExLTkwOTktNDg0NC04NGM2LWJkYTc1MDc4MjZiMiI+cVEvV3gwNXlxNkcwNVB0
+V213S3h2US9IajVNYUljY2hUcThwMk8wR1BTdjFKcCtEREdhd1JWcldZbWFYUHZyNTBidE11ZkIv
+TGU3eiYjMTM7Ck05UndyaXQzOXR1MnhOd09jTEVUU0NUajJMNGgraEI2YmxsUE1LeXBJSGFKTTB1
+UTRmc1NrU1hzT2t3dEROOUQxTjNpQVgrZDNaTHImIzEzOwpxd2pKSHlXSjJNRlJNYmNLc3dFNmZ5
+QW1qZFB4a0k1dWNFeFlYZlB3amoyc3hKNmhoN09uTExGaUZFaFRKY1lpd0U2NUw4QjZaeThCJiMx
+MzsKSlZCdHBsSjdYdzRXbk5qTHBqZE5hVlJqUytnM1JMK3h6RTRNMnEvTGpBQzIzQnJkcUREVDlX
+MmhnNnZZbjlLOFFxckpXb0ZiMk5RZyYjMTM7CjQyRk1lUzMyUjhGT2ZVMWtqTHZWekI4ejB2U0ds
+R2dnNFBuRThCS1VWSjYwb28wWSt0SlJWNDVON1A4UG9FQjV0VUJSN20zM0hCcWwmIzEzOwpDakti
+UURHYlU4UVNjQkdsVXlUMW5ENk03M3AvM2EwcW03NTU2c0JyM2VZbWVYK0ExWGZ2K1ZsajBIMjh3
+ZXhMYUJSenVRMTUrVkEvJiMxMzsKZXBPTERXYVNWbHJZTEcvNnQ1U2ZPdTh6SHRsd2xoUWJUYm9R
+UTJmeFJLaDl4Mm5jNjRONWV5UUVJeU1SdWh1cnprYkhYNmcrbUdvQiYjMTM7CmU2N0czRUVzeVB5
+Qnc5MVBXcEEyeGRpVmM3S3hGR3dUbE4vakgyczNveW5QS2Jzdmxqb1JNVmZiT1dIcjM0K3dLUVFH
+czMzODArbncmIzEzOwpRSEJodm5WNmFvR3I1K2tvSjBKbFNiTzlkTkJrbC9TeUdyQzdWbHQ1MmRK
+Qms1dStPOGJka2tGY29uZUxqQ1NvOTBKNkFUczlyMDA9PC9kczpTaWduYXR1cmVWYWx1ZT48ZHM6
+S2V5SW5mbyBJZD0iXzVlYzcyMmVhLWYxZWItNDg3Zi1hOWM5LWFkNjBmMjIyMThhOCI+PGRzOlg1
+MDlEYXRhPjxkczpYNTA5Q2VydGlmaWNhdGU+TUlJSFh6Q0NCVWVnQXdJQkFnSVVYcUkvdmQxOENh
+Zzk4b05wZHpWN0JpeS82RUF3RFFZSktvWklodmNOQVFFTkJRQXdmREVMTUFrRyYjMTM7CkExVUVC
+aE1DVlZNeFBEQTZCZ05WQkFvTU0wbHVkR1Z5Ym1WMElFTnZjbkJ2Y21GMGFXOXVJR1p2Y2lCQmMz
+TnBaMjVsWkNCT1lXMWwmIzEzOwpjeUJoYm1RZ1RuVnRZbVZ5Y3pFdk1DMEdBMVVFQXd3bVNVTkJU
+azRnVkhKaFpHVnRZWEpySUVOc1pXRnlhVzVuYUc5MWMyVWdVR2xzJiMxMzsKYjNRZ1EwRXdIaGNO
+TWpJeE1URTJNVE15T0RVNVdoY05NamN4TVRFMU1UTXlPRFU1V2pDQjBERUxNQWtHQTFVRUJoTUNR
+a1V4RVRBUCYjMTM7CkJnTlZCQWdUQ0VKeWRYTnpaV3h6TVJJd0VBWURWUVFIRXdsV2FXeDJiMjl5
+WkdVeE16QXhCZ05WQkFvVEtrUmxiRzlwZEhSbElFTnYmIzEzOwpibk4xYkhScGJtY2dZVzVrSUVG
+a2RtbHpiM0o1SUVOV1FrRXZVME5TVERFK01Ed0dBMVVFQXhNMVNVTkJUazRnVkUxRFNDQkJkWFJv
+JiMxMzsKYjNKcGVtVmtJRlJ5WVdSbGJXRnlheUJRYVd4dmRDQldZV3hwWkdGMGIzSWdWbUZzYVdR
+eEpUQWpCZ2txaGtpRzl3MEJDUUVXRm1KbCYjMTM7CmRHMWphSE50WkVCa1pXeHZhWFIwWlM1amIy
+MHdnZ0lpTUEwR0NTcUdTSWIzRFFFQkFRVUFBNElDRHdBd2dnSUtBb0lDQVFDNkZKd3omIzEzOwpL
+cVFWWDZmRzMvRUxSU0dXVjlHckthRk1LbWhXSXhlcHdSWk42TXhNcWtkNURuWWZpVCtXcDk4akVr
+cWdUeDJVTWI5cXVnY0dOVjZnJiMxMzsKMzUvQ3JRYi9GL216M0M0c2ZMTnVEcFNxSzlRRjgrcGFU
+SDZoUW1yT3BxVitVVHZkajlTTWdLR3lGaXpTODhDRFdNeDR3M2k0RkFLZSYjMTM7CjZOUnNKUkdU
+QXRLRHVNSGNBNHNqMDhHamUzbFBXY2dGdmNRTkRWZUVCVHVPSEJHK1JoajdWMUppTkdQLzRlcFRY
+VEZYZ1BGRGdlejMmIzEzOwpZQWZ4cXBidU80VFg2YmJZZGsybnZNTEZ2TEVOa0NGWXVsbllQemdu
+RUJHU01LSWFBSWxiK3NjSEN2V2dXajJUTGd3aDJHSk5jelZNJiMxMzsKMUxQTXFHUytVa2k5TWg3
+OTgyMi94b2FyNDk4eER4Mll4Lzhzd2dFTkxTZ0NzUUFXOG5NZ3dXbjZBYllsMlJBQlh1cmF5RnNu
+NFAxUiYjMTM7CnVRTm1VcC9xclJLUnZTSnIxT0xrSFpmRlRjU1lRYVZpdU1ZUFh6R3o4dG1NTGxt
+SS9CNkFDSDRBd1JNZG5ZdkZPM0tJMVJCblBLSWQmIzEzOwp3d2ZVcFo1SVRJcGJBN0NHZ1R4MXF4
+dE0xd0lVcjdwSGVLUDZqVmUza2RETGcrL0JaMnhNRXRCazVhOFk3QjR2M3h3SFhHVHZWOG1OJiMx
+MzsKMEFnL1N5VC9RVXlFUmhYVXlBTjIrRXdaK1NRQ1V5TmZ6aW9XUTg3OGVHeWtVKzQ2K0JiZ0kz
+SUlyMzZYS1B3bXp0MFNaK0tJM3RuRiYjMTM7ClRsbjltWDBLQzBpZG9qNXlrelBvQy9NSWVkMHNw
+NFRpZ3hFYldOeDdFRjgwUHZSL0RERXdWUEVFa2tqeTYzWEZ1bHhpQ1FJREFRQUImIzEzOwpvNElC
+Z2pDQ0FYNHdEQVlEVlIwVEFRSC9CQUl3QURBT0JnTlZIUThCQWY4RUJBTUNCNEF3SFFZRFZSME9C
+QllFRkhuOXMwREVhMmt2JiMxMzsKZ0UvZUlPVHNxb1c4NU1YRk1JRzZCZ05WSFNNRWdiSXdnYStB
+RkVkN1Q2NTZVWkcxMGIrZE51bUdmellXQktsRm9ZR0FwSDR3ZkRFTCYjMTM7Ck1Ba0dBMVVFQmhN
+Q1ZWTXhQREE2QmdOVkJBb01NMGx1ZEdWeWJtVjBJRU52Y25CdmNtRjBhVzl1SUdadmNpQkJjM05w
+WjI1bFpDQk8mIzEzOwpZVzFsY3lCaGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF3d21TVU5CVGs0
+Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5YVc1bmFHOTFjMlVnJiMxMzsKVUdsc2IzUWdRMEdDRkhwcWJU
+RmVKY1B0VUM5WHV1UEtQc0x3RFIrTU1EUUdBMVVkSHdRdE1Dc3dLYUFub0NXR0kyaDBkSEE2THk5
+aiYjMTM7CmNtd3VhV05oYm00dWIzSm5MM1J0WTJoZmNHbHNiM1F1WTNKc01Fd0dBMVVkSUFSRk1F
+TXdFQVlPS3dZQkJBR0N5UnNCQllNN0RBb3cmIzEzOwpMd1lJS3dZQkJRVUhBZ0V3SXpBaEJnZ3JC
+Z0VGQlFjQ0FSWVZhSFIwY0hNNkx5OWpjSE11YVdOaGJtNHViM0puTUEwR0NTcUdTSWIzJiMxMzsK
+RFFFQkRRVUFBNElDQVFCZFNhdDU2dWVqTG5BakZJRjk1ZGpZV0k2cy8vTjZZWHhzcnJNa0dCUDhF
+ZXpQeWhMaDZhd1A0ejdROVFBSSYjMTM7ClFaa1lveHJsLzF5MCtieVYycW5UVVVDTFJwSy9CRHAv
+aGNmd1BmS0NBLzJSUUNISnJiNit6MGVuRFBGUkswTkttd09jZGxHdFVrMG0mIzEzOwpQZ1dHU0t0
+dXdWc1BBaFRESnVob3NaT2hrTmYrblNPT0hyUU9uMUUycnpPcmQva1FscWlDd1JIOTc5Nk5wVEEr
+SFNNZk9vYkpFRVBxJiMxMzsKdHBGN1A1cWJ3dGw5NVVhNU9wNEFoYTcwSEhmVUZTNEJPUUtMQlZm
+TVpkT1IraVBvaDVPd0FLK2h0WWtGQ0c5UDJXSHU3d2Y4RUMrVyYjMTM7CjdrOTZndlRkOHhFN291
+b2FiVDJ4NllmWXFFbFBIaVUvSU05Z1Z6V1dML3N2WUR5U1Z1b0Z3QmpETk4xY2RxMHFPWVIxeXVT
+MWMvOUQmIzEzOwpGUjdlbzdHRkVDeStUQmQ3SWlLUmZCVmVZR09PUE1ub0ZmeFJMV3Jwc1dObndE
+N2xrUGtMQ2dGQ2srOHlFY09SZzYyNW1vNjV6NHk2JiMxMzsKSjRLOGZvZGE3cXdtWE5QM1JTMThv
+bjZCSHQ4bFErYlhnT0hteElIazBhTzBxTkRxZ3ZMcjJGbHlMR0pHaUVNUnFETU1SNi9hMDZidCYj
+MTM7CmtuVU1IbDdDcU1maklralA0Vk5OeUdQZEpnd1ZrMmtlYjl1TkZ2SkN4VCtNMmZHWFExTmJK
+TmZ0djVNZ1NzcDlOMXkreDZnQTNFaHcmIzEzOwp5SGxtSkI0WU10bzh0VFYxaTg0eFBYeGkyQ0Fl
+RGFHRHV3b3N0OFlVQ1NqcTdSQ0s4dEdjYUFZcmtYUVkyeVFmWDNjd0RzRXhScVZXJiMxMzsKeXJq
+eVJ0K042bUs5OVE9PTwvZHM6WDUwOUNlcnRpZmljYXRlPjwvZHM6WDUwOURhdGE+PC9kczpLZXlJ
+bmZvPjwvZHM6U2lnbmF0dXJlPjwvc21kOnNpZ25lZE1hcms+Cg==
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Agent-Arab/TreatyStatute-Agent-Arab-Revoked.smd b/core/src/test/resources/google/registry/tmch/idn/Agent-Arab/TreatyStatute-Agent-Arab-Revoked.smd
new file mode 100644
index 000000000..e51c84f06
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Agent-Arab/TreatyStatute-Agent-Arab-Revoked.smd
@@ -0,0 +1,122 @@
+Marks: الاختبار & لتقييم
+smdID: 000000781669082558861-65535
+U-labels: xn------nzeaagpf7azb2ppajr3fa, xn-----btdaafne4a7azpoaiq8ea, xn----ymcaaeld1a4a6onahp3ea, xn--mgbaadjcy1a8mmago8da
+notBefore: 2022-11-22T02:02:38.861Z
+notAfter: 2027-10-18T14:27:18.209Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il80NDA0
+MmNmOC0wMTUyLTQ3Y2MtOGVlYS00Y2NlMTcxMjIwMjQiPjxzbWQ6aWQ+MDAwMDAwNzgxNjY5MDgy
+NTU4ODYxLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMjowMjozOC44NjFaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0xOFQxNDoyNzoxOC4yMDlaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazpj
+b3VydD48bWFyazppZD4wMDAxNDQxNTAzMDY2NDE3MTUwMzA2NjQxNy0xPC9tYXJrOmlkPjxtYXJr
+Om1hcmtOYW1lPtin2YTYp9iu2KrYqNin2LEgJmFtcDsg2YTYqtmC2YrZitmFPC9tYXJrOm1hcmtO
+YW1lPjxtYXJrOmhvbGRlciBlbnRpdGxlbWVudD0ib3duZXIiPjxtYXJrOm5hbWU+2YXZh9mG2K/Y
+syDYp9mE2YXYudmE2YjZhdin2KrZitipPC9tYXJrOm5hbWU+PG1hcms6YWRkcj48bWFyazpzdHJl
+ZXQ+2KzYudmB2LEg2KfYqNmGINiz2YrZhtin2KEgNzU8L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+
+2YXZg9mG2KfYszwvbWFyazpjaXR5PjxtYXJrOnBjPjI5MDA8L21hcms6cGM+PG1hcms6Y2M+VVM8
+L21hcms6Y2M+PC9tYXJrOmFkZHI+PC9tYXJrOmhvbGRlcj48bWFyazpjb250YWN0IHR5cGU9ImFn
+ZW50Ij48bWFyazpuYW1lPtmF2YfZhtiv2LMg2KfZhNmF2LnZhNmI2YXYp9iq2YrYqTwvbWFyazpu
+YW1lPjxtYXJrOm9yZz7ZiNmD2KfZhNipPC9tYXJrOm9yZz48bWFyazphZGRyPjxtYXJrOnN0cmVl
+dD7YtNin2LHYuSDYrNi52YHYsSDYp9io2YYg2LPZitmG2KfYoSA3NTwvbWFyazpzdHJlZXQ+PG1h
+cms6Y2l0eT7ZhdmD2YbYp9izPC9tYXJrOmNpdHk+PG1hcms6cGM+MjkwMDwvbWFyazpwYz48bWFy
+azpjYz5NQTwvbWFyazpjYz48L21hcms6YWRkcj48bWFyazp2b2ljZT4rMjEyLjUyMjUzOTA0MDwv
+bWFyazp2b2ljZT48bWFyazpmYXg+KzIxMi41MjI1MzkwNDE8L21hcms6ZmF4PjxtYXJrOmVtYWls
+PnRlc3R0bWNoK2lkbkBnbWFpbC5jb208L21hcms6ZW1haWw+PC9tYXJrOmNvbnRhY3Q+PG1hcms6
+bGFiZWw+eG4tLS0tLS1uemVhYWdwZjdhemIycHBhanIzZmE8L21hcms6bGFiZWw+PG1hcms6bGFi
+ZWw+eG4tLS0tLWJ0ZGFhZm5lNGE3YXpwb2FpcThlYTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54
+bi0tLS15bWNhYWVsZDFhNGE2b25haHAzZWE8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLW1n
+YmFhZGpjeTFhOG1tYWdvOGRhPC9tYXJrOmxhYmVsPjxtYXJrOmdvb2RzQW5kU2VydmljZXM+2LrZ
+itiq2KfYsTwvbWFyazpnb29kc0FuZFNlcnZpY2VzPjxtYXJrOnJlZk51bT4xOTg8L21hcms6cmVm
+TnVtPjxtYXJrOnByb0RhdGU+MjAxNS0wOS0xNVQwMDowMDowMC4wMDBaPC9tYXJrOnByb0RhdGU+
+PG1hcms6Y2M+VVM8L21hcms6Y2M+PG1hcms6Y291cnROYW1lPtin2YTYr9in2LEg2KfZhNio2YrY
+ttin2KE8L21hcms6Y291cnROYW1lPjwvbWFyazpjb3VydD48L21hcms6bWFyaz48ZHM6U2lnbmF0
+dXJlIHhtbG5zOmRzPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjIiBJZD0iXzY1
+NGJiNjkxLWY3OTgtNDcwNC1iZjhkLWI5ZjRkNjkyZTgwMyI+PGRzOlNpZ25lZEluZm8+PGRzOkNh
+bm9uaWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEw
+L3htbC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJlTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3
+dy53My5vcmcvMjAwMS8wNC94bWxkc2lnLW1vcmUjcnNhLXNoYTI1NiIvPjxkczpSZWZlcmVuY2Ug
+VVJJPSIjXzQ0MDQyY2Y4LTAxNTItNDdjYy04ZWVhLTRjY2UxNzEyMjAyNCI+PGRzOlRyYW5zZm9y
+bXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1s
+ZHNpZyNlbnZlbG9wZWQtc2lnbmF0dXJlIi8+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6
+Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6
+RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxlbmMj
+c2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPmlIOW9oaEFteWJkdDRma3dIL0NlYVZXVTlHNHNIWnRq
+d1lNck9hdGdOWTA9PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48ZHM6UmVmZXJlbmNl
+IFVSST0iI18zMTM1NmNlYS02YjY0LTQwYTktYmI4MC1iYTViZGYzZjM3NzMiPjxkczpUcmFuc2Zv
+cm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3ht
+bC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09
+Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1
+ZT5wODFHM0dZamxoR2l6K1Q0Vk5XTWxDTGRaTmVjZ2VjZUk5UXI5Wkx6bjQ0PTwvZHM6RGlnZXN0
+VmFsdWU+PC9kczpSZWZlcmVuY2U+PC9kczpTaWduZWRJbmZvPjxkczpTaWduYXR1cmVWYWx1ZSBJ
+ZD0iX2M0MDExY2U4LWIxMGItNDIwYi1iMTM1LWZiNzc2ZGI4ZjkwZSI+V1UxYUc2QWdYK3pxWDEx
+ekkxN2ZFZk5WWjZYQTQwcy9EWHUxS3RmcXlUTEhUOGhDQVdGUW1GbVBRZGU0WW5rd2RJdnMzbFov
+ZE9sQyYjMTM7CnZGQTVXV0ZaNGpiWVBJYTd0SzJPelZiMzZhc21tK0xiOUF3RW16eXVVMzNtK0gy
+d25UQUpEcFhtTnFTbmdrZHJUMGpqSTBDR09PVjcmIzEzOwpRcDJ6WmdxeE9taHFrZ3RlaFRHdTBj
+QTd4OHNDWHl6WndncUlySzQzRjRIZ3hCUjVrS1hjUjVTczdzcldSbG5GWnVPUkNZV0V5VEU3JiMx
+MzsKUlg4NG5kczVTZUNTNWx4MjVJQWZCdllrRlJUeXltSlN3SlNBVVF0bitCMXZWdUM1ZHRmVXJv
+TVpIdThZTGFkc1pnaFVIb0hIUzNIbyYjMTM7CnJ1TE1nQXpOQy9hVTRROXNteURBRFhIaCtsMXgv
+c1BhcU9yQzliemt0azJwWXVMSVg2MVAvQUNWTE5WbUdWTlV6QXdkbjNZUElHWnkmIzEzOworSXhp
+ckpiYnNBVW1SajFSVTdCQnIxSklnWXh4TkU3UXY1MjlyWTRNbWxkUGEzMXdVVStjODFOVndXdEhm
+MThZNDRoN25rcVFWRjZqJiMxMzsKaVhWNGNCQ1NKS1VnbXVtdWVkV2xPM0pob0I3QUpmV3l5RDdh
+eERKYzNvOGdYdGNrdnlMd0IvVWhhMkE2cURMWGEvMEVTWlhYZlNhYiYjMTM7CnFzRzliVitwVUUv
+cmwwakMrVGZHVmwzZDdzaElKakptd1Uvb0ZZR3NSV05POUhYZDZHcTBsSHFuNGNnWmZoQ2U1SXhI
+Um91RWp5ZXQmIzEzOwo5TndpYmJiSkVNbm9NQjNoS1poRW53eUpMY25BNHV1VE5PbUdzUDNCUmFB
+Q2xhUW5XdU1yQitUYVVFNmVXeDdFZTY3Rk1vSzJ6dVE9PC9kczpTaWduYXR1cmVWYWx1ZT48ZHM6
+S2V5SW5mbyBJZD0iXzMxMzU2Y2VhLTZiNjQtNDBhOS1iYjgwLWJhNWJkZjNmMzc3MyI+PGRzOlg1
+MDlEYXRhPjxkczpYNTA5Q2VydGlmaWNhdGU+TUlJSFh6Q0NCVWVnQXdJQkFnSVVYcUkvdmQxOENh
+Zzk4b05wZHpWN0JpeS82RUF3RFFZSktvWklodmNOQVFFTkJRQXdmREVMTUFrRyYjMTM7CkExVUVC
+aE1DVlZNeFBEQTZCZ05WQkFvTU0wbHVkR1Z5Ym1WMElFTnZjbkJ2Y21GMGFXOXVJR1p2Y2lCQmMz
+TnBaMjVsWkNCT1lXMWwmIzEzOwpjeUJoYm1RZ1RuVnRZbVZ5Y3pFdk1DMEdBMVVFQXd3bVNVTkJU
+azRnVkhKaFpHVnRZWEpySUVOc1pXRnlhVzVuYUc5MWMyVWdVR2xzJiMxMzsKYjNRZ1EwRXdIaGNO
+TWpJeE1URTJNVE15T0RVNVdoY05NamN4TVRFMU1UTXlPRFU1V2pDQjBERUxNQWtHQTFVRUJoTUNR
+a1V4RVRBUCYjMTM7CkJnTlZCQWdUQ0VKeWRYTnpaV3h6TVJJd0VBWURWUVFIRXdsV2FXeDJiMjl5
+WkdVeE16QXhCZ05WQkFvVEtrUmxiRzlwZEhSbElFTnYmIzEzOwpibk4xYkhScGJtY2dZVzVrSUVG
+a2RtbHpiM0o1SUVOV1FrRXZVME5TVERFK01Ed0dBMVVFQXhNMVNVTkJUazRnVkUxRFNDQkJkWFJv
+JiMxMzsKYjNKcGVtVmtJRlJ5WVdSbGJXRnlheUJRYVd4dmRDQldZV3hwWkdGMGIzSWdWbUZzYVdR
+eEpUQWpCZ2txaGtpRzl3MEJDUUVXRm1KbCYjMTM7CmRHMWphSE50WkVCa1pXeHZhWFIwWlM1amIy
+MHdnZ0lpTUEwR0NTcUdTSWIzRFFFQkFRVUFBNElDRHdBd2dnSUtBb0lDQVFDNkZKd3omIzEzOwpL
+cVFWWDZmRzMvRUxSU0dXVjlHckthRk1LbWhXSXhlcHdSWk42TXhNcWtkNURuWWZpVCtXcDk4akVr
+cWdUeDJVTWI5cXVnY0dOVjZnJiMxMzsKMzUvQ3JRYi9GL216M0M0c2ZMTnVEcFNxSzlRRjgrcGFU
+SDZoUW1yT3BxVitVVHZkajlTTWdLR3lGaXpTODhDRFdNeDR3M2k0RkFLZSYjMTM7CjZOUnNKUkdU
+QXRLRHVNSGNBNHNqMDhHamUzbFBXY2dGdmNRTkRWZUVCVHVPSEJHK1JoajdWMUppTkdQLzRlcFRY
+VEZYZ1BGRGdlejMmIzEzOwpZQWZ4cXBidU80VFg2YmJZZGsybnZNTEZ2TEVOa0NGWXVsbllQemdu
+RUJHU01LSWFBSWxiK3NjSEN2V2dXajJUTGd3aDJHSk5jelZNJiMxMzsKMUxQTXFHUytVa2k5TWg3
+OTgyMi94b2FyNDk4eER4Mll4Lzhzd2dFTkxTZ0NzUUFXOG5NZ3dXbjZBYllsMlJBQlh1cmF5RnNu
+NFAxUiYjMTM7CnVRTm1VcC9xclJLUnZTSnIxT0xrSFpmRlRjU1lRYVZpdU1ZUFh6R3o4dG1NTGxt
+SS9CNkFDSDRBd1JNZG5ZdkZPM0tJMVJCblBLSWQmIzEzOwp3d2ZVcFo1SVRJcGJBN0NHZ1R4MXF4
+dE0xd0lVcjdwSGVLUDZqVmUza2RETGcrL0JaMnhNRXRCazVhOFk3QjR2M3h3SFhHVHZWOG1OJiMx
+MzsKMEFnL1N5VC9RVXlFUmhYVXlBTjIrRXdaK1NRQ1V5TmZ6aW9XUTg3OGVHeWtVKzQ2K0JiZ0kz
+SUlyMzZYS1B3bXp0MFNaK0tJM3RuRiYjMTM7ClRsbjltWDBLQzBpZG9qNXlrelBvQy9NSWVkMHNw
+NFRpZ3hFYldOeDdFRjgwUHZSL0RERXdWUEVFa2tqeTYzWEZ1bHhpQ1FJREFRQUImIzEzOwpvNElC
+Z2pDQ0FYNHdEQVlEVlIwVEFRSC9CQUl3QURBT0JnTlZIUThCQWY4RUJBTUNCNEF3SFFZRFZSME9C
+QllFRkhuOXMwREVhMmt2JiMxMzsKZ0UvZUlPVHNxb1c4NU1YRk1JRzZCZ05WSFNNRWdiSXdnYStB
+RkVkN1Q2NTZVWkcxMGIrZE51bUdmellXQktsRm9ZR0FwSDR3ZkRFTCYjMTM7Ck1Ba0dBMVVFQmhN
+Q1ZWTXhQREE2QmdOVkJBb01NMGx1ZEdWeWJtVjBJRU52Y25CdmNtRjBhVzl1SUdadmNpQkJjM05w
+WjI1bFpDQk8mIzEzOwpZVzFsY3lCaGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF3d21TVU5CVGs0
+Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5YVc1bmFHOTFjMlVnJiMxMzsKVUdsc2IzUWdRMEdDRkhwcWJU
+RmVKY1B0VUM5WHV1UEtQc0x3RFIrTU1EUUdBMVVkSHdRdE1Dc3dLYUFub0NXR0kyaDBkSEE2THk5
+aiYjMTM7CmNtd3VhV05oYm00dWIzSm5MM1J0WTJoZmNHbHNiM1F1WTNKc01Fd0dBMVVkSUFSRk1F
+TXdFQVlPS3dZQkJBR0N5UnNCQllNN0RBb3cmIzEzOwpMd1lJS3dZQkJRVUhBZ0V3SXpBaEJnZ3JC
+Z0VGQlFjQ0FSWVZhSFIwY0hNNkx5OWpjSE11YVdOaGJtNHViM0puTUEwR0NTcUdTSWIzJiMxMzsK
+RFFFQkRRVUFBNElDQVFCZFNhdDU2dWVqTG5BakZJRjk1ZGpZV0k2cy8vTjZZWHhzcnJNa0dCUDhF
+ZXpQeWhMaDZhd1A0ejdROVFBSSYjMTM7ClFaa1lveHJsLzF5MCtieVYycW5UVVVDTFJwSy9CRHAv
+aGNmd1BmS0NBLzJSUUNISnJiNit6MGVuRFBGUkswTkttd09jZGxHdFVrMG0mIzEzOwpQZ1dHU0t0
+dXdWc1BBaFRESnVob3NaT2hrTmYrblNPT0hyUU9uMUUycnpPcmQva1FscWlDd1JIOTc5Nk5wVEEr
+SFNNZk9vYkpFRVBxJiMxMzsKdHBGN1A1cWJ3dGw5NVVhNU9wNEFoYTcwSEhmVUZTNEJPUUtMQlZm
+TVpkT1IraVBvaDVPd0FLK2h0WWtGQ0c5UDJXSHU3d2Y4RUMrVyYjMTM7CjdrOTZndlRkOHhFN291
+b2FiVDJ4NllmWXFFbFBIaVUvSU05Z1Z6V1dML3N2WUR5U1Z1b0Z3QmpETk4xY2RxMHFPWVIxeXVT
+MWMvOUQmIzEzOwpGUjdlbzdHRkVDeStUQmQ3SWlLUmZCVmVZR09PUE1ub0ZmeFJMV3Jwc1dObndE
+N2xrUGtMQ2dGQ2srOHlFY09SZzYyNW1vNjV6NHk2JiMxMzsKSjRLOGZvZGE3cXdtWE5QM1JTMThv
+bjZCSHQ4bFErYlhnT0hteElIazBhTzBxTkRxZ3ZMcjJGbHlMR0pHaUVNUnFETU1SNi9hMDZidCYj
+MTM7CmtuVU1IbDdDcU1maklralA0Vk5OeUdQZEpnd1ZrMmtlYjl1TkZ2SkN4VCtNMmZHWFExTmJK
+TmZ0djVNZ1NzcDlOMXkreDZnQTNFaHcmIzEzOwp5SGxtSkI0WU10bzh0VFYxaTg0eFBYeGkyQ0Fl
+RGFHRHV3b3N0OFlVQ1NqcTdSQ0s4dEdjYUFZcmtYUVkyeVFmWDNjd0RzRXhScVZXJiMxMzsKeXJq
+eVJ0K042bUs5OVE9PTwvZHM6WDUwOUNlcnRpZmljYXRlPjwvZHM6WDUwOURhdGE+PC9kczpLZXlJ
+bmZvPjwvZHM6U2lnbmF0dXJlPjwvc21kOnNpZ25lZE1hcms+Cg==
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Agent-Chinese/Court-Agent-Chinese-Active.smd b/core/src/test/resources/google/registry/tmch/idn/Agent-Chinese/Court-Agent-Chinese-Active.smd
new file mode 100644
index 000000000..b4707d602
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Agent-Chinese/Court-Agent-Chinese-Active.smd
@@ -0,0 +1,119 @@
+Marks: 标记&记录
+smdID: 000000791669082841160-65535
+U-labels: xn----kw3bu0xlr2bba, xn--and-vj3ft79a885cda, xn--w2t96qr64aa
+notBefore: 2022-11-22T02:07:21.160Z
+notAfter: 2027-10-18T14:36:50.931Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il82NzAw
+MGI1MC1mNmU1LTRlOTEtOGM4NS1mMzZjMDI3ZDQ3MDQiPjxzbWQ6aWQ+MDAwMDAwNzkxNjY5MDgy
+ODQxMTYwLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMjowNzoyMS4xNjBaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0xOFQxNDozNjo1MC45MzFaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazpj
+b3VydD48bWFyazppZD4wMDAxNDYxNTAzMDY2NjMxMTUwMzA2NjYzMS0xPC9tYXJrOmlkPjxtYXJr
+Om1hcmtOYW1lPuagh+iusCZhbXA76K6w5b2VPC9tYXJrOm1hcmtOYW1lPjxtYXJrOmhvbGRlciBl
+bnRpdGxlbWVudD0ib3duZXIiPjxtYXJrOm9yZz7lt6XnqIvlpIQ8L21hcms6b3JnPjxtYXJrOmFk
+ZHI+PG1hcms6c3RyZWV0Pummmea4r+S4nOi3rzblj7fvvIw15Y+35qW877yMOOWPt+WupDwvbWFy
+azpzdHJlZXQ+PG1hcms6Y2l0eT7pnZLlspvluII8L21hcms6Y2l0eT48bWFyazpwYz4zNTAwPC9t
+YXJrOnBjPjxtYXJrOmNjPkNOPC9tYXJrOmNjPjwvbWFyazphZGRyPjwvbWFyazpob2xkZXI+PG1h
+cms6Y29udGFjdCB0eXBlPSJhZ2VudCI+PG1hcms6bmFtZT7mnY7lsI/mlrk8L21hcms6bmFtZT48
+bWFyazpvcmc+5bel56iL5aSEPC9tYXJrOm9yZz48bWFyazphZGRyPjxtYXJrOnN0cmVldD7pppnm
+uK/kuJzot6825Y+377yMNeWPt+alvO+8jDjlj7flrqQ8L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+
+6Z2S5bKb5biCPC9tYXJrOmNpdHk+PG1hcms6cGM+MzUwMDwvbWFyazpwYz48bWFyazpjYz5DTjwv
+bWFyazpjYz48L21hcms6YWRkcj48bWFyazp2b2ljZT4rODYuMTA4NDY1NzE3MzwvbWFyazp2b2lj
+ZT48bWFyazpmYXg+Kzg2LjEwODQ2NTcxNzU8L21hcms6ZmF4PjxtYXJrOmVtYWlsPmluZm9AY2hp
+bmVzZS1hZ2VuY3kuY29tPC9tYXJrOmVtYWlsPjwvbWFyazpjb250YWN0PjxtYXJrOmxhYmVsPnhu
+LS0tLWt3M2J1MHhscjJiYmE8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLWFuZC12ajNmdDc5
+YTg4NWNkYTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tdzJ0OTZxcjY0YWE8L21hcms6bGFi
+ZWw+PG1hcms6Z29vZHNBbmRTZXJ2aWNlcz4g5ZCJ5LuWPC9tYXJrOmdvb2RzQW5kU2VydmljZXM+
+PG1hcms6cmVmTnVtPjEyMzQ8L21hcms6cmVmTnVtPjxtYXJrOnByb0RhdGU+MjAxMy0wMS0wMVQw
+MDowMDowMC4wMDBaPC9tYXJrOnByb0RhdGU+PG1hcms6Y2M+VVM8L21hcms6Y2M+PG1hcms6Y291
+cnROYW1lPkhvdmU8L21hcms6Y291cnROYW1lPjwvbWFyazpjb3VydD48L21hcms6bWFyaz48ZHM6
+U2lnbmF0dXJlIHhtbG5zOmRzPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjIiBJ
+ZD0iX2MzZTAwNTNkLTFiMjUtNDIyMy1hZDIwLTFiYTU3ODNkM2M1NyI+PGRzOlNpZ25lZEluZm8+
+PGRzOkNhbm9uaWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8y
+MDAxLzEwL3htbC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJlTWV0aG9kIEFsZ29yaXRobT0iaHR0
+cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxkc2lnLW1vcmUjcnNhLXNoYTI1NiIvPjxkczpSZWZl
+cmVuY2UgVVJJPSIjXzY3MDAwYjUwLWY2ZTUtNGU5MS04Yzg1LWYzNmMwMjdkNDcwNCI+PGRzOlRy
+YW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDAv
+MDkveG1sZHNpZyNlbnZlbG9wZWQtc2lnbmF0dXJlIi8+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09
+Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jt
+cz48ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94
+bWxlbmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPnlONE1sUFNqUG52dURKSTJzb3lVRDlkNnZD
+ODErUTBLdC9rU2VHNXkwV3c9PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48ZHM6UmVm
+ZXJlbmNlIFVSST0iI19hMGNkYzgxMi00NzAxLTRiNjUtOTBmNi04NWVlN2Y0YjhmOGMiPjxkczpU
+cmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAx
+LzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdv
+cml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdl
+c3RWYWx1ZT50OThma2NLaHdubTRneXFRckw2elFvNS9TVmFYTWx6T3g1MkNQZ05WemVVPTwvZHM6
+RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PC9kczpTaWduZWRJbmZvPjxkczpTaWduYXR1cmVW
+YWx1ZSBJZD0iXzYxOTllMTllLTIwMDYtNGUzNS1iYTRkLTRjZTZjMThhMWI3MCI+TjhrdU01VDNz
+a3VYNmtKS25IWnZyckdUb3VmTzM4dmVidEk0blpRS21Pc2kwQ1VRRnVpQS9ZeHNWMjY2SkpOQ2hR
+REYrTUhQVUVYZiYjMTM7ClBXNVZPWEVSWVJOU3ZKZUg2Y08yYmpidGhweDByTEhzZzV2S1VIdE9o
+OHZkakQ4TVVTQWI5N1Q3ZSt1NjNEWjhCdzE0MjlpVHhXQXMmIzEzOwphb1Zra2RDZ0VBTXpRTWpE
+OEZOVEN0a2JHZjZTSkpKVEQwUEFPTGM1ckh6TGxXZHBkV0lzbWw1QlN0d0VLd21QeFRvZGlMTTA2
+dm1zJiMxMzsKL0hBQkVSb0JPaG9MR2xUSEswMzhIak9tSTJyaEowSlpMdi85ZnRYRG1IUUdpcG5R
+Vk1NS3JnZFRTdTZ6ek9lTWJZZ1BWTDM5NmVZMiYjMTM7CnFqOWFKVFJhcGF0aXB1U3M3bXV0SVRX
+bm13eUhlV0ZPb2RqbjJUc014SXVmTllVbVVBclFpbkU3US8xSUMwbU5RZUF5ejdScmVZTDQmIzEz
+OwpTUExLQUxQQnFJVkh5YmdFYWVLWXptQ2U2Ujc0Y2dZK0tCNGdKYkF4cnVIWnQrRFcyT1JPUFQ5
+cDZOVEZMME1sZGQ4YVUzYitxN0dVJiMxMzsKVUtwdlJyWmJ1UGJQUzBCUE81ZlNrUkJtSm5lUkhC
+bDd3WXZoZiszZ0FyMDhJOU1OVkNMTU9xdEx6THZFM3hhcVdkaWlSWDAwRHFVSiYjMTM7ClliZnBR
+WWlHK21yaEZUbDFlS3NyN09pODA1bHNlTlNnTWRBQTR2M1dlbzY0WldiclJFL0xvcFBPME9rZXYw
+TlU1cm56bXdlYUpNUnUmIzEzOwpzbUlweTdVZmNodkx2eWh3RmpJYnViV3NSK3JyR00wYjV6cDF1
+NlUzazltSVhKT2NoYkFNOUtvSFJDdllVSDFWVk5Cd2JpTzFsS3M9PC9kczpTaWduYXR1cmVWYWx1
+ZT48ZHM6S2V5SW5mbyBJZD0iX2EwY2RjODEyLTQ3MDEtNGI2NS05MGY2LTg1ZWU3ZjRiOGY4YyI+
+PGRzOlg1MDlEYXRhPjxkczpYNTA5Q2VydGlmaWNhdGU+TUlJSFh6Q0NCVWVnQXdJQkFnSVVYcUkv
+dmQxOENhZzk4b05wZHpWN0JpeS82RUF3RFFZSktvWklodmNOQVFFTkJRQXdmREVMTUFrRyYjMTM7
+CkExVUVCaE1DVlZNeFBEQTZCZ05WQkFvTU0wbHVkR1Z5Ym1WMElFTnZjbkJ2Y21GMGFXOXVJR1p2
+Y2lCQmMzTnBaMjVsWkNCT1lXMWwmIzEzOwpjeUJoYm1RZ1RuVnRZbVZ5Y3pFdk1DMEdBMVVFQXd3
+bVNVTkJUazRnVkhKaFpHVnRZWEpySUVOc1pXRnlhVzVuYUc5MWMyVWdVR2xzJiMxMzsKYjNRZ1Ew
+RXdIaGNOTWpJeE1URTJNVE15T0RVNVdoY05NamN4TVRFMU1UTXlPRFU1V2pDQjBERUxNQWtHQTFV
+RUJoTUNRa1V4RVRBUCYjMTM7CkJnTlZCQWdUQ0VKeWRYTnpaV3h6TVJJd0VBWURWUVFIRXdsV2FX
+eDJiMjl5WkdVeE16QXhCZ05WQkFvVEtrUmxiRzlwZEhSbElFTnYmIzEzOwpibk4xYkhScGJtY2dZ
+VzVrSUVGa2RtbHpiM0o1SUVOV1FrRXZVME5TVERFK01Ed0dBMVVFQXhNMVNVTkJUazRnVkUxRFND
+QkJkWFJvJiMxMzsKYjNKcGVtVmtJRlJ5WVdSbGJXRnlheUJRYVd4dmRDQldZV3hwWkdGMGIzSWdW
+bUZzYVdReEpUQWpCZ2txaGtpRzl3MEJDUUVXRm1KbCYjMTM7CmRHMWphSE50WkVCa1pXeHZhWFIw
+WlM1amIyMHdnZ0lpTUEwR0NTcUdTSWIzRFFFQkFRVUFBNElDRHdBd2dnSUtBb0lDQVFDNkZKd3om
+IzEzOwpLcVFWWDZmRzMvRUxSU0dXVjlHckthRk1LbWhXSXhlcHdSWk42TXhNcWtkNURuWWZpVCtX
+cDk4akVrcWdUeDJVTWI5cXVnY0dOVjZnJiMxMzsKMzUvQ3JRYi9GL216M0M0c2ZMTnVEcFNxSzlR
+RjgrcGFUSDZoUW1yT3BxVitVVHZkajlTTWdLR3lGaXpTODhDRFdNeDR3M2k0RkFLZSYjMTM7CjZO
+UnNKUkdUQXRLRHVNSGNBNHNqMDhHamUzbFBXY2dGdmNRTkRWZUVCVHVPSEJHK1JoajdWMUppTkdQ
+LzRlcFRYVEZYZ1BGRGdlejMmIzEzOwpZQWZ4cXBidU80VFg2YmJZZGsybnZNTEZ2TEVOa0NGWXVs
+bllQemduRUJHU01LSWFBSWxiK3NjSEN2V2dXajJUTGd3aDJHSk5jelZNJiMxMzsKMUxQTXFHUytV
+a2k5TWg3OTgyMi94b2FyNDk4eER4Mll4Lzhzd2dFTkxTZ0NzUUFXOG5NZ3dXbjZBYllsMlJBQlh1
+cmF5RnNuNFAxUiYjMTM7CnVRTm1VcC9xclJLUnZTSnIxT0xrSFpmRlRjU1lRYVZpdU1ZUFh6R3o4
+dG1NTGxtSS9CNkFDSDRBd1JNZG5ZdkZPM0tJMVJCblBLSWQmIzEzOwp3d2ZVcFo1SVRJcGJBN0NH
+Z1R4MXF4dE0xd0lVcjdwSGVLUDZqVmUza2RETGcrL0JaMnhNRXRCazVhOFk3QjR2M3h3SFhHVHZW
+OG1OJiMxMzsKMEFnL1N5VC9RVXlFUmhYVXlBTjIrRXdaK1NRQ1V5TmZ6aW9XUTg3OGVHeWtVKzQ2
+K0JiZ0kzSUlyMzZYS1B3bXp0MFNaK0tJM3RuRiYjMTM7ClRsbjltWDBLQzBpZG9qNXlrelBvQy9N
+SWVkMHNwNFRpZ3hFYldOeDdFRjgwUHZSL0RERXdWUEVFa2tqeTYzWEZ1bHhpQ1FJREFRQUImIzEz
+OwpvNElCZ2pDQ0FYNHdEQVlEVlIwVEFRSC9CQUl3QURBT0JnTlZIUThCQWY4RUJBTUNCNEF3SFFZ
+RFZSME9CQllFRkhuOXMwREVhMmt2JiMxMzsKZ0UvZUlPVHNxb1c4NU1YRk1JRzZCZ05WSFNNRWdi
+SXdnYStBRkVkN1Q2NTZVWkcxMGIrZE51bUdmellXQktsRm9ZR0FwSDR3ZkRFTCYjMTM7Ck1Ba0dB
+MVVFQmhNQ1ZWTXhQREE2QmdOVkJBb01NMGx1ZEdWeWJtVjBJRU52Y25CdmNtRjBhVzl1SUdadmNp
+QkJjM05wWjI1bFpDQk8mIzEzOwpZVzFsY3lCaGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF3d21T
+VU5CVGs0Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5YVc1bmFHOTFjMlVnJiMxMzsKVUdsc2IzUWdRMEdD
+RkhwcWJURmVKY1B0VUM5WHV1UEtQc0x3RFIrTU1EUUdBMVVkSHdRdE1Dc3dLYUFub0NXR0kyaDBk
+SEE2THk5aiYjMTM7CmNtd3VhV05oYm00dWIzSm5MM1J0WTJoZmNHbHNiM1F1WTNKc01Fd0dBMVVk
+SUFSRk1FTXdFQVlPS3dZQkJBR0N5UnNCQllNN0RBb3cmIzEzOwpMd1lJS3dZQkJRVUhBZ0V3SXpB
+aEJnZ3JCZ0VGQlFjQ0FSWVZhSFIwY0hNNkx5OWpjSE11YVdOaGJtNHViM0puTUEwR0NTcUdTSWIz
+JiMxMzsKRFFFQkRRVUFBNElDQVFCZFNhdDU2dWVqTG5BakZJRjk1ZGpZV0k2cy8vTjZZWHhzcnJN
+a0dCUDhFZXpQeWhMaDZhd1A0ejdROVFBSSYjMTM7ClFaa1lveHJsLzF5MCtieVYycW5UVVVDTFJw
+Sy9CRHAvaGNmd1BmS0NBLzJSUUNISnJiNit6MGVuRFBGUkswTkttd09jZGxHdFVrMG0mIzEzOwpQ
+Z1dHU0t0dXdWc1BBaFRESnVob3NaT2hrTmYrblNPT0hyUU9uMUUycnpPcmQva1FscWlDd1JIOTc5
+Nk5wVEErSFNNZk9vYkpFRVBxJiMxMzsKdHBGN1A1cWJ3dGw5NVVhNU9wNEFoYTcwSEhmVUZTNEJP
+UUtMQlZmTVpkT1IraVBvaDVPd0FLK2h0WWtGQ0c5UDJXSHU3d2Y4RUMrVyYjMTM7CjdrOTZndlRk
+OHhFN291b2FiVDJ4NllmWXFFbFBIaVUvSU05Z1Z6V1dML3N2WUR5U1Z1b0Z3QmpETk4xY2RxMHFP
+WVIxeXVTMWMvOUQmIzEzOwpGUjdlbzdHRkVDeStUQmQ3SWlLUmZCVmVZR09PUE1ub0ZmeFJMV3Jw
+c1dObndEN2xrUGtMQ2dGQ2srOHlFY09SZzYyNW1vNjV6NHk2JiMxMzsKSjRLOGZvZGE3cXdtWE5Q
+M1JTMThvbjZCSHQ4bFErYlhnT0hteElIazBhTzBxTkRxZ3ZMcjJGbHlMR0pHaUVNUnFETU1SNi9h
+MDZidCYjMTM7CmtuVU1IbDdDcU1maklralA0Vk5OeUdQZEpnd1ZrMmtlYjl1TkZ2SkN4VCtNMmZH
+WFExTmJKTmZ0djVNZ1NzcDlOMXkreDZnQTNFaHcmIzEzOwp5SGxtSkI0WU10bzh0VFYxaTg0eFBY
+eGkyQ0FlRGFHRHV3b3N0OFlVQ1NqcTdSQ0s4dEdjYUFZcmtYUVkyeVFmWDNjd0RzRXhScVZXJiMx
+MzsKeXJqeVJ0K042bUs5OVE9PTwvZHM6WDUwOUNlcnRpZmljYXRlPjwvZHM6WDUwOURhdGE+PC9k
+czpLZXlJbmZvPjwvZHM6U2lnbmF0dXJlPjwvc21kOnNpZ25lZE1hcms+Cg==
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Agent-Chinese/Court-Agent-Chinese-Revoked.smd b/core/src/test/resources/google/registry/tmch/idn/Agent-Chinese/Court-Agent-Chinese-Revoked.smd
new file mode 100644
index 000000000..804797945
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Agent-Chinese/Court-Agent-Chinese-Revoked.smd
@@ -0,0 +1,119 @@
+Marks: 标记&记录
+smdID: 000000791669082784332-65535
+U-labels: xn----kw3bu0xlr2bba, xn--and-vj3ft79a885cda, xn--w2t96qr64aa
+notBefore: 2022-11-22T02:06:24.332Z
+notAfter: 2027-10-18T14:36:50.931Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il8xYmRh
+MGY1MS04MGY2LTQwODgtYTVhOS0zNWRiNzhhNTVmNjYiPjxzbWQ6aWQ+MDAwMDAwNzkxNjY5MDgy
+Nzg0MzMyLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMjowNjoyNC4zMzJaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0xOFQxNDozNjo1MC45MzFaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazpj
+b3VydD48bWFyazppZD4wMDAxNDYxNTAzMDY2NjMxMTUwMzA2NjYzMS0xPC9tYXJrOmlkPjxtYXJr
+Om1hcmtOYW1lPuagh+iusCZhbXA76K6w5b2VPC9tYXJrOm1hcmtOYW1lPjxtYXJrOmhvbGRlciBl
+bnRpdGxlbWVudD0ib3duZXIiPjxtYXJrOm9yZz7lt6XnqIvlpIQ8L21hcms6b3JnPjxtYXJrOmFk
+ZHI+PG1hcms6c3RyZWV0Pummmea4r+S4nOi3rzblj7fvvIw15Y+35qW877yMOOWPt+WupDwvbWFy
+azpzdHJlZXQ+PG1hcms6Y2l0eT7pnZLlspvluII8L21hcms6Y2l0eT48bWFyazpwYz4zNTAwPC9t
+YXJrOnBjPjxtYXJrOmNjPkNOPC9tYXJrOmNjPjwvbWFyazphZGRyPjwvbWFyazpob2xkZXI+PG1h
+cms6Y29udGFjdCB0eXBlPSJhZ2VudCI+PG1hcms6bmFtZT7mnY7lsI/mlrk8L21hcms6bmFtZT48
+bWFyazpvcmc+5bel56iL5aSEPC9tYXJrOm9yZz48bWFyazphZGRyPjxtYXJrOnN0cmVldD7pppnm
+uK/kuJzot6825Y+377yMNeWPt+alvO+8jDjlj7flrqQ8L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+
+6Z2S5bKb5biCPC9tYXJrOmNpdHk+PG1hcms6cGM+MzUwMDwvbWFyazpwYz48bWFyazpjYz5DTjwv
+bWFyazpjYz48L21hcms6YWRkcj48bWFyazp2b2ljZT4rODYuMTA4NDY1NzE3MzwvbWFyazp2b2lj
+ZT48bWFyazpmYXg+Kzg2LjEwODQ2NTcxNzU8L21hcms6ZmF4PjxtYXJrOmVtYWlsPmluZm9AY2hp
+bmVzZS1hZ2VuY3kuY29tPC9tYXJrOmVtYWlsPjwvbWFyazpjb250YWN0PjxtYXJrOmxhYmVsPnhu
+LS0tLWt3M2J1MHhscjJiYmE8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLWFuZC12ajNmdDc5
+YTg4NWNkYTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tdzJ0OTZxcjY0YWE8L21hcms6bGFi
+ZWw+PG1hcms6Z29vZHNBbmRTZXJ2aWNlcz4g5ZCJ5LuWPC9tYXJrOmdvb2RzQW5kU2VydmljZXM+
+PG1hcms6cmVmTnVtPjEyMzQ8L21hcms6cmVmTnVtPjxtYXJrOnByb0RhdGU+MjAxMy0wMS0wMVQw
+MDowMDowMC4wMDBaPC9tYXJrOnByb0RhdGU+PG1hcms6Y2M+VVM8L21hcms6Y2M+PG1hcms6Y291
+cnROYW1lPkhvdmU8L21hcms6Y291cnROYW1lPjwvbWFyazpjb3VydD48L21hcms6bWFyaz48ZHM6
+U2lnbmF0dXJlIHhtbG5zOmRzPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjIiBJ
+ZD0iXzlkZDkzMjZhLThmYTAtNDNkZi04MzgyLWY2ZTNhMTI3ZmFmMSI+PGRzOlNpZ25lZEluZm8+
+PGRzOkNhbm9uaWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8y
+MDAxLzEwL3htbC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJlTWV0aG9kIEFsZ29yaXRobT0iaHR0
+cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxkc2lnLW1vcmUjcnNhLXNoYTI1NiIvPjxkczpSZWZl
+cmVuY2UgVVJJPSIjXzFiZGEwZjUxLTgwZjYtNDA4OC1hNWE5LTM1ZGI3OGE1NWY2NiI+PGRzOlRy
+YW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDAv
+MDkveG1sZHNpZyNlbnZlbG9wZWQtc2lnbmF0dXJlIi8+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09
+Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jt
+cz48ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94
+bWxlbmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPm10WlNBaTQ2enlBU2pHTDI4S2ZPZUNIMHNP
+a1V2SkFtQzRCNmwxZTFYUDA9PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48ZHM6UmVm
+ZXJlbmNlIFVSST0iI184MGE0ZTBmMS1jNDQ4LTQ2ZGEtODA2MS0wYzg2MzliZWExNzMiPjxkczpU
+cmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAx
+LzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdv
+cml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdl
+c3RWYWx1ZT5XRXY3TTZaeUxiaTlOY0kwWUdWY3BiUlJUL0tJMUZmMnVvTnBwODlLWktBPTwvZHM6
+RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PC9kczpTaWduZWRJbmZvPjxkczpTaWduYXR1cmVW
+YWx1ZSBJZD0iX2E4N2VmYWFmLTQ3MWEtNGEwMi1iMDUyLTVmMWFmOWMyMmY4ZSI+bEcvRmI1QTRw
+U0hteUl4Y2NCc0dxaUVBNXNJc29hYXkxUUNndnZKa3U0ZW5vVjQva09DMHVzejVWMlc5WlVsNjFn
+MjdHZ1JwRkRPNCYjMTM7CklBOHYxVlJTbjdDSnVNTFpSNEtKODloYURPQ0E5Z1dwcU83RzVGZFNt
+dE54NnhETElxYmN0YzNuMGxHaFBzb0RmOHVONXY5dXIzOXQmIzEzOwo1NTRtbWVnbjk5K3dlUlNH
+RVBTTVk0WEd1MFZJQWViUmZZUXV1L0pwYWFjZUZodHpPcmJQMFlVUHppWEp4MHcrZjFhWGdGMFlP
+OHlPJiMxMzsKVCs4c3RiQXRXOXg0OVl0eVVDU083dWdocTVzTWlYWjB4dGU5ZHZsOG9udzJnY2hv
+NlZTTU1hUjdEdWxPaW5VMWhhanIxamlZZlZjaCYjMTM7Cm54NmFFRkhWWStDb0x2dUIxSkkwbWxP
+OVJyRHN2L2ZFalJNSEVXOXFsRHpLMjUxVEw4NGNQOFFOSU1KN3piVGwrU3l5ZE51UXRqT20mIzEz
+OwprVEorZ2xCeGRJOW0zN1pXREJGOWZyRndUTnNudWV2UzFRSGozT2ZvREJHMnpTSUNKOExqVnQv
+OFZUSnZ0QjloTUVCT3pRNUY1eFJYJiMxMzsKM0NrVHFMQnUrd1E2V1h6YTZWa2dDL1RKTk8wOXBI
+Z05KeXlRMEFqQlNlVlhTanVBOGVLYkl3bW81YVRSZ09kdEdVNmlFT2RQTk1KWSYjMTM7CnJDMFMz
+WmpQQTBhMnU2RVVIcUwybzJiSWN4TVRYZlRTTTF2WTNHcXdsTUNNOTcxK1ljOFZZVkJvVHlWeDlH
+ZlRZak1ZWFU5U3BoUUsmIzEzOwpSZVVqUG5xVVo3b3FLdlFvS1NMZGVwZC9MUjJnUW5UQ0ZlYVpl
+QisxNkZQaUhHNEMreUlOL2JEODlhc3VQOEhqNlZwRE1PbHlMT2s9PC9kczpTaWduYXR1cmVWYWx1
+ZT48ZHM6S2V5SW5mbyBJZD0iXzgwYTRlMGYxLWM0NDgtNDZkYS04MDYxLTBjODYzOWJlYTE3MyI+
+PGRzOlg1MDlEYXRhPjxkczpYNTA5Q2VydGlmaWNhdGU+TUlJSFh6Q0NCVWVnQXdJQkFnSVVYcUkv
+dmQxOENhZzk4b05wZHpWN0JpeS82RUF3RFFZSktvWklodmNOQVFFTkJRQXdmREVMTUFrRyYjMTM7
+CkExVUVCaE1DVlZNeFBEQTZCZ05WQkFvTU0wbHVkR1Z5Ym1WMElFTnZjbkJ2Y21GMGFXOXVJR1p2
+Y2lCQmMzTnBaMjVsWkNCT1lXMWwmIzEzOwpjeUJoYm1RZ1RuVnRZbVZ5Y3pFdk1DMEdBMVVFQXd3
+bVNVTkJUazRnVkhKaFpHVnRZWEpySUVOc1pXRnlhVzVuYUc5MWMyVWdVR2xzJiMxMzsKYjNRZ1Ew
+RXdIaGNOTWpJeE1URTJNVE15T0RVNVdoY05NamN4TVRFMU1UTXlPRFU1V2pDQjBERUxNQWtHQTFV
+RUJoTUNRa1V4RVRBUCYjMTM7CkJnTlZCQWdUQ0VKeWRYTnpaV3h6TVJJd0VBWURWUVFIRXdsV2FX
+eDJiMjl5WkdVeE16QXhCZ05WQkFvVEtrUmxiRzlwZEhSbElFTnYmIzEzOwpibk4xYkhScGJtY2dZ
+VzVrSUVGa2RtbHpiM0o1SUVOV1FrRXZVME5TVERFK01Ed0dBMVVFQXhNMVNVTkJUazRnVkUxRFND
+QkJkWFJvJiMxMzsKYjNKcGVtVmtJRlJ5WVdSbGJXRnlheUJRYVd4dmRDQldZV3hwWkdGMGIzSWdW
+bUZzYVdReEpUQWpCZ2txaGtpRzl3MEJDUUVXRm1KbCYjMTM7CmRHMWphSE50WkVCa1pXeHZhWFIw
+WlM1amIyMHdnZ0lpTUEwR0NTcUdTSWIzRFFFQkFRVUFBNElDRHdBd2dnSUtBb0lDQVFDNkZKd3om
+IzEzOwpLcVFWWDZmRzMvRUxSU0dXVjlHckthRk1LbWhXSXhlcHdSWk42TXhNcWtkNURuWWZpVCtX
+cDk4akVrcWdUeDJVTWI5cXVnY0dOVjZnJiMxMzsKMzUvQ3JRYi9GL216M0M0c2ZMTnVEcFNxSzlR
+RjgrcGFUSDZoUW1yT3BxVitVVHZkajlTTWdLR3lGaXpTODhDRFdNeDR3M2k0RkFLZSYjMTM7CjZO
+UnNKUkdUQXRLRHVNSGNBNHNqMDhHamUzbFBXY2dGdmNRTkRWZUVCVHVPSEJHK1JoajdWMUppTkdQ
+LzRlcFRYVEZYZ1BGRGdlejMmIzEzOwpZQWZ4cXBidU80VFg2YmJZZGsybnZNTEZ2TEVOa0NGWXVs
+bllQemduRUJHU01LSWFBSWxiK3NjSEN2V2dXajJUTGd3aDJHSk5jelZNJiMxMzsKMUxQTXFHUytV
+a2k5TWg3OTgyMi94b2FyNDk4eER4Mll4Lzhzd2dFTkxTZ0NzUUFXOG5NZ3dXbjZBYllsMlJBQlh1
+cmF5RnNuNFAxUiYjMTM7CnVRTm1VcC9xclJLUnZTSnIxT0xrSFpmRlRjU1lRYVZpdU1ZUFh6R3o4
+dG1NTGxtSS9CNkFDSDRBd1JNZG5ZdkZPM0tJMVJCblBLSWQmIzEzOwp3d2ZVcFo1SVRJcGJBN0NH
+Z1R4MXF4dE0xd0lVcjdwSGVLUDZqVmUza2RETGcrL0JaMnhNRXRCazVhOFk3QjR2M3h3SFhHVHZW
+OG1OJiMxMzsKMEFnL1N5VC9RVXlFUmhYVXlBTjIrRXdaK1NRQ1V5TmZ6aW9XUTg3OGVHeWtVKzQ2
+K0JiZ0kzSUlyMzZYS1B3bXp0MFNaK0tJM3RuRiYjMTM7ClRsbjltWDBLQzBpZG9qNXlrelBvQy9N
+SWVkMHNwNFRpZ3hFYldOeDdFRjgwUHZSL0RERXdWUEVFa2tqeTYzWEZ1bHhpQ1FJREFRQUImIzEz
+OwpvNElCZ2pDQ0FYNHdEQVlEVlIwVEFRSC9CQUl3QURBT0JnTlZIUThCQWY4RUJBTUNCNEF3SFFZ
+RFZSME9CQllFRkhuOXMwREVhMmt2JiMxMzsKZ0UvZUlPVHNxb1c4NU1YRk1JRzZCZ05WSFNNRWdi
+SXdnYStBRkVkN1Q2NTZVWkcxMGIrZE51bUdmellXQktsRm9ZR0FwSDR3ZkRFTCYjMTM7Ck1Ba0dB
+MVVFQmhNQ1ZWTXhQREE2QmdOVkJBb01NMGx1ZEdWeWJtVjBJRU52Y25CdmNtRjBhVzl1SUdadmNp
+QkJjM05wWjI1bFpDQk8mIzEzOwpZVzFsY3lCaGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF3d21T
+VU5CVGs0Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5YVc1bmFHOTFjMlVnJiMxMzsKVUdsc2IzUWdRMEdD
+RkhwcWJURmVKY1B0VUM5WHV1UEtQc0x3RFIrTU1EUUdBMVVkSHdRdE1Dc3dLYUFub0NXR0kyaDBk
+SEE2THk5aiYjMTM7CmNtd3VhV05oYm00dWIzSm5MM1J0WTJoZmNHbHNiM1F1WTNKc01Fd0dBMVVk
+SUFSRk1FTXdFQVlPS3dZQkJBR0N5UnNCQllNN0RBb3cmIzEzOwpMd1lJS3dZQkJRVUhBZ0V3SXpB
+aEJnZ3JCZ0VGQlFjQ0FSWVZhSFIwY0hNNkx5OWpjSE11YVdOaGJtNHViM0puTUEwR0NTcUdTSWIz
+JiMxMzsKRFFFQkRRVUFBNElDQVFCZFNhdDU2dWVqTG5BakZJRjk1ZGpZV0k2cy8vTjZZWHhzcnJN
+a0dCUDhFZXpQeWhMaDZhd1A0ejdROVFBSSYjMTM7ClFaa1lveHJsLzF5MCtieVYycW5UVVVDTFJw
+Sy9CRHAvaGNmd1BmS0NBLzJSUUNISnJiNit6MGVuRFBGUkswTkttd09jZGxHdFVrMG0mIzEzOwpQ
+Z1dHU0t0dXdWc1BBaFRESnVob3NaT2hrTmYrblNPT0hyUU9uMUUycnpPcmQva1FscWlDd1JIOTc5
+Nk5wVEErSFNNZk9vYkpFRVBxJiMxMzsKdHBGN1A1cWJ3dGw5NVVhNU9wNEFoYTcwSEhmVUZTNEJP
+UUtMQlZmTVpkT1IraVBvaDVPd0FLK2h0WWtGQ0c5UDJXSHU3d2Y4RUMrVyYjMTM7CjdrOTZndlRk
+OHhFN291b2FiVDJ4NllmWXFFbFBIaVUvSU05Z1Z6V1dML3N2WUR5U1Z1b0Z3QmpETk4xY2RxMHFP
+WVIxeXVTMWMvOUQmIzEzOwpGUjdlbzdHRkVDeStUQmQ3SWlLUmZCVmVZR09PUE1ub0ZmeFJMV3Jw
+c1dObndEN2xrUGtMQ2dGQ2srOHlFY09SZzYyNW1vNjV6NHk2JiMxMzsKSjRLOGZvZGE3cXdtWE5Q
+M1JTMThvbjZCSHQ4bFErYlhnT0hteElIazBhTzBxTkRxZ3ZMcjJGbHlMR0pHaUVNUnFETU1SNi9h
+MDZidCYjMTM7CmtuVU1IbDdDcU1maklralA0Vk5OeUdQZEpnd1ZrMmtlYjl1TkZ2SkN4VCtNMmZH
+WFExTmJKTmZ0djVNZ1NzcDlOMXkreDZnQTNFaHcmIzEzOwp5SGxtSkI0WU10bzh0VFYxaTg0eFBY
+eGkyQ0FlRGFHRHV3b3N0OFlVQ1NqcTdSQ0s4dEdjYUFZcmtYUVkyeVFmWDNjd0RzRXhScVZXJiMx
+MzsKeXJqeVJ0K042bUs5OVE9PTwvZHM6WDUwOUNlcnRpZmljYXRlPjwvZHM6WDUwOURhdGE+PC9k
+czpLZXlJbmZvPjwvZHM6U2lnbmF0dXJlPjwvc21kOnNpZ25lZE1hcms+Cg==
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Agent-Chinese/Trademark-Agent-Chinese-Active.smd b/core/src/test/resources/google/registry/tmch/idn/Agent-Chinese/Trademark-Agent-Chinese-Active.smd
new file mode 100644
index 000000000..5ea2751f8
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Agent-Chinese/Trademark-Agent-Chinese-Active.smd
@@ -0,0 +1,120 @@
+Marks: 审判&错误
+smdID: 000000801669082844854-65535
+U-labels: xn----ke8al50aln4ceuj, xn--and-ui2eu74b9t4egon, xn--et-pg5cw37ax04dfrl, xn--fcr14u8t4bdxh
+notBefore: 2022-11-22T02:07:24.854Z
+notAfter: 2027-10-18T14:36:50.931Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il84ZDk3
+YTg2ZC1iMTZjLTRlNGQtYjdiNS0wYzcwOTk0OGJhYWYiPjxzbWQ6aWQ+MDAwMDAwODAxNjY5MDgy
+ODQ0ODU0LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMjowNzoyNC44NTRaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0xOFQxNDozNjo1MC45MzFaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
+cmFkZW1hcms+PG1hcms6aWQ+MDAwMTQ2MTUwMzA2Njc5NTE1MDMwNjY3OTUtMTwvbWFyazppZD48
+bWFyazptYXJrTmFtZT7lrqHliKQmYW1wO+mUmeivrzwvbWFyazptYXJrTmFtZT48bWFyazpob2xk
+ZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpvcmc+5bel56iL5aSEPC9tYXJrOm9yZz48bWFy
+azphZGRyPjxtYXJrOnN0cmVldD7pppnmuK/kuJzot6825Y+377yMNeWPt+alvO+8jDjlj7flrqQ8
+L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+6Z2S5bKb5biCPC9tYXJrOmNpdHk+PG1hcms6cGM+MzUw
+MDwvbWFyazpwYz48bWFyazpjYz5DTjwvbWFyazpjYz48L21hcms6YWRkcj48L21hcms6aG9sZGVy
+PjxtYXJrOmNvbnRhY3QgdHlwZT0iYWdlbnQiPjxtYXJrOm5hbWU+5p2O5bCP5pa5PC9tYXJrOm5h
+bWU+PG1hcms6b3JnPuW3peeoi+WkhDwvbWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpzdHJlZXQ+
+6aaZ5riv5Lic6LevNuWPt++8jDXlj7fmpbzvvIw45Y+35a6kPC9tYXJrOnN0cmVldD48bWFyazpj
+aXR5PumdkuWym+W4gjwvbWFyazpjaXR5PjxtYXJrOnBjPjM1MDA8L21hcms6cGM+PG1hcms6Y2M+
+Q048L21hcms6Y2M+PC9tYXJrOmFkZHI+PG1hcms6dm9pY2U+Kzg2LjEwODQ2NTcxNzM8L21hcms6
+dm9pY2U+PG1hcms6ZmF4Pis4Ni4xMDg0NjU3MTc1PC9tYXJrOmZheD48bWFyazplbWFpbD5pbmZv
+QGNoaW5lc2UtYWdlbmN5LmNvbTwvbWFyazplbWFpbD48L21hcms6Y29udGFjdD48bWFyazpqdXJp
+c2RpY3Rpb24+VVM8L21hcms6anVyaXNkaWN0aW9uPjxtYXJrOmNsYXNzPjE1PC9tYXJrOmNsYXNz
+PjxtYXJrOmxhYmVsPnhuLS0tLWtlOGFsNTBhbG40Y2V1ajwvbWFyazpsYWJlbD48bWFyazpsYWJl
+bD54bi0tYW5kLXVpMmV1NzRiOXQ0ZWdvbjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tZXQt
+cGc1Y3czN2F4MDRkZnJsPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1mY3IxNHU4dDRiZHho
+PC9tYXJrOmxhYmVsPjxtYXJrOmdvb2RzQW5kU2VydmljZXM+5ZCJ5LuWPC9tYXJrOmdvb2RzQW5k
+U2VydmljZXM+PG1hcms6cmVnTnVtPjEyMzQ8L21hcms6cmVnTnVtPjxtYXJrOnJlZ0RhdGU+MjAx
+My0wMS0wMVQwMDowMDowMC4wMDBaPC9tYXJrOnJlZ0RhdGU+PC9tYXJrOnRyYWRlbWFyaz48L21h
+cms6bWFyaz48ZHM6U2lnbmF0dXJlIHhtbG5zOmRzPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5
+L3htbGRzaWcjIiBJZD0iXzZlYmI4Y2FmLWI3OTMtNDQxOC1iODQxLTQzMjdhMDEyNDZmZiI+PGRz
+OlNpZ25lZEluZm8+PGRzOkNhbm9uaWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGhtPSJodHRwOi8v
+d3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJlTWV0aG9kIEFs
+Z29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxkc2lnLW1vcmUjcnNhLXNoYTI1
+NiIvPjxkczpSZWZlcmVuY2UgVVJJPSIjXzhkOTdhODZkLWIxNmMtNGU0ZC1iN2I1LTBjNzA5OTQ4
+YmFhZiI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cu
+dzMub3JnLzIwMDAvMDkveG1sZHNpZyNlbnZlbG9wZWQtc2lnbmF0dXJlIi8+PGRzOlRyYW5zZm9y
+bSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwv
+ZHM6VHJhbnNmb3Jtcz48ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5v
+cmcvMjAwMS8wNC94bWxlbmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPmY0UHY1UlpnS3E2Wkt6
+UHE4TWR0R05tNy9SaHNHLzc3dDIwSFNWaUd6VjA9PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVy
+ZW5jZT48ZHM6UmVmZXJlbmNlIFVSST0iI182MjYyYWFkZS00MTAxLTRkZjAtYmRhMy0zM2MzZDAx
+YTZmMzIiPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3
+LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2Vz
+dE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1
+NiIvPjxkczpEaWdlc3RWYWx1ZT5GU0pNc2U3Sy9kMUpKOFFOaVJ6SjYyaENuamZkeGt5dm93bVRv
+bjJrSVlzPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PC9kczpTaWduZWRJbmZvPjxk
+czpTaWduYXR1cmVWYWx1ZSBJZD0iX2EzZGU2ODQ2LTg1MWEtNDVlYi1hNDNkLTllYTRhNTA3Yzgx
+NSI+ZG5MMzhRR3RZYU1jWWhHWm9DalNGcHVEaU81cG9kLzBtTUFkS3dYWHdpa3dhbDE3a1d1ZjB1
+anc0SnpVaVBwM1pSYjNqMmJ5bUtjeiYjMTM7CmxFNi9qQkd0S0k4YnNQWFRaTStnOU1KRFFha3FN
+VGkvY2ZaOFJsblFKbjR0T1ZkYnFsWmlMR2NaZXgvaElidlNyK3hLM1F2VUxYL3AmIzEzOwpKOVRn
+T0FraWRzS3ZGYW5DbitrZWJKb0RRdHdUU1ZRR1ZqYVNhdUNmMHZaVlVRQ0h3RTRBVDI4MFZqY1cx
+TndVcnlJbFprcEwxcGlDJiMxMzsKcC9HNEdWTFlJVHZ0RkwxdDBHa1lGQ3R5dXEyWnpZK3pEL08r
+RDNZVmpWS0dwNHg2S29sTWVZUVhPd0MzSUdPWDQxdFFPNHE5cS9pYSYjMTM7CmNyYTExc3V3dGl5
+N3Zsc0tNdTZrTS9WSVlEU25JbVdUNENVaDdjWjFQaFhCY1MvbnRHOUJ0K2puaHVGTlhpN2VoVXVP
+YlZJSEpic2smIzEzOwp0MGNBY3VRUGxXbkdTODFmTGNIM2ZYelFiK0xCSy9rY3FJeldWakk3cTA0
+VjlmekY1TjVhZzBFd2ZCTUFqUFZrcVNWTXFDWWtUQUhDJiMxMzsKZ2JBbW5iWldpTlE2bTVrZ1BQ
+Qk1GRnB4eFVLa2dabVhEUUhMVmFJUHNSVkhNdDRqT05BZUJrNTVadHk5a3Z5dzBmeElSZWtQdmpn
+RiYjMTM7Cnh5T3pIdVgybDE2WEVpc2prcDNkenBqWTZvVS8yemtLNFVIcXNXSHdhN1BMVGlqcFRw
+K3NTT1NPQzNvUVlLTUd1TUQ5SS93UWpabDAmIzEzOwpDMHNPb2ZtNmVTclJEWWk3eTdlUy9rV01J
+Y3h4eGJBMXh3dDR6T1hiUmV0WldpZFFYMVlsQS9JazRtSDQyQ2RrVjQ1dXZ2TUJCT289PC9kczpT
+aWduYXR1cmVWYWx1ZT48ZHM6S2V5SW5mbyBJZD0iXzYyNjJhYWRlLTQxMDEtNGRmMC1iZGEzLTMz
+YzNkMDFhNmYzMiI+PGRzOlg1MDlEYXRhPjxkczpYNTA5Q2VydGlmaWNhdGU+TUlJSFh6Q0NCVWVn
+QXdJQkFnSVVYcUkvdmQxOENhZzk4b05wZHpWN0JpeS82RUF3RFFZSktvWklodmNOQVFFTkJRQXdm
+REVMTUFrRyYjMTM7CkExVUVCaE1DVlZNeFBEQTZCZ05WQkFvTU0wbHVkR1Z5Ym1WMElFTnZjbkJ2
+Y21GMGFXOXVJR1p2Y2lCQmMzTnBaMjVsWkNCT1lXMWwmIzEzOwpjeUJoYm1RZ1RuVnRZbVZ5Y3pF
+dk1DMEdBMVVFQXd3bVNVTkJUazRnVkhKaFpHVnRZWEpySUVOc1pXRnlhVzVuYUc5MWMyVWdVR2xz
+JiMxMzsKYjNRZ1EwRXdIaGNOTWpJeE1URTJNVE15T0RVNVdoY05NamN4TVRFMU1UTXlPRFU1V2pD
+QjBERUxNQWtHQTFVRUJoTUNRa1V4RVRBUCYjMTM7CkJnTlZCQWdUQ0VKeWRYTnpaV3h6TVJJd0VB
+WURWUVFIRXdsV2FXeDJiMjl5WkdVeE16QXhCZ05WQkFvVEtrUmxiRzlwZEhSbElFTnYmIzEzOwpi
+bk4xYkhScGJtY2dZVzVrSUVGa2RtbHpiM0o1SUVOV1FrRXZVME5TVERFK01Ed0dBMVVFQXhNMVNV
+TkJUazRnVkUxRFNDQkJkWFJvJiMxMzsKYjNKcGVtVmtJRlJ5WVdSbGJXRnlheUJRYVd4dmRDQldZ
+V3hwWkdGMGIzSWdWbUZzYVdReEpUQWpCZ2txaGtpRzl3MEJDUUVXRm1KbCYjMTM7CmRHMWphSE50
+WkVCa1pXeHZhWFIwWlM1amIyMHdnZ0lpTUEwR0NTcUdTSWIzRFFFQkFRVUFBNElDRHdBd2dnSUtB
+b0lDQVFDNkZKd3omIzEzOwpLcVFWWDZmRzMvRUxSU0dXVjlHckthRk1LbWhXSXhlcHdSWk42TXhN
+cWtkNURuWWZpVCtXcDk4akVrcWdUeDJVTWI5cXVnY0dOVjZnJiMxMzsKMzUvQ3JRYi9GL216M0M0
+c2ZMTnVEcFNxSzlRRjgrcGFUSDZoUW1yT3BxVitVVHZkajlTTWdLR3lGaXpTODhDRFdNeDR3M2k0
+RkFLZSYjMTM7CjZOUnNKUkdUQXRLRHVNSGNBNHNqMDhHamUzbFBXY2dGdmNRTkRWZUVCVHVPSEJH
+K1JoajdWMUppTkdQLzRlcFRYVEZYZ1BGRGdlejMmIzEzOwpZQWZ4cXBidU80VFg2YmJZZGsybnZN
+TEZ2TEVOa0NGWXVsbllQemduRUJHU01LSWFBSWxiK3NjSEN2V2dXajJUTGd3aDJHSk5jelZNJiMx
+MzsKMUxQTXFHUytVa2k5TWg3OTgyMi94b2FyNDk4eER4Mll4Lzhzd2dFTkxTZ0NzUUFXOG5NZ3dX
+bjZBYllsMlJBQlh1cmF5RnNuNFAxUiYjMTM7CnVRTm1VcC9xclJLUnZTSnIxT0xrSFpmRlRjU1lR
+YVZpdU1ZUFh6R3o4dG1NTGxtSS9CNkFDSDRBd1JNZG5ZdkZPM0tJMVJCblBLSWQmIzEzOwp3d2ZV
+cFo1SVRJcGJBN0NHZ1R4MXF4dE0xd0lVcjdwSGVLUDZqVmUza2RETGcrL0JaMnhNRXRCazVhOFk3
+QjR2M3h3SFhHVHZWOG1OJiMxMzsKMEFnL1N5VC9RVXlFUmhYVXlBTjIrRXdaK1NRQ1V5TmZ6aW9X
+UTg3OGVHeWtVKzQ2K0JiZ0kzSUlyMzZYS1B3bXp0MFNaK0tJM3RuRiYjMTM7ClRsbjltWDBLQzBp
+ZG9qNXlrelBvQy9NSWVkMHNwNFRpZ3hFYldOeDdFRjgwUHZSL0RERXdWUEVFa2tqeTYzWEZ1bHhp
+Q1FJREFRQUImIzEzOwpvNElCZ2pDQ0FYNHdEQVlEVlIwVEFRSC9CQUl3QURBT0JnTlZIUThCQWY4
+RUJBTUNCNEF3SFFZRFZSME9CQllFRkhuOXMwREVhMmt2JiMxMzsKZ0UvZUlPVHNxb1c4NU1YRk1J
+RzZCZ05WSFNNRWdiSXdnYStBRkVkN1Q2NTZVWkcxMGIrZE51bUdmellXQktsRm9ZR0FwSDR3ZkRF
+TCYjMTM7Ck1Ba0dBMVVFQmhNQ1ZWTXhQREE2QmdOVkJBb01NMGx1ZEdWeWJtVjBJRU52Y25CdmNt
+RjBhVzl1SUdadmNpQkJjM05wWjI1bFpDQk8mIzEzOwpZVzFsY3lCaGJtUWdUblZ0WW1WeWN6RXZN
+QzBHQTFVRUF3d21TVU5CVGs0Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5YVc1bmFHOTFjMlVnJiMxMzsK
+VUdsc2IzUWdRMEdDRkhwcWJURmVKY1B0VUM5WHV1UEtQc0x3RFIrTU1EUUdBMVVkSHdRdE1Dc3dL
+YUFub0NXR0kyaDBkSEE2THk5aiYjMTM7CmNtd3VhV05oYm00dWIzSm5MM1J0WTJoZmNHbHNiM1F1
+WTNKc01Fd0dBMVVkSUFSRk1FTXdFQVlPS3dZQkJBR0N5UnNCQllNN0RBb3cmIzEzOwpMd1lJS3dZ
+QkJRVUhBZ0V3SXpBaEJnZ3JCZ0VGQlFjQ0FSWVZhSFIwY0hNNkx5OWpjSE11YVdOaGJtNHViM0pu
+TUEwR0NTcUdTSWIzJiMxMzsKRFFFQkRRVUFBNElDQVFCZFNhdDU2dWVqTG5BakZJRjk1ZGpZV0k2
+cy8vTjZZWHhzcnJNa0dCUDhFZXpQeWhMaDZhd1A0ejdROVFBSSYjMTM7ClFaa1lveHJsLzF5MCti
+eVYycW5UVVVDTFJwSy9CRHAvaGNmd1BmS0NBLzJSUUNISnJiNit6MGVuRFBGUkswTkttd09jZGxH
+dFVrMG0mIzEzOwpQZ1dHU0t0dXdWc1BBaFRESnVob3NaT2hrTmYrblNPT0hyUU9uMUUycnpPcmQv
+a1FscWlDd1JIOTc5Nk5wVEErSFNNZk9vYkpFRVBxJiMxMzsKdHBGN1A1cWJ3dGw5NVVhNU9wNEFo
+YTcwSEhmVUZTNEJPUUtMQlZmTVpkT1IraVBvaDVPd0FLK2h0WWtGQ0c5UDJXSHU3d2Y4RUMrVyYj
+MTM7CjdrOTZndlRkOHhFN291b2FiVDJ4NllmWXFFbFBIaVUvSU05Z1Z6V1dML3N2WUR5U1Z1b0Z3
+QmpETk4xY2RxMHFPWVIxeXVTMWMvOUQmIzEzOwpGUjdlbzdHRkVDeStUQmQ3SWlLUmZCVmVZR09P
+UE1ub0ZmeFJMV3Jwc1dObndEN2xrUGtMQ2dGQ2srOHlFY09SZzYyNW1vNjV6NHk2JiMxMzsKSjRL
+OGZvZGE3cXdtWE5QM1JTMThvbjZCSHQ4bFErYlhnT0hteElIazBhTzBxTkRxZ3ZMcjJGbHlMR0pH
+aUVNUnFETU1SNi9hMDZidCYjMTM7CmtuVU1IbDdDcU1maklralA0Vk5OeUdQZEpnd1ZrMmtlYjl1
+TkZ2SkN4VCtNMmZHWFExTmJKTmZ0djVNZ1NzcDlOMXkreDZnQTNFaHcmIzEzOwp5SGxtSkI0WU10
+bzh0VFYxaTg0eFBYeGkyQ0FlRGFHRHV3b3N0OFlVQ1NqcTdSQ0s4dEdjYUFZcmtYUVkyeVFmWDNj
+d0RzRXhScVZXJiMxMzsKeXJqeVJ0K042bUs5OVE9PTwvZHM6WDUwOUNlcnRpZmljYXRlPjwvZHM6
+WDUwOURhdGE+PC9kczpLZXlJbmZvPjwvZHM6U2lnbmF0dXJlPjwvc21kOnNpZ25lZE1hcms+Cg==
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Agent-Chinese/Trademark-Agent-Chinese-Revoked.smd b/core/src/test/resources/google/registry/tmch/idn/Agent-Chinese/Trademark-Agent-Chinese-Revoked.smd
new file mode 100644
index 000000000..5dc9d5439
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Agent-Chinese/Trademark-Agent-Chinese-Revoked.smd
@@ -0,0 +1,120 @@
+Marks: 审判&错误
+smdID: 000000801669082788014-65535
+U-labels: xn----ke8al50aln4ceuj, xn--and-ui2eu74b9t4egon, xn--et-pg5cw37ax04dfrl, xn--fcr14u8t4bdxh
+notBefore: 2022-11-22T02:06:28.014Z
+notAfter: 2027-10-18T14:36:50.931Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il82ZjFl
+ZjEwNi1hZDRjLTQ5NmYtYTA3Mi1lZmI4M2JmZWRjZmEiPjxzbWQ6aWQ+MDAwMDAwODAxNjY5MDgy
+Nzg4MDE0LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMjowNjoyOC4wMTRaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0xOFQxNDozNjo1MC45MzFaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
+cmFkZW1hcms+PG1hcms6aWQ+MDAwMTQ2MTUwMzA2Njc5NTE1MDMwNjY3OTUtMTwvbWFyazppZD48
+bWFyazptYXJrTmFtZT7lrqHliKQmYW1wO+mUmeivrzwvbWFyazptYXJrTmFtZT48bWFyazpob2xk
+ZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpvcmc+5bel56iL5aSEPC9tYXJrOm9yZz48bWFy
+azphZGRyPjxtYXJrOnN0cmVldD7pppnmuK/kuJzot6825Y+377yMNeWPt+alvO+8jDjlj7flrqQ8
+L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+6Z2S5bKb5biCPC9tYXJrOmNpdHk+PG1hcms6cGM+MzUw
+MDwvbWFyazpwYz48bWFyazpjYz5DTjwvbWFyazpjYz48L21hcms6YWRkcj48L21hcms6aG9sZGVy
+PjxtYXJrOmNvbnRhY3QgdHlwZT0iYWdlbnQiPjxtYXJrOm5hbWU+5p2O5bCP5pa5PC9tYXJrOm5h
+bWU+PG1hcms6b3JnPuW3peeoi+WkhDwvbWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpzdHJlZXQ+
+6aaZ5riv5Lic6LevNuWPt++8jDXlj7fmpbzvvIw45Y+35a6kPC9tYXJrOnN0cmVldD48bWFyazpj
+aXR5PumdkuWym+W4gjwvbWFyazpjaXR5PjxtYXJrOnBjPjM1MDA8L21hcms6cGM+PG1hcms6Y2M+
+Q048L21hcms6Y2M+PC9tYXJrOmFkZHI+PG1hcms6dm9pY2U+Kzg2LjEwODQ2NTcxNzM8L21hcms6
+dm9pY2U+PG1hcms6ZmF4Pis4Ni4xMDg0NjU3MTc1PC9tYXJrOmZheD48bWFyazplbWFpbD5pbmZv
+QGNoaW5lc2UtYWdlbmN5LmNvbTwvbWFyazplbWFpbD48L21hcms6Y29udGFjdD48bWFyazpqdXJp
+c2RpY3Rpb24+VVM8L21hcms6anVyaXNkaWN0aW9uPjxtYXJrOmNsYXNzPjE1PC9tYXJrOmNsYXNz
+PjxtYXJrOmxhYmVsPnhuLS0tLWtlOGFsNTBhbG40Y2V1ajwvbWFyazpsYWJlbD48bWFyazpsYWJl
+bD54bi0tYW5kLXVpMmV1NzRiOXQ0ZWdvbjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tZXQt
+cGc1Y3czN2F4MDRkZnJsPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1mY3IxNHU4dDRiZHho
+PC9tYXJrOmxhYmVsPjxtYXJrOmdvb2RzQW5kU2VydmljZXM+5ZCJ5LuWPC9tYXJrOmdvb2RzQW5k
+U2VydmljZXM+PG1hcms6cmVnTnVtPjEyMzQ8L21hcms6cmVnTnVtPjxtYXJrOnJlZ0RhdGU+MjAx
+My0wMS0wMVQwMDowMDowMC4wMDBaPC9tYXJrOnJlZ0RhdGU+PC9tYXJrOnRyYWRlbWFyaz48L21h
+cms6bWFyaz48ZHM6U2lnbmF0dXJlIHhtbG5zOmRzPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5
+L3htbGRzaWcjIiBJZD0iXzRlMWY2NmMwLWY2YmMtNDVmOC1hYjgwLTdhMzNhNGYyMWMzZSI+PGRz
+OlNpZ25lZEluZm8+PGRzOkNhbm9uaWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGhtPSJodHRwOi8v
+d3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJlTWV0aG9kIEFs
+Z29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxkc2lnLW1vcmUjcnNhLXNoYTI1
+NiIvPjxkczpSZWZlcmVuY2UgVVJJPSIjXzZmMWVmMTA2LWFkNGMtNDk2Zi1hMDcyLWVmYjgzYmZl
+ZGNmYSI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cu
+dzMub3JnLzIwMDAvMDkveG1sZHNpZyNlbnZlbG9wZWQtc2lnbmF0dXJlIi8+PGRzOlRyYW5zZm9y
+bSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwv
+ZHM6VHJhbnNmb3Jtcz48ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5v
+cmcvMjAwMS8wNC94bWxlbmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPkJwRHlPTHk5UFkyQ0sv
+cE5zei9LNXVoVWhxMjBTQjIxNkY2eVBuWTZyYVU9PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVy
+ZW5jZT48ZHM6UmVmZXJlbmNlIFVSST0iI18wM2M4ZDBlYS05ZjE5LTQwNWQtYTk2Ny1mOThjNDYz
+NDRmMDUiPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3
+LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2Vz
+dE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1
+NiIvPjxkczpEaWdlc3RWYWx1ZT5ZWmRnNEcrSVhVZTlJeitWa1I1MGYvRzdDYUZ5Z055a1FsMXdy
+K01VMGRzPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PC9kczpTaWduZWRJbmZvPjxk
+czpTaWduYXR1cmVWYWx1ZSBJZD0iX2NkYWUxNTM5LWFjMjktNGU5MS04MWYxLTc4NDM3NTAwNTcz
+ZiI+R05GVzFqQkVTSHpHcEYvVERJbldSQnBMZ0RDN2hsV29xVnZ2TW5kam9QUVZCVDBMSXA3L3Zw
+REJZT1NROE1DM1BvRnhaRkZXVHlWNSYjMTM7CitzVmt5WGFyM2VWaXRXMFNMRXVlYzRSTGtoRUVQ
+dkxNTGpUVUdmOTBKOGEyTFY2dTd3V2FQNGw0YkltQmlDbmVzb081bzNTRDB2aUkmIzEzOwpkVlFS
+WlJLeDdjYUREN1FOcmFxT0dXS0ZXSm5OSTlpSnl0M2pyNG9qNXVZbEsvQ0VoUEhPRnRreFFHOVkx
+U3VsNW5GZ0dlUER6ZVNiJiMxMzsKUlFucjhpU3Jta05YUWd3V29tbW5QTzNJZGRRenFlaVA2WCt0
+QjBKNEZqNDErQThSRFFjdnZWeWZycWFxSVJTL0I4ZzlPeXQ5Mmt1SSYjMTM7CmRyc01zU2hPVU5G
+VGNTSDY4SGdJTHUzcEJnYVowVVVGVkxpWTRxNkJuVk1NaFFOSU9pVXZ0ZlU3QVdWdTRJZSt4ZThG
+aE14T2w4dFAmIzEzOwpyM2U1S3BSalNvTjAyUDhzU080UmQwcjlRZHhTT1kyTFR3T09kNDVzOGl2
+UmJ1VDJad2FKMkJsdW1oWTJFT1dQbWpMb2lSS3p4RExoJiMxMzsKMHpxczJ5ZzdBMU1nRSt4NWFq
+NTVBK09jdUg3NVRnYisyZnljbmx1MTU0cHhzbnZYSWtUTTIzTWFCcXpKaEZ6QWFHYm1qeFJJL3I2
+ZSYjMTM7ClQwK0pHdDd5Ykx6aW9KdU5CWHJ0OVcvc2tVUnQ4RVQrRFF3aGIxOHdNbHdybTZmY1hZ
+dzh6SXVob0F2QkEyZjBtejg2SW0rYU8wMmEmIzEzOwpONkVpeU1Rb2tXL3FhenVNQ1hETGNteGxB
+MG95QnlITW5McFZlTnJoaHR2QTkvb2JtY08zSzB4b0hXQkpGTnIrTVBFSGxIRGprMW89PC9kczpT
+aWduYXR1cmVWYWx1ZT48ZHM6S2V5SW5mbyBJZD0iXzAzYzhkMGVhLTlmMTktNDA1ZC1hOTY3LWY5
+OGM0NjM0NGYwNSI+PGRzOlg1MDlEYXRhPjxkczpYNTA5Q2VydGlmaWNhdGU+TUlJSFh6Q0NCVWVn
+QXdJQkFnSVVYcUkvdmQxOENhZzk4b05wZHpWN0JpeS82RUF3RFFZSktvWklodmNOQVFFTkJRQXdm
+REVMTUFrRyYjMTM7CkExVUVCaE1DVlZNeFBEQTZCZ05WQkFvTU0wbHVkR1Z5Ym1WMElFTnZjbkJ2
+Y21GMGFXOXVJR1p2Y2lCQmMzTnBaMjVsWkNCT1lXMWwmIzEzOwpjeUJoYm1RZ1RuVnRZbVZ5Y3pF
+dk1DMEdBMVVFQXd3bVNVTkJUazRnVkhKaFpHVnRZWEpySUVOc1pXRnlhVzVuYUc5MWMyVWdVR2xz
+JiMxMzsKYjNRZ1EwRXdIaGNOTWpJeE1URTJNVE15T0RVNVdoY05NamN4TVRFMU1UTXlPRFU1V2pD
+QjBERUxNQWtHQTFVRUJoTUNRa1V4RVRBUCYjMTM7CkJnTlZCQWdUQ0VKeWRYTnpaV3h6TVJJd0VB
+WURWUVFIRXdsV2FXeDJiMjl5WkdVeE16QXhCZ05WQkFvVEtrUmxiRzlwZEhSbElFTnYmIzEzOwpi
+bk4xYkhScGJtY2dZVzVrSUVGa2RtbHpiM0o1SUVOV1FrRXZVME5TVERFK01Ed0dBMVVFQXhNMVNV
+TkJUazRnVkUxRFNDQkJkWFJvJiMxMzsKYjNKcGVtVmtJRlJ5WVdSbGJXRnlheUJRYVd4dmRDQldZ
+V3hwWkdGMGIzSWdWbUZzYVdReEpUQWpCZ2txaGtpRzl3MEJDUUVXRm1KbCYjMTM7CmRHMWphSE50
+WkVCa1pXeHZhWFIwWlM1amIyMHdnZ0lpTUEwR0NTcUdTSWIzRFFFQkFRVUFBNElDRHdBd2dnSUtB
+b0lDQVFDNkZKd3omIzEzOwpLcVFWWDZmRzMvRUxSU0dXVjlHckthRk1LbWhXSXhlcHdSWk42TXhN
+cWtkNURuWWZpVCtXcDk4akVrcWdUeDJVTWI5cXVnY0dOVjZnJiMxMzsKMzUvQ3JRYi9GL216M0M0
+c2ZMTnVEcFNxSzlRRjgrcGFUSDZoUW1yT3BxVitVVHZkajlTTWdLR3lGaXpTODhDRFdNeDR3M2k0
+RkFLZSYjMTM7CjZOUnNKUkdUQXRLRHVNSGNBNHNqMDhHamUzbFBXY2dGdmNRTkRWZUVCVHVPSEJH
+K1JoajdWMUppTkdQLzRlcFRYVEZYZ1BGRGdlejMmIzEzOwpZQWZ4cXBidU80VFg2YmJZZGsybnZN
+TEZ2TEVOa0NGWXVsbllQemduRUJHU01LSWFBSWxiK3NjSEN2V2dXajJUTGd3aDJHSk5jelZNJiMx
+MzsKMUxQTXFHUytVa2k5TWg3OTgyMi94b2FyNDk4eER4Mll4Lzhzd2dFTkxTZ0NzUUFXOG5NZ3dX
+bjZBYllsMlJBQlh1cmF5RnNuNFAxUiYjMTM7CnVRTm1VcC9xclJLUnZTSnIxT0xrSFpmRlRjU1lR
+YVZpdU1ZUFh6R3o4dG1NTGxtSS9CNkFDSDRBd1JNZG5ZdkZPM0tJMVJCblBLSWQmIzEzOwp3d2ZV
+cFo1SVRJcGJBN0NHZ1R4MXF4dE0xd0lVcjdwSGVLUDZqVmUza2RETGcrL0JaMnhNRXRCazVhOFk3
+QjR2M3h3SFhHVHZWOG1OJiMxMzsKMEFnL1N5VC9RVXlFUmhYVXlBTjIrRXdaK1NRQ1V5TmZ6aW9X
+UTg3OGVHeWtVKzQ2K0JiZ0kzSUlyMzZYS1B3bXp0MFNaK0tJM3RuRiYjMTM7ClRsbjltWDBLQzBp
+ZG9qNXlrelBvQy9NSWVkMHNwNFRpZ3hFYldOeDdFRjgwUHZSL0RERXdWUEVFa2tqeTYzWEZ1bHhp
+Q1FJREFRQUImIzEzOwpvNElCZ2pDQ0FYNHdEQVlEVlIwVEFRSC9CQUl3QURBT0JnTlZIUThCQWY4
+RUJBTUNCNEF3SFFZRFZSME9CQllFRkhuOXMwREVhMmt2JiMxMzsKZ0UvZUlPVHNxb1c4NU1YRk1J
+RzZCZ05WSFNNRWdiSXdnYStBRkVkN1Q2NTZVWkcxMGIrZE51bUdmellXQktsRm9ZR0FwSDR3ZkRF
+TCYjMTM7Ck1Ba0dBMVVFQmhNQ1ZWTXhQREE2QmdOVkJBb01NMGx1ZEdWeWJtVjBJRU52Y25CdmNt
+RjBhVzl1SUdadmNpQkJjM05wWjI1bFpDQk8mIzEzOwpZVzFsY3lCaGJtUWdUblZ0WW1WeWN6RXZN
+QzBHQTFVRUF3d21TVU5CVGs0Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5YVc1bmFHOTFjMlVnJiMxMzsK
+VUdsc2IzUWdRMEdDRkhwcWJURmVKY1B0VUM5WHV1UEtQc0x3RFIrTU1EUUdBMVVkSHdRdE1Dc3dL
+YUFub0NXR0kyaDBkSEE2THk5aiYjMTM7CmNtd3VhV05oYm00dWIzSm5MM1J0WTJoZmNHbHNiM1F1
+WTNKc01Fd0dBMVVkSUFSRk1FTXdFQVlPS3dZQkJBR0N5UnNCQllNN0RBb3cmIzEzOwpMd1lJS3dZ
+QkJRVUhBZ0V3SXpBaEJnZ3JCZ0VGQlFjQ0FSWVZhSFIwY0hNNkx5OWpjSE11YVdOaGJtNHViM0pu
+TUEwR0NTcUdTSWIzJiMxMzsKRFFFQkRRVUFBNElDQVFCZFNhdDU2dWVqTG5BakZJRjk1ZGpZV0k2
+cy8vTjZZWHhzcnJNa0dCUDhFZXpQeWhMaDZhd1A0ejdROVFBSSYjMTM7ClFaa1lveHJsLzF5MCti
+eVYycW5UVVVDTFJwSy9CRHAvaGNmd1BmS0NBLzJSUUNISnJiNit6MGVuRFBGUkswTkttd09jZGxH
+dFVrMG0mIzEzOwpQZ1dHU0t0dXdWc1BBaFRESnVob3NaT2hrTmYrblNPT0hyUU9uMUUycnpPcmQv
+a1FscWlDd1JIOTc5Nk5wVEErSFNNZk9vYkpFRVBxJiMxMzsKdHBGN1A1cWJ3dGw5NVVhNU9wNEFo
+YTcwSEhmVUZTNEJPUUtMQlZmTVpkT1IraVBvaDVPd0FLK2h0WWtGQ0c5UDJXSHU3d2Y4RUMrVyYj
+MTM7CjdrOTZndlRkOHhFN291b2FiVDJ4NllmWXFFbFBIaVUvSU05Z1Z6V1dML3N2WUR5U1Z1b0Z3
+QmpETk4xY2RxMHFPWVIxeXVTMWMvOUQmIzEzOwpGUjdlbzdHRkVDeStUQmQ3SWlLUmZCVmVZR09P
+UE1ub0ZmeFJMV3Jwc1dObndEN2xrUGtMQ2dGQ2srOHlFY09SZzYyNW1vNjV6NHk2JiMxMzsKSjRL
+OGZvZGE3cXdtWE5QM1JTMThvbjZCSHQ4bFErYlhnT0hteElIazBhTzBxTkRxZ3ZMcjJGbHlMR0pH
+aUVNUnFETU1SNi9hMDZidCYjMTM7CmtuVU1IbDdDcU1maklralA0Vk5OeUdQZEpnd1ZrMmtlYjl1
+TkZ2SkN4VCtNMmZHWFExTmJKTmZ0djVNZ1NzcDlOMXkreDZnQTNFaHcmIzEzOwp5SGxtSkI0WU10
+bzh0VFYxaTg0eFBYeGkyQ0FlRGFHRHV3b3N0OFlVQ1NqcTdSQ0s4dEdjYUFZcmtYUVkyeVFmWDNj
+d0RzRXhScVZXJiMxMzsKeXJqeVJ0K042bUs5OVE9PTwvZHM6WDUwOUNlcnRpZmljYXRlPjwvZHM6
+WDUwOURhdGE+PC9kczpLZXlJbmZvPjwvZHM6U2lnbmF0dXJlPjwvc21kOnNpZ25lZE1hcms+Cg==
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Agent-Chinese/TreatyStatute-Agent-Chinese-Active.smd b/core/src/test/resources/google/registry/tmch/idn/Agent-Chinese/TreatyStatute-Agent-Chinese-Active.smd
new file mode 100644
index 000000000..d7d147286
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Agent-Chinese/TreatyStatute-Agent-Chinese-Active.smd
@@ -0,0 +1,122 @@
+Marks: 检查&查询
+smdID: 000000811669082848199-65535
+U-labels: xn----sh7bb78f789j, xn--and-bp0gd32k781m, xn--jvva96di40i
+notBefore: 2022-11-22T02:07:28.199Z
+notAfter: 2027-10-18T14:36:50.931Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il9hZDgx
+YThhMS05OTE3LTRkYzgtYjQ3Ny04M2UwMDNmOThkZDciPjxzbWQ6aWQ+MDAwMDAwODExNjY5MDgy
+ODQ4MTk5LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMjowNzoyOC4xOTlaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0xOFQxNDozNjo1MC45MzFaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
+cmVhdHlPclN0YXR1dGU+PG1hcms6aWQ+MDAwMTQ2MTUwMzA2Njk3NjE1MDMwNjY5NzYtMTwvbWFy
+azppZD48bWFyazptYXJrTmFtZT7mo4Dmn6UmYW1wO+afpeivojwvbWFyazptYXJrTmFtZT48bWFy
+azpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpvcmc+5bel56iL5aSEPC9tYXJrOm9y
+Zz48bWFyazphZGRyPjxtYXJrOnN0cmVldD7pppnmuK/kuJzot6825Y+377yMNeWPt+alvO+8jDjl
+j7flrqQ8L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+6Z2S5bKb5biCPC9tYXJrOmNpdHk+PG1hcms6
+cGM+MzUwMDwvbWFyazpwYz48bWFyazpjYz5DTjwvbWFyazpjYz48L21hcms6YWRkcj48L21hcms6
+aG9sZGVyPjxtYXJrOmNvbnRhY3QgdHlwZT0iYWdlbnQiPjxtYXJrOm5hbWU+5p2O5bCP5pa5PC9t
+YXJrOm5hbWU+PG1hcms6b3JnPuW3peeoi+WkhDwvbWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpz
+dHJlZXQ+6aaZ5riv5Lic6LevNuWPt++8jDXlj7fmpbzvvIw45Y+35a6kPC9tYXJrOnN0cmVldD48
+bWFyazpjaXR5PumdkuWym+W4gjwvbWFyazpjaXR5PjxtYXJrOnBjPjM1MDA8L21hcms6cGM+PG1h
+cms6Y2M+Q048L21hcms6Y2M+PC9tYXJrOmFkZHI+PG1hcms6dm9pY2U+Kzg2LjEwODQ2NTcxNzM8
+L21hcms6dm9pY2U+PG1hcms6ZmF4Pis4Ni4xMDg0NjU3MTc1PC9tYXJrOmZheD48bWFyazplbWFp
+bD5pbmZvQGNoaW5lc2UtYWdlbmN5LmNvbTwvbWFyazplbWFpbD48L21hcms6Y29udGFjdD48bWFy
+azpwcm90ZWN0aW9uPjxtYXJrOmNjPlVTPC9tYXJrOmNjPjxtYXJrOnJ1bGluZz5DTjwvbWFyazpy
+dWxpbmc+PC9tYXJrOnByb3RlY3Rpb24+PG1hcms6bGFiZWw+eG4tLS0tc2g3YmI3OGY3ODlqPC9t
+YXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1hbmQtYnAwZ2QzMms3ODFtPC9tYXJrOmxhYmVsPjxt
+YXJrOmxhYmVsPnhuLS1qdnZhOTZkaTQwaTwvbWFyazpsYWJlbD48bWFyazpnb29kc0FuZFNlcnZp
+Y2VzPiDlkInku5Y8L21hcms6Z29vZHNBbmRTZXJ2aWNlcz48bWFyazpyZWZOdW0+MTIzNDwvbWFy
+azpyZWZOdW0+PG1hcms6cHJvRGF0ZT4yMDAwLTAxLTAxVDAwOjAwOjAwLjAwMFo8L21hcms6cHJv
+RGF0ZT48bWFyazp0aXRsZT5UZXN0IFRyZWF0eTwvbWFyazp0aXRsZT48bWFyazpleGVjRGF0ZT4y
+MDEzLTAyLTAyVDAwOjAwOjAwLjAwMFo8L21hcms6ZXhlY0RhdGU+PC9tYXJrOnRyZWF0eU9yU3Rh
+dHV0ZT48L21hcms6bWFyaz48ZHM6U2lnbmF0dXJlIHhtbG5zOmRzPSJodHRwOi8vd3d3LnczLm9y
+Zy8yMDAwLzA5L3htbGRzaWcjIiBJZD0iXzUxYzkxN2Q4LTQ0ODYtNDIzMC04MDU0LWY5ZTZhYTBl
+YTMwZCI+PGRzOlNpZ25lZEluZm8+PGRzOkNhbm9uaWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGht
+PSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJl
+TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxkc2lnLW1vcmUj
+cnNhLXNoYTI1NiIvPjxkczpSZWZlcmVuY2UgVVJJPSIjX2FkODFhOGExLTk5MTctNGRjOC1iNDc3
+LTgzZTAwM2Y5OGRkNyI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0
+dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1sZHNpZyNlbnZlbG9wZWQtc2lnbmF0dXJlIi8+PGRz
+OlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1j
+MTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDov
+L3d3dy53My5vcmcvMjAwMS8wNC94bWxlbmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPmw0QUNG
+V3hITGo4TVhnNVdmaWw2dVlnWENEcGxOdE5udXB6STNVVkVMLzg9PC9kczpEaWdlc3RWYWx1ZT48
+L2RzOlJlZmVyZW5jZT48ZHM6UmVmZXJlbmNlIFVSST0iI18zMDJlYWVkZS05MWM0LTRmMWMtODkx
+ZC00YzUzNjM5OGZiNDkiPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJo
+dHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+
+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1s
+ZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1ZT5hbWZvSU03L21lUVV3YWpzK2MxV0ZDZUw3d3JW
+T3pzSDFmWWpzVmVYN25NPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PC9kczpTaWdu
+ZWRJbmZvPjxkczpTaWduYXR1cmVWYWx1ZSBJZD0iX2I3NTIxOWY1LTY0NTItNDg5MS1iMjk1LTQw
+Mjg1Njc3MGYyZCI+VnFVeHZCVllYOWcrWTFZODN6WkpnbDBVOWFRMFBQaXpwOUVEcEtqYmkrU256
+V3k0M3g3NVd1bzl4ejNLdmF0NFJFb3duQmhRY2ZFLyYjMTM7Cm5PNEF1ZDE2REEzWE5zb2ovbXVK
+c0JQOEJKcytHQ1p6UHQ4ZkNZeWFMWkhkeFdUWThIK1I3dmdlUGZGK2ozcnA4NFFLYUR2Y0MzOVMm
+IzEzOwovejhLdzVHNEJhdUNJY1ROM1FSY08rRnlaOFZUS3dGR05vYzJEVEE1VTBWZFowZE9OUkh0
+aWh0QUJQVG82SU9Gdlg1UmpuSHROWXNWJiMxMzsKMmlkYjNMYjhaY2RiZzRlVWsraGd1dDRGQ3l6
+Y0FOM25SNTUvWEdZVkdodUhWVENidnR0REUweHZ6RzBTZlc2ZTlyd2FGSE1iY2lvbSYjMTM7Cmlm
+VjdySXhGNWlNdXRBVkJWMEhkMDBSQTJZVkNMeHg0YjZwNWtnOTMyeVF6MnVNSW81bUJSNkhGYm5a
+dk11WkFrSUkvemtKWXd0RHImIzEzOwpuZ0svOUtPSG4zYnVERStQSHlML3llZlVaVzg5MFk3eGtv
+djRGQmtQdDFubWZubHRjQmx0MkdrSTF1RHhycHRLM2dmQndQZk9SSXZlJiMxMzsKbTFkSC9tTXI4
+QVp2THpjRTJlMnUyOU80bFRIRlliVG1lUEpSYmk0eXphYkdvWWhucEpXSE5rdjZmRmdDaVYzMTlq
+aE1IMlh5UEVDciYjMTM7CnJoTVhTSERIcVUzTnhpa0dWaDg4RFZ6OWo2a1MzaU9EVmNoamJ5R3cv
+M29pYVRmL1JaODg1cGhZYnpBei9PMnJtVTROUi9ISDE4WU8mIzEzOwpvR3ZxdCtjOXZweGxOLzBF
+QUp4Zm03WGpCaFRWaWkxdUFVY0luSFU5TlNuMG1GRDhoUCtwdFEvd2d6YUxxM1ZOYk50aVUyanpn
+bEU9PC9kczpTaWduYXR1cmVWYWx1ZT48ZHM6S2V5SW5mbyBJZD0iXzMwMmVhZWRlLTkxYzQtNGYx
+Yy04OTFkLTRjNTM2Mzk4ZmI0OSI+PGRzOlg1MDlEYXRhPjxkczpYNTA5Q2VydGlmaWNhdGU+TUlJ
+SFh6Q0NCVWVnQXdJQkFnSVVYcUkvdmQxOENhZzk4b05wZHpWN0JpeS82RUF3RFFZSktvWklodmNO
+QVFFTkJRQXdmREVMTUFrRyYjMTM7CkExVUVCaE1DVlZNeFBEQTZCZ05WQkFvTU0wbHVkR1Z5Ym1W
+MElFTnZjbkJ2Y21GMGFXOXVJR1p2Y2lCQmMzTnBaMjVsWkNCT1lXMWwmIzEzOwpjeUJoYm1RZ1Ru
+VnRZbVZ5Y3pFdk1DMEdBMVVFQXd3bVNVTkJUazRnVkhKaFpHVnRZWEpySUVOc1pXRnlhVzVuYUc5
+MWMyVWdVR2xzJiMxMzsKYjNRZ1EwRXdIaGNOTWpJeE1URTJNVE15T0RVNVdoY05NamN4TVRFMU1U
+TXlPRFU1V2pDQjBERUxNQWtHQTFVRUJoTUNRa1V4RVRBUCYjMTM7CkJnTlZCQWdUQ0VKeWRYTnpa
+V3h6TVJJd0VBWURWUVFIRXdsV2FXeDJiMjl5WkdVeE16QXhCZ05WQkFvVEtrUmxiRzlwZEhSbElF
+TnYmIzEzOwpibk4xYkhScGJtY2dZVzVrSUVGa2RtbHpiM0o1SUVOV1FrRXZVME5TVERFK01Ed0dB
+MVVFQXhNMVNVTkJUazRnVkUxRFNDQkJkWFJvJiMxMzsKYjNKcGVtVmtJRlJ5WVdSbGJXRnlheUJR
+YVd4dmRDQldZV3hwWkdGMGIzSWdWbUZzYVdReEpUQWpCZ2txaGtpRzl3MEJDUUVXRm1KbCYjMTM7
+CmRHMWphSE50WkVCa1pXeHZhWFIwWlM1amIyMHdnZ0lpTUEwR0NTcUdTSWIzRFFFQkFRVUFBNElD
+RHdBd2dnSUtBb0lDQVFDNkZKd3omIzEzOwpLcVFWWDZmRzMvRUxSU0dXVjlHckthRk1LbWhXSXhl
+cHdSWk42TXhNcWtkNURuWWZpVCtXcDk4akVrcWdUeDJVTWI5cXVnY0dOVjZnJiMxMzsKMzUvQ3JR
+Yi9GL216M0M0c2ZMTnVEcFNxSzlRRjgrcGFUSDZoUW1yT3BxVitVVHZkajlTTWdLR3lGaXpTODhD
+RFdNeDR3M2k0RkFLZSYjMTM7CjZOUnNKUkdUQXRLRHVNSGNBNHNqMDhHamUzbFBXY2dGdmNRTkRW
+ZUVCVHVPSEJHK1JoajdWMUppTkdQLzRlcFRYVEZYZ1BGRGdlejMmIzEzOwpZQWZ4cXBidU80VFg2
+YmJZZGsybnZNTEZ2TEVOa0NGWXVsbllQemduRUJHU01LSWFBSWxiK3NjSEN2V2dXajJUTGd3aDJH
+Sk5jelZNJiMxMzsKMUxQTXFHUytVa2k5TWg3OTgyMi94b2FyNDk4eER4Mll4Lzhzd2dFTkxTZ0Nz
+UUFXOG5NZ3dXbjZBYllsMlJBQlh1cmF5RnNuNFAxUiYjMTM7CnVRTm1VcC9xclJLUnZTSnIxT0xr
+SFpmRlRjU1lRYVZpdU1ZUFh6R3o4dG1NTGxtSS9CNkFDSDRBd1JNZG5ZdkZPM0tJMVJCblBLSWQm
+IzEzOwp3d2ZVcFo1SVRJcGJBN0NHZ1R4MXF4dE0xd0lVcjdwSGVLUDZqVmUza2RETGcrL0JaMnhN
+RXRCazVhOFk3QjR2M3h3SFhHVHZWOG1OJiMxMzsKMEFnL1N5VC9RVXlFUmhYVXlBTjIrRXdaK1NR
+Q1V5TmZ6aW9XUTg3OGVHeWtVKzQ2K0JiZ0kzSUlyMzZYS1B3bXp0MFNaK0tJM3RuRiYjMTM7ClRs
+bjltWDBLQzBpZG9qNXlrelBvQy9NSWVkMHNwNFRpZ3hFYldOeDdFRjgwUHZSL0RERXdWUEVFa2tq
+eTYzWEZ1bHhpQ1FJREFRQUImIzEzOwpvNElCZ2pDQ0FYNHdEQVlEVlIwVEFRSC9CQUl3QURBT0Jn
+TlZIUThCQWY4RUJBTUNCNEF3SFFZRFZSME9CQllFRkhuOXMwREVhMmt2JiMxMzsKZ0UvZUlPVHNx
+b1c4NU1YRk1JRzZCZ05WSFNNRWdiSXdnYStBRkVkN1Q2NTZVWkcxMGIrZE51bUdmellXQktsRm9Z
+R0FwSDR3ZkRFTCYjMTM7Ck1Ba0dBMVVFQmhNQ1ZWTXhQREE2QmdOVkJBb01NMGx1ZEdWeWJtVjBJ
+RU52Y25CdmNtRjBhVzl1SUdadmNpQkJjM05wWjI1bFpDQk8mIzEzOwpZVzFsY3lCaGJtUWdUblZ0
+WW1WeWN6RXZNQzBHQTFVRUF3d21TVU5CVGs0Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5YVc1bmFHOTFj
+MlVnJiMxMzsKVUdsc2IzUWdRMEdDRkhwcWJURmVKY1B0VUM5WHV1UEtQc0x3RFIrTU1EUUdBMVVk
+SHdRdE1Dc3dLYUFub0NXR0kyaDBkSEE2THk5aiYjMTM7CmNtd3VhV05oYm00dWIzSm5MM1J0WTJo
+ZmNHbHNiM1F1WTNKc01Fd0dBMVVkSUFSRk1FTXdFQVlPS3dZQkJBR0N5UnNCQllNN0RBb3cmIzEz
+OwpMd1lJS3dZQkJRVUhBZ0V3SXpBaEJnZ3JCZ0VGQlFjQ0FSWVZhSFIwY0hNNkx5OWpjSE11YVdO
+aGJtNHViM0puTUEwR0NTcUdTSWIzJiMxMzsKRFFFQkRRVUFBNElDQVFCZFNhdDU2dWVqTG5BakZJ
+Rjk1ZGpZV0k2cy8vTjZZWHhzcnJNa0dCUDhFZXpQeWhMaDZhd1A0ejdROVFBSSYjMTM7ClFaa1lv
+eHJsLzF5MCtieVYycW5UVVVDTFJwSy9CRHAvaGNmd1BmS0NBLzJSUUNISnJiNit6MGVuRFBGUksw
+Tkttd09jZGxHdFVrMG0mIzEzOwpQZ1dHU0t0dXdWc1BBaFRESnVob3NaT2hrTmYrblNPT0hyUU9u
+MUUycnpPcmQva1FscWlDd1JIOTc5Nk5wVEErSFNNZk9vYkpFRVBxJiMxMzsKdHBGN1A1cWJ3dGw5
+NVVhNU9wNEFoYTcwSEhmVUZTNEJPUUtMQlZmTVpkT1IraVBvaDVPd0FLK2h0WWtGQ0c5UDJXSHU3
+d2Y4RUMrVyYjMTM7CjdrOTZndlRkOHhFN291b2FiVDJ4NllmWXFFbFBIaVUvSU05Z1Z6V1dML3N2
+WUR5U1Z1b0Z3QmpETk4xY2RxMHFPWVIxeXVTMWMvOUQmIzEzOwpGUjdlbzdHRkVDeStUQmQ3SWlL
+UmZCVmVZR09PUE1ub0ZmeFJMV3Jwc1dObndEN2xrUGtMQ2dGQ2srOHlFY09SZzYyNW1vNjV6NHk2
+JiMxMzsKSjRLOGZvZGE3cXdtWE5QM1JTMThvbjZCSHQ4bFErYlhnT0hteElIazBhTzBxTkRxZ3ZM
+cjJGbHlMR0pHaUVNUnFETU1SNi9hMDZidCYjMTM7CmtuVU1IbDdDcU1maklralA0Vk5OeUdQZEpn
+d1ZrMmtlYjl1TkZ2SkN4VCtNMmZHWFExTmJKTmZ0djVNZ1NzcDlOMXkreDZnQTNFaHcmIzEzOwp5
+SGxtSkI0WU10bzh0VFYxaTg0eFBYeGkyQ0FlRGFHRHV3b3N0OFlVQ1NqcTdSQ0s4dEdjYUFZcmtY
+UVkyeVFmWDNjd0RzRXhScVZXJiMxMzsKeXJqeVJ0K042bUs5OVE9PTwvZHM6WDUwOUNlcnRpZmlj
+YXRlPjwvZHM6WDUwOURhdGE+PC9kczpLZXlJbmZvPjwvZHM6U2lnbmF0dXJlPjwvc21kOnNpZ25l
+ZE1hcms+Cg==
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Agent-Chinese/TreatyStatute-Agent-Chinese-Revoked.smd b/core/src/test/resources/google/registry/tmch/idn/Agent-Chinese/TreatyStatute-Agent-Chinese-Revoked.smd
new file mode 100644
index 000000000..419242fd8
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Agent-Chinese/TreatyStatute-Agent-Chinese-Revoked.smd
@@ -0,0 +1,122 @@
+Marks: 检查&查询
+smdID: 000000811669082791326-65535
+U-labels: xn----sh7bb78f789j, xn--and-bp0gd32k781m, xn--jvva96di40i
+notBefore: 2022-11-22T02:06:31.326Z
+notAfter: 2027-10-18T14:36:50.931Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il8xZWJm
+MTI5Yi01NjkwLTQxZjYtOTZmNC0xOTU0NzJmZWQyYmQiPjxzbWQ6aWQ+MDAwMDAwODExNjY5MDgy
+NzkxMzI2LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMjowNjozMS4zMjZaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0xOFQxNDozNjo1MC45MzFaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
+cmVhdHlPclN0YXR1dGU+PG1hcms6aWQ+MDAwMTQ2MTUwMzA2Njk3NjE1MDMwNjY5NzYtMTwvbWFy
+azppZD48bWFyazptYXJrTmFtZT7mo4Dmn6UmYW1wO+afpeivojwvbWFyazptYXJrTmFtZT48bWFy
+azpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpvcmc+5bel56iL5aSEPC9tYXJrOm9y
+Zz48bWFyazphZGRyPjxtYXJrOnN0cmVldD7pppnmuK/kuJzot6825Y+377yMNeWPt+alvO+8jDjl
+j7flrqQ8L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+6Z2S5bKb5biCPC9tYXJrOmNpdHk+PG1hcms6
+cGM+MzUwMDwvbWFyazpwYz48bWFyazpjYz5DTjwvbWFyazpjYz48L21hcms6YWRkcj48L21hcms6
+aG9sZGVyPjxtYXJrOmNvbnRhY3QgdHlwZT0iYWdlbnQiPjxtYXJrOm5hbWU+5p2O5bCP5pa5PC9t
+YXJrOm5hbWU+PG1hcms6b3JnPuW3peeoi+WkhDwvbWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpz
+dHJlZXQ+6aaZ5riv5Lic6LevNuWPt++8jDXlj7fmpbzvvIw45Y+35a6kPC9tYXJrOnN0cmVldD48
+bWFyazpjaXR5PumdkuWym+W4gjwvbWFyazpjaXR5PjxtYXJrOnBjPjM1MDA8L21hcms6cGM+PG1h
+cms6Y2M+Q048L21hcms6Y2M+PC9tYXJrOmFkZHI+PG1hcms6dm9pY2U+Kzg2LjEwODQ2NTcxNzM8
+L21hcms6dm9pY2U+PG1hcms6ZmF4Pis4Ni4xMDg0NjU3MTc1PC9tYXJrOmZheD48bWFyazplbWFp
+bD5pbmZvQGNoaW5lc2UtYWdlbmN5LmNvbTwvbWFyazplbWFpbD48L21hcms6Y29udGFjdD48bWFy
+azpwcm90ZWN0aW9uPjxtYXJrOmNjPlVTPC9tYXJrOmNjPjxtYXJrOnJ1bGluZz5DTjwvbWFyazpy
+dWxpbmc+PC9tYXJrOnByb3RlY3Rpb24+PG1hcms6bGFiZWw+eG4tLS0tc2g3YmI3OGY3ODlqPC9t
+YXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1hbmQtYnAwZ2QzMms3ODFtPC9tYXJrOmxhYmVsPjxt
+YXJrOmxhYmVsPnhuLS1qdnZhOTZkaTQwaTwvbWFyazpsYWJlbD48bWFyazpnb29kc0FuZFNlcnZp
+Y2VzPiDlkInku5Y8L21hcms6Z29vZHNBbmRTZXJ2aWNlcz48bWFyazpyZWZOdW0+MTIzNDwvbWFy
+azpyZWZOdW0+PG1hcms6cHJvRGF0ZT4yMDAwLTAxLTAxVDAwOjAwOjAwLjAwMFo8L21hcms6cHJv
+RGF0ZT48bWFyazp0aXRsZT5UZXN0IFRyZWF0eTwvbWFyazp0aXRsZT48bWFyazpleGVjRGF0ZT4y
+MDEzLTAyLTAyVDAwOjAwOjAwLjAwMFo8L21hcms6ZXhlY0RhdGU+PC9tYXJrOnRyZWF0eU9yU3Rh
+dHV0ZT48L21hcms6bWFyaz48ZHM6U2lnbmF0dXJlIHhtbG5zOmRzPSJodHRwOi8vd3d3LnczLm9y
+Zy8yMDAwLzA5L3htbGRzaWcjIiBJZD0iXzBiYjNmZWIyLTQyNTgtNDQzMC1hMWE2LTc2MGExNDBm
+NDljMSI+PGRzOlNpZ25lZEluZm8+PGRzOkNhbm9uaWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGht
+PSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJl
+TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxkc2lnLW1vcmUj
+cnNhLXNoYTI1NiIvPjxkczpSZWZlcmVuY2UgVVJJPSIjXzFlYmYxMjliLTU2OTAtNDFmNi05NmY0
+LTE5NTQ3MmZlZDJiZCI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0
+dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1sZHNpZyNlbnZlbG9wZWQtc2lnbmF0dXJlIi8+PGRz
+OlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1j
+MTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDov
+L3d3dy53My5vcmcvMjAwMS8wNC94bWxlbmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPmpDQk1t
+STgwS0toVzB6TEVDTFFHZ3dNRzJvVm9qQzFsRXhrV2pnbjBEZjQ9PC9kczpEaWdlc3RWYWx1ZT48
+L2RzOlJlZmVyZW5jZT48ZHM6UmVmZXJlbmNlIFVSST0iI183NWMxMzU0Ni05ZTVjLTRkYjMtYTgy
+Mi0xNWVlOGU1NjkzNGEiPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJo
+dHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+
+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1s
+ZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1ZT5xQUFBS3lHa2N3N3FQZDNZVUdRbWhyanM3b0Nx
+MkVrZnNhS2EvTEVhenhNPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PC9kczpTaWdu
+ZWRJbmZvPjxkczpTaWduYXR1cmVWYWx1ZSBJZD0iX2FjZGYyZWUxLTM4MTMtNDRjZC05NGZiLWQ3
+N2Y4ZGQ2ZDg1YyI+bzZOUDlKYnVxeDAwWHF3NjBiY1JOVVlMaUFXNGRVTFRjSGZ4VUcwNk9VV3lt
+ekRoazlXblM0Q2hYMy9CVm1XWm9iMGQ4U3hXZkRpTSYjMTM7Cm9Yd1FHSXRYZnA3S0tYNTEzM0k5
+ckpiNHVZU3ZvM2gvVmtxdnEyd2RaQXJ0aUpoTHp3WFVRWGVqN1BYb203L0pSdGRSc2dJQ2tVTWcm
+IzEzOwpFcUg2ZjNPVk9KZy82NHFXVXdhaVQvNDNOMi9kMzlyQTJIbGw0blBnNzF4ZDdrbURCV0la
+Rk9FVHNRRkFmWi9kU3RydTdzcExHbnhWJiMxMzsKVFZ4V3JIWmQxWUhvY0hJWFFaV0k3VzRoVjZN
+YTErZms0MTJyWk9DTStQOENiUGdSaFloUHNYMXBJV2JkYm5KZWJSVWthSFFzS09qNiYjMTM7CkZo
+ckdpY0pPYWx1MnpFTExKQXQ0OW9JTkl3SWpubFlaMGcyM0hzM1RsZ0FzRVNzZE4wQlBmL1NjMHRl
+NW5CeXhmVm0vQXFkem9hNlImIzEzOwp4SDlqaldCQldFT1I0Z1ZQTWN2NEsxWlp6Ulp5M3hLcm5S
+VjkvbzQ4ME1LVWNwVlFGeWw5NVVXN0JOejg1Y0FQMm8za0drQzdDQ0xGJiMxMzsKL2tGNU94M3RC
+a0RKK2krcjlSY0ZnenVwYmhYQmdtSSt0b0xYbFRkbHpOMjlrcmQzS3R6ZEk0emtlRmpMbXZEbHJz
+QWRXTDE4UmJlMCYjMTM7CktOTGl6MDBWbXdscjNLNHZXZmhWMEs4TVY4TU90dUh6WXdtVXQvTFI3
+NGR0ZjhhTDVKZVBSQzhqM0cwaktrS2RUOGJFSEU3eFVKaFImIzEzOwpaa1RaVEhhZS9FT3UyaEZS
+amlVbm5jWEVDRTRSdzlJUnZQbVU2Z0lGczc0bGh4UXBXMVRuQUsvVGlZQ1A5YkhsdlU1cGRqengz
+NDQ9PC9kczpTaWduYXR1cmVWYWx1ZT48ZHM6S2V5SW5mbyBJZD0iXzc1YzEzNTQ2LTllNWMtNGRi
+My1hODIyLTE1ZWU4ZTU2OTM0YSI+PGRzOlg1MDlEYXRhPjxkczpYNTA5Q2VydGlmaWNhdGU+TUlJ
+SFh6Q0NCVWVnQXdJQkFnSVVYcUkvdmQxOENhZzk4b05wZHpWN0JpeS82RUF3RFFZSktvWklodmNO
+QVFFTkJRQXdmREVMTUFrRyYjMTM7CkExVUVCaE1DVlZNeFBEQTZCZ05WQkFvTU0wbHVkR1Z5Ym1W
+MElFTnZjbkJ2Y21GMGFXOXVJR1p2Y2lCQmMzTnBaMjVsWkNCT1lXMWwmIzEzOwpjeUJoYm1RZ1Ru
+VnRZbVZ5Y3pFdk1DMEdBMVVFQXd3bVNVTkJUazRnVkhKaFpHVnRZWEpySUVOc1pXRnlhVzVuYUc5
+MWMyVWdVR2xzJiMxMzsKYjNRZ1EwRXdIaGNOTWpJeE1URTJNVE15T0RVNVdoY05NamN4TVRFMU1U
+TXlPRFU1V2pDQjBERUxNQWtHQTFVRUJoTUNRa1V4RVRBUCYjMTM7CkJnTlZCQWdUQ0VKeWRYTnpa
+V3h6TVJJd0VBWURWUVFIRXdsV2FXeDJiMjl5WkdVeE16QXhCZ05WQkFvVEtrUmxiRzlwZEhSbElF
+TnYmIzEzOwpibk4xYkhScGJtY2dZVzVrSUVGa2RtbHpiM0o1SUVOV1FrRXZVME5TVERFK01Ed0dB
+MVVFQXhNMVNVTkJUazRnVkUxRFNDQkJkWFJvJiMxMzsKYjNKcGVtVmtJRlJ5WVdSbGJXRnlheUJR
+YVd4dmRDQldZV3hwWkdGMGIzSWdWbUZzYVdReEpUQWpCZ2txaGtpRzl3MEJDUUVXRm1KbCYjMTM7
+CmRHMWphSE50WkVCa1pXeHZhWFIwWlM1amIyMHdnZ0lpTUEwR0NTcUdTSWIzRFFFQkFRVUFBNElD
+RHdBd2dnSUtBb0lDQVFDNkZKd3omIzEzOwpLcVFWWDZmRzMvRUxSU0dXVjlHckthRk1LbWhXSXhl
+cHdSWk42TXhNcWtkNURuWWZpVCtXcDk4akVrcWdUeDJVTWI5cXVnY0dOVjZnJiMxMzsKMzUvQ3JR
+Yi9GL216M0M0c2ZMTnVEcFNxSzlRRjgrcGFUSDZoUW1yT3BxVitVVHZkajlTTWdLR3lGaXpTODhD
+RFdNeDR3M2k0RkFLZSYjMTM7CjZOUnNKUkdUQXRLRHVNSGNBNHNqMDhHamUzbFBXY2dGdmNRTkRW
+ZUVCVHVPSEJHK1JoajdWMUppTkdQLzRlcFRYVEZYZ1BGRGdlejMmIzEzOwpZQWZ4cXBidU80VFg2
+YmJZZGsybnZNTEZ2TEVOa0NGWXVsbllQemduRUJHU01LSWFBSWxiK3NjSEN2V2dXajJUTGd3aDJH
+Sk5jelZNJiMxMzsKMUxQTXFHUytVa2k5TWg3OTgyMi94b2FyNDk4eER4Mll4Lzhzd2dFTkxTZ0Nz
+UUFXOG5NZ3dXbjZBYllsMlJBQlh1cmF5RnNuNFAxUiYjMTM7CnVRTm1VcC9xclJLUnZTSnIxT0xr
+SFpmRlRjU1lRYVZpdU1ZUFh6R3o4dG1NTGxtSS9CNkFDSDRBd1JNZG5ZdkZPM0tJMVJCblBLSWQm
+IzEzOwp3d2ZVcFo1SVRJcGJBN0NHZ1R4MXF4dE0xd0lVcjdwSGVLUDZqVmUza2RETGcrL0JaMnhN
+RXRCazVhOFk3QjR2M3h3SFhHVHZWOG1OJiMxMzsKMEFnL1N5VC9RVXlFUmhYVXlBTjIrRXdaK1NR
+Q1V5TmZ6aW9XUTg3OGVHeWtVKzQ2K0JiZ0kzSUlyMzZYS1B3bXp0MFNaK0tJM3RuRiYjMTM7ClRs
+bjltWDBLQzBpZG9qNXlrelBvQy9NSWVkMHNwNFRpZ3hFYldOeDdFRjgwUHZSL0RERXdWUEVFa2tq
+eTYzWEZ1bHhpQ1FJREFRQUImIzEzOwpvNElCZ2pDQ0FYNHdEQVlEVlIwVEFRSC9CQUl3QURBT0Jn
+TlZIUThCQWY4RUJBTUNCNEF3SFFZRFZSME9CQllFRkhuOXMwREVhMmt2JiMxMzsKZ0UvZUlPVHNx
+b1c4NU1YRk1JRzZCZ05WSFNNRWdiSXdnYStBRkVkN1Q2NTZVWkcxMGIrZE51bUdmellXQktsRm9Z
+R0FwSDR3ZkRFTCYjMTM7Ck1Ba0dBMVVFQmhNQ1ZWTXhQREE2QmdOVkJBb01NMGx1ZEdWeWJtVjBJ
+RU52Y25CdmNtRjBhVzl1SUdadmNpQkJjM05wWjI1bFpDQk8mIzEzOwpZVzFsY3lCaGJtUWdUblZ0
+WW1WeWN6RXZNQzBHQTFVRUF3d21TVU5CVGs0Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5YVc1bmFHOTFj
+MlVnJiMxMzsKVUdsc2IzUWdRMEdDRkhwcWJURmVKY1B0VUM5WHV1UEtQc0x3RFIrTU1EUUdBMVVk
+SHdRdE1Dc3dLYUFub0NXR0kyaDBkSEE2THk5aiYjMTM7CmNtd3VhV05oYm00dWIzSm5MM1J0WTJo
+ZmNHbHNiM1F1WTNKc01Fd0dBMVVkSUFSRk1FTXdFQVlPS3dZQkJBR0N5UnNCQllNN0RBb3cmIzEz
+OwpMd1lJS3dZQkJRVUhBZ0V3SXpBaEJnZ3JCZ0VGQlFjQ0FSWVZhSFIwY0hNNkx5OWpjSE11YVdO
+aGJtNHViM0puTUEwR0NTcUdTSWIzJiMxMzsKRFFFQkRRVUFBNElDQVFCZFNhdDU2dWVqTG5BakZJ
+Rjk1ZGpZV0k2cy8vTjZZWHhzcnJNa0dCUDhFZXpQeWhMaDZhd1A0ejdROVFBSSYjMTM7ClFaa1lv
+eHJsLzF5MCtieVYycW5UVVVDTFJwSy9CRHAvaGNmd1BmS0NBLzJSUUNISnJiNit6MGVuRFBGUksw
+Tkttd09jZGxHdFVrMG0mIzEzOwpQZ1dHU0t0dXdWc1BBaFRESnVob3NaT2hrTmYrblNPT0hyUU9u
+MUUycnpPcmQva1FscWlDd1JIOTc5Nk5wVEErSFNNZk9vYkpFRVBxJiMxMzsKdHBGN1A1cWJ3dGw5
+NVVhNU9wNEFoYTcwSEhmVUZTNEJPUUtMQlZmTVpkT1IraVBvaDVPd0FLK2h0WWtGQ0c5UDJXSHU3
+d2Y4RUMrVyYjMTM7CjdrOTZndlRkOHhFN291b2FiVDJ4NllmWXFFbFBIaVUvSU05Z1Z6V1dML3N2
+WUR5U1Z1b0Z3QmpETk4xY2RxMHFPWVIxeXVTMWMvOUQmIzEzOwpGUjdlbzdHRkVDeStUQmQ3SWlL
+UmZCVmVZR09PUE1ub0ZmeFJMV3Jwc1dObndEN2xrUGtMQ2dGQ2srOHlFY09SZzYyNW1vNjV6NHk2
+JiMxMzsKSjRLOGZvZGE3cXdtWE5QM1JTMThvbjZCSHQ4bFErYlhnT0hteElIazBhTzBxTkRxZ3ZM
+cjJGbHlMR0pHaUVNUnFETU1SNi9hMDZidCYjMTM7CmtuVU1IbDdDcU1maklralA0Vk5OeUdQZEpn
+d1ZrMmtlYjl1TkZ2SkN4VCtNMmZHWFExTmJKTmZ0djVNZ1NzcDlOMXkreDZnQTNFaHcmIzEzOwp5
+SGxtSkI0WU10bzh0VFYxaTg0eFBYeGkyQ0FlRGFHRHV3b3N0OFlVQ1NqcTdSQ0s4dEdjYUFZcmtY
+UVkyeVFmWDNjd0RzRXhScVZXJiMxMzsKeXJqeVJ0K042bUs5OVE9PTwvZHM6WDUwOUNlcnRpZmlj
+YXRlPjwvZHM6WDUwOURhdGE+PC9kczpLZXlJbmZvPjwvZHM6U2lnbmF0dXJlPjwvc21kOnNpZ25l
+ZE1hcms+Cg==
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Agent-English/Court-Agent-English-Active.smd b/core/src/test/resources/google/registry/tmch/idn/Agent-English/Court-Agent-English-Active.smd
new file mode 100644
index 000000000..45e39c7aa
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Agent-English/Court-Agent-English-Active.smd
@@ -0,0 +1,123 @@
+Marks: Test & Validate
+smdID: 000000851669081693741-65535
+U-labels: test---validate, test--validate, test-and-validate, test-andvalidate, test-validate, testand-validate, testandvalidate, testvalidate
+notBefore: 2022-11-22T01:48:13.741Z
+notAfter: 2027-10-18T14:57:36.681Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il9jMDJk
+ZTdhNC00YjBjLTQwYTYtOWYzMy04NTgwZTY2YjY0YWIiPjxzbWQ6aWQ+MDAwMDAwODUxNjY5MDgx
+NjkzNzQxLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMTo0ODoxMy43NDFaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0xOFQxNDo1NzozNi42ODFaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazpj
+b3VydD48bWFyazppZD4wMDAxMzcxNTAzMDY3ODY4MTUwMzA2Nzg2OC0xPC9tYXJrOmlkPjxtYXJr
+Om1hcmtOYW1lPlRlc3QgJmFtcDsgVmFsaWRhdGU8L21hcms6bWFya05hbWU+PG1hcms6aG9sZGVy
+IGVudGl0bGVtZW50PSJvd25lciI+PG1hcms6bmFtZT5Ub255IEhvbGxhbmQ8L21hcms6bmFtZT48
+bWFyazpvcmc+QWcgY29ycG9yYXRpb248L21hcms6b3JnPjxtYXJrOmFkZHI+PG1hcms6c3RyZWV0
+PjEzMDUgQnJpZ2h0IEF2ZW51ZTwvbWFyazpzdHJlZXQ+PG1hcms6Y2l0eT5BcmNhZGlhPC9tYXJr
+OmNpdHk+PG1hcms6cGM+OTAwMjg8L21hcms6cGM+PG1hcms6Y2M+VVM8L21hcms6Y2M+PC9tYXJr
+OmFkZHI+PC9tYXJrOmhvbGRlcj48bWFyazpjb250YWN0IHR5cGU9ImFnZW50Ij48bWFyazpuYW1l
+PlRvbnkgSG9sbGFuZDwvbWFyazpuYW1lPjxtYXJrOm9yZz5BZyBjb3Jwb3JhdGlvbjwvbWFyazpv
+cmc+PG1hcms6YWRkcj48bWFyazpzdHJlZXQ+QnJpZ2h0IEF2ZW51ZSAxMzA1IDwvbWFyazpzdHJl
+ZXQ+PG1hcms6Y2l0eT5BcmNhZGlhPC9tYXJrOmNpdHk+PG1hcms6c3A+Q0E8L21hcms6c3A+PG1h
+cms6cGM+OTAwMjg8L21hcms6cGM+PG1hcms6Y2M+VVM8L21hcms6Y2M+PC9tYXJrOmFkZHI+PG1h
+cms6dm9pY2U+KzEuMjAyNTU2MjMwMjwvbWFyazp2b2ljZT48bWFyazpmYXg+KzEuMjAyNTU2MjMw
+MTwvbWFyazpmYXg+PG1hcms6ZW1haWw+aW5mb0BhZ2NvcnBvcmF0aW9uLmNvbTwvbWFyazplbWFp
+bD48L21hcms6Y29udGFjdD48bWFyazpsYWJlbD50ZXN0LS0tdmFsaWRhdGU8L21hcms6bGFiZWw+
+PG1hcms6bGFiZWw+dGVzdC0tdmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+dGVzdC1h
+bmQtdmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+dGVzdC1hbmR2YWxpZGF0ZTwvbWFy
+azpsYWJlbD48bWFyazpsYWJlbD50ZXN0LXZhbGlkYXRlPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVs
+PnRlc3RhbmQtdmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+dGVzdGFuZHZhbGlkYXRl
+PC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnRlc3R2YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazpn
+b29kc0FuZFNlcnZpY2VzPmd1aXRhcjwvbWFyazpnb29kc0FuZFNlcnZpY2VzPjxtYXJrOnJlZk51
+bT4xMjM0PC9tYXJrOnJlZk51bT48bWFyazpwcm9EYXRlPjIwMTMtMDEtMDFUMDA6MDA6MDAuMDAw
+WjwvbWFyazpwcm9EYXRlPjxtYXJrOmNjPlVTPC9tYXJrOmNjPjxtYXJrOmNvdXJ0TmFtZT5Ib3Zl
+PC9tYXJrOmNvdXJ0TmFtZT48L21hcms6Y291cnQ+PC9tYXJrOm1hcms+PGRzOlNpZ25hdHVyZSB4
+bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyIgSWQ9Il83MWU3MWEw
+My1mNzlmLTQ4NzQtYmQ0Zi1hZTJkZTliMDljMjAiPjxkczpTaWduZWRJbmZvPjxkczpDYW5vbmlj
+YWxpemF0aW9uTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwt
+ZXhjLWMxNG4jIi8+PGRzOlNpZ25hdHVyZU1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMu
+b3JnLzIwMDEvMDQveG1sZHNpZy1tb3JlI3JzYS1zaGEyNTYiLz48ZHM6UmVmZXJlbmNlIFVSST0i
+I19jMDJkZTdhNC00YjBjLTQwYTYtOWYzMy04NTgwZTY2YjY0YWIiPjxkczpUcmFuc2Zvcm1zPjxk
+czpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcj
+ZW52ZWxvcGVkLXNpZ25hdHVyZSIvPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3
+LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2Vz
+dE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1
+NiIvPjxkczpEaWdlc3RWYWx1ZT5wU1JWZy9zcVIxOC9RSFQ5SHV4SnlnekV0b3BsZ2Jwc2FjYk51
+bzZhcnhrPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PGRzOlJlZmVyZW5jZSBVUkk9
+IiNfZTk5MmRmNTMtYjU3ZC00OTk4LThlMjktNTVkZjFkNGYxMThiIj48ZHM6VHJhbnNmb3Jtcz48
+ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhj
+LWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRw
+Oi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+ZXRE
+MTRyZngrbnVQMVJ3TDlub3NqcFoweUE4bGJQNVFyWHZjaCtGYmJHND08L2RzOkRpZ2VzdFZhbHVl
+PjwvZHM6UmVmZXJlbmNlPjwvZHM6U2lnbmVkSW5mbz48ZHM6U2lnbmF0dXJlVmFsdWUgSWQ9Il9k
+N2MyMmU0Mi1jOTk4LTRiMDktYTkwMC03N2NmNjU4NTNiZmMiPlBBenJhaXpueUdNWjhBdk44cUFN
+WEgwL0g2WGl3ZDByRlJHUVBqS2U1bGJsM01IN3J2MHhLQzgyTFF4MEVYRndpVzhvSCt4ZExobGsm
+IzEzOwo3ZmVpbHk4R0dwaTA4STM0d2F4MnJVMkxZaFE3VTVBcDZUUHMxTWFVdWVwRjl6SDZHS1ZG
+UmwrdjJmYmVCMzV3akdMelN2Y0tXTDllJiMxMzsKb21kTFBrclRTSSs4OFc1ejdJWi9EMDJzZzlq
+ek9QSUVLOG9IR2djczNyRjRpWTVWNjVxSlVFUldqaUxia1Uxa0VYTXZFdXBJaDJGRiYjMTM7CmQy
+RlFkOUJqS09jNWZ2UWFOdmhlU084eFppU3ZUaWtFdkVod2VuSCtnMU9JMlJsWmdZWjNLQVhQUGZX
+WUo3WlYzN1liTXIxc3FsUDMmIzEzOwpKTkNySFRCdUxYY25tMS9pUVF2WnU1ekw0TmIwZjR3UHdn
+NHlDbHJVRkVRMDdXcDJYUWRBMFFzTk5jT0oyeDVDWTZpS2VCazEvMmZPJiMxMzsKZzVUM3dHYVVx
+dThuUVJsbzhvMnk4RUFFYXQxTUJTMTlIMDJjUmZkWEgzcEdOb1dMTGErdlVRZldzUEY5Q1R0a3Zr
+L3BBeHpXSmM5eSYjMTM7CmtsekVjbVNUK3FVTmsrdkxlZzUxUWhwZ0h4L0syWmdtMFJEL0tMM0x4
+a1YwWjhPZXhyNHVDRHA0UW91OWhKbmZ4eURmOGFuNnRLdDgmIzEzOwpDeU5KLzNwSzlOQ0NCM0li
+Q3ovTWVIOEVTSmFWdTh0ajJFMVNMWC9BWk1HVXlMZlhxNmZMNHNxUkN0MGpDSHkyWDlXU2Rvamt2
+bjYwJiMxMzsKejh5cnROTVFSbFVoWW9qaWllajJ3ajFlY2taUE1HUUNUQ1dpSzZva1Q0cGtwZ0N5
+elF3bjNKeEwvazFBMFRSUU1pNnVxL3BXaHNzPTwvZHM6U2lnbmF0dXJlVmFsdWU+PGRzOktleUlu
+Zm8gSWQ9Il9lOTkyZGY1My1iNTdkLTQ5OTgtOGUyOS01NWRmMWQ0ZjExOGIiPjxkczpYNTA5RGF0
+YT48ZHM6WDUwOUNlcnRpZmljYXRlPk1JSUhYekNDQlVlZ0F3SUJBZ0lVWHFJL3ZkMThDYWc5OG9O
+cGR6VjdCaXkvNkVBd0RRWUpLb1pJaHZjTkFRRU5CUUF3ZkRFTE1Ba0cmIzEzOwpBMVVFQmhNQ1ZW
+TXhQREE2QmdOVkJBb01NMGx1ZEdWeWJtVjBJRU52Y25CdmNtRjBhVzl1SUdadmNpQkJjM05wWjI1
+bFpDQk9ZVzFsJiMxMzsKY3lCaGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF3d21TVU5CVGs0Z1ZI
+SmhaR1Z0WVhKcklFTnNaV0Z5YVc1bmFHOTFjMlVnVUdscyYjMTM7CmIzUWdRMEV3SGhjTk1qSXhN
+VEUyTVRNeU9EVTVXaGNOTWpjeE1URTFNVE15T0RVNVdqQ0IwREVMTUFrR0ExVUVCaE1DUWtVeEVU
+QVAmIzEzOwpCZ05WQkFnVENFSnlkWE56Wld4ek1SSXdFQVlEVlFRSEV3bFdhV3gyYjI5eVpHVXhN
+ekF4QmdOVkJBb1RLa1JsYkc5cGRIUmxJRU52JiMxMzsKYm5OMWJIUnBibWNnWVc1a0lFRmtkbWx6
+YjNKNUlFTldRa0V2VTBOU1RERStNRHdHQTFVRUF4TTFTVU5CVGs0Z1ZFMURTQ0JCZFhSbyYjMTM7
+CmIzSnBlbVZrSUZSeVlXUmxiV0Z5YXlCUWFXeHZkQ0JXWVd4cFpHRjBiM0lnVm1Gc2FXUXhKVEFq
+QmdrcWhraUc5dzBCQ1FFV0ZtSmwmIzEzOwpkRzFqYUhOdFpFQmtaV3h2YVhSMFpTNWpiMjB3Z2dJ
+aU1BMEdDU3FHU0liM0RRRUJBUVVBQTRJQ0R3QXdnZ0lLQW9JQ0FRQzZGSnd6JiMxMzsKS3FRVlg2
+ZkczL0VMUlNHV1Y5R3JLYUZNS21oV0l4ZXB3UlpONk14TXFrZDVEbllmaVQrV3A5OGpFa3FnVHgy
+VU1iOXF1Z2NHTlY2ZyYjMTM7CjM1L0NyUWIvRi9tejNDNHNmTE51RHBTcUs5UUY4K3BhVEg2aFFt
+ck9wcVYrVVR2ZGo5U01nS0d5Rml6Uzg4Q0RXTXg0dzNpNEZBS2UmIzEzOwo2TlJzSlJHVEF0S0R1
+TUhjQTRzajA4R2plM2xQV2NnRnZjUU5EVmVFQlR1T0hCRytSaGo3VjFKaU5HUC80ZXBUWFRGWGdQ
+RkRnZXozJiMxMzsKWUFmeHFwYnVPNFRYNmJiWWRrMm52TUxGdkxFTmtDRll1bG5ZUHpnbkVCR1NN
+S0lhQUlsYitzY0hDdldnV2oyVExnd2gyR0pOY3pWTSYjMTM7CjFMUE1xR1MrVWtpOU1oNzk4MjIv
+eG9hcjQ5OHhEeDJZeC84c3dnRU5MU2dDc1FBVzhuTWd3V242QWJZbDJSQUJYdXJheUZzbjRQMVIm
+IzEzOwp1UU5tVXAvcXJSS1J2U0pyMU9Ma0haZkZUY1NZUWFWaXVNWVBYekd6OHRtTUxsbUkvQjZB
+Q0g0QXdSTWRuWXZGTzNLSTFSQm5QS0lkJiMxMzsKd3dmVXBaNUlUSXBiQTdDR2dUeDFxeHRNMXdJ
+VXI3cEhlS1A2alZlM2tkRExnKy9CWjJ4TUV0Qms1YThZN0I0djN4d0hYR1R2VjhtTiYjMTM7CjBB
+Zy9TeVQvUVV5RVJoWFV5QU4yK0V3WitTUUNVeU5memlvV1E4NzhlR3lrVSs0NitCYmdJM0lJcjM2
+WEtQd216dDBTWitLSTN0bkYmIzEzOwpUbG45bVgwS0MwaWRvajV5a3pQb0MvTUllZDBzcDRUaWd4
+RWJXTng3RUY4MFB2Ui9EREV3VlBFRWtrank2M1hGdWx4aUNRSURBUUFCJiMxMzsKbzRJQmdqQ0NB
+WDR3REFZRFZSMFRBUUgvQkFJd0FEQU9CZ05WSFE4QkFmOEVCQU1DQjRBd0hRWURWUjBPQkJZRUZI
+bjlzMERFYTJrdiYjMTM7CmdFL2VJT1RzcW9XODVNWEZNSUc2QmdOVkhTTUVnYkl3Z2ErQUZFZDdU
+NjU2VVpHMTBiK2ROdW1HZnpZV0JLbEZvWUdBcEg0d2ZERUwmIzEzOwpNQWtHQTFVRUJoTUNWVk14
+UERBNkJnTlZCQW9NTTBsdWRHVnlibVYwSUVOdmNuQnZjbUYwYVc5dUlHWnZjaUJCYzNOcFoyNWxa
+Q0JPJiMxMzsKWVcxbGN5QmhibVFnVG5WdFltVnljekV2TUMwR0ExVUVBd3dtU1VOQlRrNGdWSEpo
+WkdWdFlYSnJJRU5zWldGeWFXNW5hRzkxYzJVZyYjMTM7ClVHbHNiM1FnUTBHQ0ZIcHFiVEZlSmNQ
+dFVDOVh1dVBLUHNMd0RSK01NRFFHQTFVZEh3UXRNQ3N3S2FBbm9DV0dJMmgwZEhBNkx5OWomIzEz
+OwpjbXd1YVdOaGJtNHViM0puTDNSdFkyaGZjR2xzYjNRdVkzSnNNRXdHQTFVZElBUkZNRU13RUFZ
+T0t3WUJCQUdDeVJzQkJZTTdEQW93JiMxMzsKTHdZSUt3WUJCUVVIQWdFd0l6QWhCZ2dyQmdFRkJR
+Y0NBUllWYUhSMGNITTZMeTlqY0hNdWFXTmhibTR1YjNKbk1BMEdDU3FHU0liMyYjMTM7CkRRRUJE
+UVVBQTRJQ0FRQmRTYXQ1NnVlakxuQWpGSUY5NWRqWVdJNnMvL042WVh4c3JyTWtHQlA4RWV6UHlo
+TGg2YXdQNHo3UTlRQUkmIzEzOwpRWmtZb3hybC8xeTArYnlWMnFuVFVVQ0xScEsvQkRwL2hjZndQ
+ZktDQS8yUlFDSEpyYjYrejBlbkRQRlJLME5LbXdPY2RsR3RVazBtJiMxMzsKUGdXR1NLdHV3VnNQ
+QWhUREp1aG9zWk9oa05mK25TT09IclFPbjFFMnJ6T3JkL2tRbHFpQ3dSSDk3OTZOcFRBK0hTTWZP
+b2JKRUVQcSYjMTM7CnRwRjdQNXFid3RsOTVVYTVPcDRBaGE3MEhIZlVGUzRCT1FLTEJWZk1aZE9S
+K2lQb2g1T3dBSytodFlrRkNHOVAyV0h1N3dmOEVDK1cmIzEzOwo3azk2Z3ZUZDh4RTdvdW9hYlQy
+eDZZZllxRWxQSGlVL0lNOWdWeldXTC9zdllEeVNWdW9Gd0JqRE5OMWNkcTBxT1lSMXl1UzFjLzlE
+JiMxMzsKRlI3ZW83R0ZFQ3krVEJkN0lpS1JmQlZlWUdPT1BNbm9GZnhSTFdycHNXTm53RDdsa1Br
+TENnRkNrKzh5RWNPUmc2MjVtbzY1ejR5NiYjMTM7Cko0Szhmb2RhN3F3bVhOUDNSUzE4b242Qkh0
+OGxRK2JYZ09IbXhJSGswYU8wcU5EcWd2THIyRmx5TEdKR2lFTVJxRE1NUjYvYTA2YnQmIzEzOwpr
+blVNSGw3Q3FNZmpJa2pQNFZOTnlHUGRKZ3dWazJrZWI5dU5GdkpDeFQrTTJmR1hRMU5iSk5mdHY1
+TWdTc3A5TjF5K3g2Z0EzRWh3JiMxMzsKeUhsbUpCNFlNdG84dFRWMWk4NHhQWHhpMkNBZURhR0R1
+d29zdDhZVUNTanE3UkNLOHRHY2FBWXJrWFFZMnlRZlgzY3dEc0V4UnFWVyYjMTM7CnlyanlSdCtO
+Nm1LOTlRPT08L2RzOlg1MDlDZXJ0aWZpY2F0ZT48L2RzOlg1MDlEYXRhPjwvZHM6S2V5SW5mbz48
+L2RzOlNpZ25hdHVyZT48L3NtZDpzaWduZWRNYXJrPgo=
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Agent-English/Court-Agent-English-Revoked.smd b/core/src/test/resources/google/registry/tmch/idn/Agent-English/Court-Agent-English-Revoked.smd
new file mode 100644
index 000000000..9b58b4ada
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Agent-English/Court-Agent-English-Revoked.smd
@@ -0,0 +1,123 @@
+Marks: Test & Validate
+smdID: 000000851669081527097-65535
+U-labels: test---validate, test--validate, test-and-validate, test-andvalidate, test-validate, testand-validate, testandvalidate, testvalidate
+notBefore: 2022-11-22T01:45:27.097Z
+notAfter: 2027-10-18T14:57:36.681Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il80NGUy
+YTFiNS04NzE3LTQ3YjEtYWNkZC1jY2RkZmYwZjM3NDciPjxzbWQ6aWQ+MDAwMDAwODUxNjY5MDgx
+NTI3MDk3LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMTo0NToyNy4wOTdaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0xOFQxNDo1NzozNi42ODFaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazpj
+b3VydD48bWFyazppZD4wMDAxMzcxNTAzMDY3ODY4MTUwMzA2Nzg2OC0xPC9tYXJrOmlkPjxtYXJr
+Om1hcmtOYW1lPlRlc3QgJmFtcDsgVmFsaWRhdGU8L21hcms6bWFya05hbWU+PG1hcms6aG9sZGVy
+IGVudGl0bGVtZW50PSJvd25lciI+PG1hcms6bmFtZT5Ub255IEhvbGxhbmQ8L21hcms6bmFtZT48
+bWFyazpvcmc+QWcgY29ycG9yYXRpb248L21hcms6b3JnPjxtYXJrOmFkZHI+PG1hcms6c3RyZWV0
+PjEzMDUgQnJpZ2h0IEF2ZW51ZTwvbWFyazpzdHJlZXQ+PG1hcms6Y2l0eT5BcmNhZGlhPC9tYXJr
+OmNpdHk+PG1hcms6cGM+OTAwMjg8L21hcms6cGM+PG1hcms6Y2M+VVM8L21hcms6Y2M+PC9tYXJr
+OmFkZHI+PC9tYXJrOmhvbGRlcj48bWFyazpjb250YWN0IHR5cGU9ImFnZW50Ij48bWFyazpuYW1l
+PlRvbnkgSG9sbGFuZDwvbWFyazpuYW1lPjxtYXJrOm9yZz5BZyBjb3Jwb3JhdGlvbjwvbWFyazpv
+cmc+PG1hcms6YWRkcj48bWFyazpzdHJlZXQ+QnJpZ2h0IEF2ZW51ZSAxMzA1IDwvbWFyazpzdHJl
+ZXQ+PG1hcms6Y2l0eT5BcmNhZGlhPC9tYXJrOmNpdHk+PG1hcms6c3A+Q0E8L21hcms6c3A+PG1h
+cms6cGM+OTAwMjg8L21hcms6cGM+PG1hcms6Y2M+VVM8L21hcms6Y2M+PC9tYXJrOmFkZHI+PG1h
+cms6dm9pY2U+KzEuMjAyNTU2MjMwMjwvbWFyazp2b2ljZT48bWFyazpmYXg+KzEuMjAyNTU2MjMw
+MTwvbWFyazpmYXg+PG1hcms6ZW1haWw+aW5mb0BhZ2NvcnBvcmF0aW9uLmNvbTwvbWFyazplbWFp
+bD48L21hcms6Y29udGFjdD48bWFyazpsYWJlbD50ZXN0LS0tdmFsaWRhdGU8L21hcms6bGFiZWw+
+PG1hcms6bGFiZWw+dGVzdC0tdmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+dGVzdC1h
+bmQtdmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+dGVzdC1hbmR2YWxpZGF0ZTwvbWFy
+azpsYWJlbD48bWFyazpsYWJlbD50ZXN0LXZhbGlkYXRlPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVs
+PnRlc3RhbmQtdmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+dGVzdGFuZHZhbGlkYXRl
+PC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnRlc3R2YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazpn
+b29kc0FuZFNlcnZpY2VzPmd1aXRhcjwvbWFyazpnb29kc0FuZFNlcnZpY2VzPjxtYXJrOnJlZk51
+bT4xMjM0PC9tYXJrOnJlZk51bT48bWFyazpwcm9EYXRlPjIwMTMtMDEtMDFUMDA6MDA6MDAuMDAw
+WjwvbWFyazpwcm9EYXRlPjxtYXJrOmNjPlVTPC9tYXJrOmNjPjxtYXJrOmNvdXJ0TmFtZT5Ib3Zl
+PC9tYXJrOmNvdXJ0TmFtZT48L21hcms6Y291cnQ+PC9tYXJrOm1hcms+PGRzOlNpZ25hdHVyZSB4
+bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyIgSWQ9Il9mOTI1Y2Qz
+Ni1hMzA0LTRiODEtOGIxMS1iNWMzYzNhZjcyZmQiPjxkczpTaWduZWRJbmZvPjxkczpDYW5vbmlj
+YWxpemF0aW9uTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwt
+ZXhjLWMxNG4jIi8+PGRzOlNpZ25hdHVyZU1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMu
+b3JnLzIwMDEvMDQveG1sZHNpZy1tb3JlI3JzYS1zaGEyNTYiLz48ZHM6UmVmZXJlbmNlIFVSST0i
+I180NGUyYTFiNS04NzE3LTQ3YjEtYWNkZC1jY2RkZmYwZjM3NDciPjxkczpUcmFuc2Zvcm1zPjxk
+czpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcj
+ZW52ZWxvcGVkLXNpZ25hdHVyZSIvPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3
+LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2Vz
+dE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1
+NiIvPjxkczpEaWdlc3RWYWx1ZT5ra2xyOWF3V3JDTlRkb09HYkJWdmJobDgyREJKZ3lGZk1VTFVj
+Ujh6MmxFPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PGRzOlJlZmVyZW5jZSBVUkk9
+IiNfNWI4YjY4N2MtZGUxMi00ZDI2LTk3NjgtY2FmNTcwZDhiMWQzIj48ZHM6VHJhbnNmb3Jtcz48
+ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhj
+LWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRw
+Oi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+bTM5
+L290QnRFdmxIVTc5d1lCc1d6bkdXWTBpWVRtK0FUN0c0WDRoMyszRT08L2RzOkRpZ2VzdFZhbHVl
+PjwvZHM6UmVmZXJlbmNlPjwvZHM6U2lnbmVkSW5mbz48ZHM6U2lnbmF0dXJlVmFsdWUgSWQ9Il9j
+ZTdjZmFjOC1lNzkwLTQyZTMtODkzZC00ODgzYWNkYjBiMzciPkJ4Sjc5MFNWTWhjK3VCTTA4VGFh
+bHlxL0pBcys1R0R4UnBBRjNtMTFGT3YrZnBPN0pHMXcwbXZLQUpKdEZ5Q056WWxtbGlBUisyRzAm
+IzEzOwpCWDdNVWNZeElvWjQ2OERhUFFxQWRvNlducFpVbGJpclJEUXEvOFN0Umlsc1lNVUFZV1cw
+YnBGV0FTazg2bE1PWFZVOHlrTDF0dyt1JiMxMzsKOHdZTWxISGhhTEVZN1F5YXllTW5sejJUZ3ls
+UjUxajBtZ3JNVHM4U0FRWGl1ZW1wY1RzMEtOVThMck9GS3RoV2F2em5ybDc2TkFPTiYjMTM7Cmkx
+Y3R4QkttUGZnZTZNcXlYNEd0WTgrVXhYaUppZlZ6ZlF0cnd1WVRmK3hocHhGSXFaUWVuMWo3bjRC
+c3hsd3hhUlEvSTZtcG96eU8mIzEzOwpBODFQcURwSWNVcnRCbDhhdloxQlBObGdQcVFwRStLRHlE
+V1R0SmRHemJXaklXNEFTdlB5UXltYXh3U2pGMnVkaGlwT3piL2NaeVRvJiMxMzsKdDJKbC9EUTNX
+MzJ0R1IzN3V4ZVNOaG1YeWNwME1ZNDRyRXZHN0lFT3A5TkNjeUljLzBoajV1TzcrT0pVb0xEVkky
+bHA1WWh3L1VtOCYjMTM7CjhVamhtUmRIQVhhcTdnQTlTdG03MTlpb1FVWS84dnhuY29PRENMdmpJ
+a0NzMU1VMXhSVVRPanVTOFdRS0VWK29pUUtmaGhGcGxybmwmIzEzOwpvV1plZTJRRkhvTGJaUWF2
+bVpDaFZhME83VjhhS3hKVkgyVGJyYlZpQndPeEdzN2c0RlNPSGsyYWJwcDNQaTBnMUdvL3l1REZX
+NUhrJiMxMzsKY3l1Q2VHeDNZc2lpL2VJSCt1TllPNmUvcmpPUUVKbm1YcVVVWlQ3OWp0anZOdlhq
+ODByWkswTGZ1K0dhNTNqV0N2M3ZSTFNHU1JRPTwvZHM6U2lnbmF0dXJlVmFsdWU+PGRzOktleUlu
+Zm8gSWQ9Il81YjhiNjg3Yy1kZTEyLTRkMjYtOTc2OC1jYWY1NzBkOGIxZDMiPjxkczpYNTA5RGF0
+YT48ZHM6WDUwOUNlcnRpZmljYXRlPk1JSUhYekNDQlVlZ0F3SUJBZ0lVWHFJL3ZkMThDYWc5OG9O
+cGR6VjdCaXkvNkVBd0RRWUpLb1pJaHZjTkFRRU5CUUF3ZkRFTE1Ba0cmIzEzOwpBMVVFQmhNQ1ZW
+TXhQREE2QmdOVkJBb01NMGx1ZEdWeWJtVjBJRU52Y25CdmNtRjBhVzl1SUdadmNpQkJjM05wWjI1
+bFpDQk9ZVzFsJiMxMzsKY3lCaGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF3d21TVU5CVGs0Z1ZI
+SmhaR1Z0WVhKcklFTnNaV0Z5YVc1bmFHOTFjMlVnVUdscyYjMTM7CmIzUWdRMEV3SGhjTk1qSXhN
+VEUyTVRNeU9EVTVXaGNOTWpjeE1URTFNVE15T0RVNVdqQ0IwREVMTUFrR0ExVUVCaE1DUWtVeEVU
+QVAmIzEzOwpCZ05WQkFnVENFSnlkWE56Wld4ek1SSXdFQVlEVlFRSEV3bFdhV3gyYjI5eVpHVXhN
+ekF4QmdOVkJBb1RLa1JsYkc5cGRIUmxJRU52JiMxMzsKYm5OMWJIUnBibWNnWVc1a0lFRmtkbWx6
+YjNKNUlFTldRa0V2VTBOU1RERStNRHdHQTFVRUF4TTFTVU5CVGs0Z1ZFMURTQ0JCZFhSbyYjMTM7
+CmIzSnBlbVZrSUZSeVlXUmxiV0Z5YXlCUWFXeHZkQ0JXWVd4cFpHRjBiM0lnVm1Gc2FXUXhKVEFq
+QmdrcWhraUc5dzBCQ1FFV0ZtSmwmIzEzOwpkRzFqYUhOdFpFQmtaV3h2YVhSMFpTNWpiMjB3Z2dJ
+aU1BMEdDU3FHU0liM0RRRUJBUVVBQTRJQ0R3QXdnZ0lLQW9JQ0FRQzZGSnd6JiMxMzsKS3FRVlg2
+ZkczL0VMUlNHV1Y5R3JLYUZNS21oV0l4ZXB3UlpONk14TXFrZDVEbllmaVQrV3A5OGpFa3FnVHgy
+VU1iOXF1Z2NHTlY2ZyYjMTM7CjM1L0NyUWIvRi9tejNDNHNmTE51RHBTcUs5UUY4K3BhVEg2aFFt
+ck9wcVYrVVR2ZGo5U01nS0d5Rml6Uzg4Q0RXTXg0dzNpNEZBS2UmIzEzOwo2TlJzSlJHVEF0S0R1
+TUhjQTRzajA4R2plM2xQV2NnRnZjUU5EVmVFQlR1T0hCRytSaGo3VjFKaU5HUC80ZXBUWFRGWGdQ
+RkRnZXozJiMxMzsKWUFmeHFwYnVPNFRYNmJiWWRrMm52TUxGdkxFTmtDRll1bG5ZUHpnbkVCR1NN
+S0lhQUlsYitzY0hDdldnV2oyVExnd2gyR0pOY3pWTSYjMTM7CjFMUE1xR1MrVWtpOU1oNzk4MjIv
+eG9hcjQ5OHhEeDJZeC84c3dnRU5MU2dDc1FBVzhuTWd3V242QWJZbDJSQUJYdXJheUZzbjRQMVIm
+IzEzOwp1UU5tVXAvcXJSS1J2U0pyMU9Ma0haZkZUY1NZUWFWaXVNWVBYekd6OHRtTUxsbUkvQjZB
+Q0g0QXdSTWRuWXZGTzNLSTFSQm5QS0lkJiMxMzsKd3dmVXBaNUlUSXBiQTdDR2dUeDFxeHRNMXdJ
+VXI3cEhlS1A2alZlM2tkRExnKy9CWjJ4TUV0Qms1YThZN0I0djN4d0hYR1R2VjhtTiYjMTM7CjBB
+Zy9TeVQvUVV5RVJoWFV5QU4yK0V3WitTUUNVeU5memlvV1E4NzhlR3lrVSs0NitCYmdJM0lJcjM2
+WEtQd216dDBTWitLSTN0bkYmIzEzOwpUbG45bVgwS0MwaWRvajV5a3pQb0MvTUllZDBzcDRUaWd4
+RWJXTng3RUY4MFB2Ui9EREV3VlBFRWtrank2M1hGdWx4aUNRSURBUUFCJiMxMzsKbzRJQmdqQ0NB
+WDR3REFZRFZSMFRBUUgvQkFJd0FEQU9CZ05WSFE4QkFmOEVCQU1DQjRBd0hRWURWUjBPQkJZRUZI
+bjlzMERFYTJrdiYjMTM7CmdFL2VJT1RzcW9XODVNWEZNSUc2QmdOVkhTTUVnYkl3Z2ErQUZFZDdU
+NjU2VVpHMTBiK2ROdW1HZnpZV0JLbEZvWUdBcEg0d2ZERUwmIzEzOwpNQWtHQTFVRUJoTUNWVk14
+UERBNkJnTlZCQW9NTTBsdWRHVnlibVYwSUVOdmNuQnZjbUYwYVc5dUlHWnZjaUJCYzNOcFoyNWxa
+Q0JPJiMxMzsKWVcxbGN5QmhibVFnVG5WdFltVnljekV2TUMwR0ExVUVBd3dtU1VOQlRrNGdWSEpo
+WkdWdFlYSnJJRU5zWldGeWFXNW5hRzkxYzJVZyYjMTM7ClVHbHNiM1FnUTBHQ0ZIcHFiVEZlSmNQ
+dFVDOVh1dVBLUHNMd0RSK01NRFFHQTFVZEh3UXRNQ3N3S2FBbm9DV0dJMmgwZEhBNkx5OWomIzEz
+OwpjbXd1YVdOaGJtNHViM0puTDNSdFkyaGZjR2xzYjNRdVkzSnNNRXdHQTFVZElBUkZNRU13RUFZ
+T0t3WUJCQUdDeVJzQkJZTTdEQW93JiMxMzsKTHdZSUt3WUJCUVVIQWdFd0l6QWhCZ2dyQmdFRkJR
+Y0NBUllWYUhSMGNITTZMeTlqY0hNdWFXTmhibTR1YjNKbk1BMEdDU3FHU0liMyYjMTM7CkRRRUJE
+UVVBQTRJQ0FRQmRTYXQ1NnVlakxuQWpGSUY5NWRqWVdJNnMvL042WVh4c3JyTWtHQlA4RWV6UHlo
+TGg2YXdQNHo3UTlRQUkmIzEzOwpRWmtZb3hybC8xeTArYnlWMnFuVFVVQ0xScEsvQkRwL2hjZndQ
+ZktDQS8yUlFDSEpyYjYrejBlbkRQRlJLME5LbXdPY2RsR3RVazBtJiMxMzsKUGdXR1NLdHV3VnNQ
+QWhUREp1aG9zWk9oa05mK25TT09IclFPbjFFMnJ6T3JkL2tRbHFpQ3dSSDk3OTZOcFRBK0hTTWZP
+b2JKRUVQcSYjMTM7CnRwRjdQNXFid3RsOTVVYTVPcDRBaGE3MEhIZlVGUzRCT1FLTEJWZk1aZE9S
+K2lQb2g1T3dBSytodFlrRkNHOVAyV0h1N3dmOEVDK1cmIzEzOwo3azk2Z3ZUZDh4RTdvdW9hYlQy
+eDZZZllxRWxQSGlVL0lNOWdWeldXTC9zdllEeVNWdW9Gd0JqRE5OMWNkcTBxT1lSMXl1UzFjLzlE
+JiMxMzsKRlI3ZW83R0ZFQ3krVEJkN0lpS1JmQlZlWUdPT1BNbm9GZnhSTFdycHNXTm53RDdsa1Br
+TENnRkNrKzh5RWNPUmc2MjVtbzY1ejR5NiYjMTM7Cko0Szhmb2RhN3F3bVhOUDNSUzE4b242Qkh0
+OGxRK2JYZ09IbXhJSGswYU8wcU5EcWd2THIyRmx5TEdKR2lFTVJxRE1NUjYvYTA2YnQmIzEzOwpr
+blVNSGw3Q3FNZmpJa2pQNFZOTnlHUGRKZ3dWazJrZWI5dU5GdkpDeFQrTTJmR1hRMU5iSk5mdHY1
+TWdTc3A5TjF5K3g2Z0EzRWh3JiMxMzsKeUhsbUpCNFlNdG84dFRWMWk4NHhQWHhpMkNBZURhR0R1
+d29zdDhZVUNTanE3UkNLOHRHY2FBWXJrWFFZMnlRZlgzY3dEc0V4UnFWVyYjMTM7CnlyanlSdCtO
+Nm1LOTlRPT08L2RzOlg1MDlDZXJ0aWZpY2F0ZT48L2RzOlg1MDlEYXRhPjwvZHM6S2V5SW5mbz48
+L2RzOlNpZ25hdHVyZT48L3NtZDpzaWduZWRNYXJrPgo=
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Agent-English/Trademark-Agent-English-Active.smd b/core/src/test/resources/google/registry/tmch/idn/Agent-English/Trademark-Agent-English-Active.smd
new file mode 100644
index 000000000..bd9cc8e15
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Agent-English/Trademark-Agent-English-Active.smd
@@ -0,0 +1,125 @@
+Marks: Test & Validate
+smdID: 000000871669081697634-65535
+U-labels: test---validate, test--validate, test-and-validate, test-andvalidate, test-validate, testand-validate, testandvalidate, testet-validate, testetvalidate, testvalidate
+notBefore: 2022-11-22T01:48:17.634Z
+notAfter: 2027-10-18T14:57:36.681Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il84ODE1
+YTFlNC0wZDE2LTQzYzgtOWVlMS01MDI5YjZhODBjMjgiPjxzbWQ6aWQ+MDAwMDAwODcxNjY5MDgx
+Njk3NjM0LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMTo0ODoxNy42MzRaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0xOFQxNDo1NzozNi42ODFaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
+cmFkZW1hcms+PG1hcms6aWQ+MDAwMTM3MTUwMzA2ODA0OTE1MDMwNjgwNDktMTwvbWFyazppZD48
+bWFyazptYXJrTmFtZT5UZXN0ICZhbXA7IFZhbGlkYXRlPC9tYXJrOm1hcmtOYW1lPjxtYXJrOmhv
+bGRlciBlbnRpdGxlbWVudD0ib3duZXIiPjxtYXJrOm5hbWU+VG9ueSBIb2xsYW5kPC9tYXJrOm5h
+bWU+PG1hcms6b3JnPkFnIGNvcnBvcmF0aW9uPC9tYXJrOm9yZz48bWFyazphZGRyPjxtYXJrOnN0
+cmVldD4xMzA1IEJyaWdodCBBdmVudWU8L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+QXJjYWRpYTwv
+bWFyazpjaXR5PjxtYXJrOnBjPjkwMDI4PC9tYXJrOnBjPjxtYXJrOmNjPlVTPC9tYXJrOmNjPjwv
+bWFyazphZGRyPjwvbWFyazpob2xkZXI+PG1hcms6Y29udGFjdCB0eXBlPSJhZ2VudCI+PG1hcms6
+bmFtZT5Ub255IEhvbGxhbmQ8L21hcms6bmFtZT48bWFyazpvcmc+QWcgY29ycG9yYXRpb248L21h
+cms6b3JnPjxtYXJrOmFkZHI+PG1hcms6c3RyZWV0PkJyaWdodCBBdmVudWUgMTMwNSA8L21hcms6
+c3RyZWV0PjxtYXJrOmNpdHk+QXJjYWRpYTwvbWFyazpjaXR5PjxtYXJrOnNwPkNBPC9tYXJrOnNw
+PjxtYXJrOnBjPjkwMDI4PC9tYXJrOnBjPjxtYXJrOmNjPlVTPC9tYXJrOmNjPjwvbWFyazphZGRy
+PjxtYXJrOnZvaWNlPisxLjIwMjU1NjIzMDI8L21hcms6dm9pY2U+PG1hcms6ZmF4PisxLjIwMjU1
+NjIzMDE8L21hcms6ZmF4PjxtYXJrOmVtYWlsPmluZm9AYWdjb3Jwb3JhdGlvbi5jb208L21hcms6
+ZW1haWw+PC9tYXJrOmNvbnRhY3Q+PG1hcms6anVyaXNkaWN0aW9uPlVTPC9tYXJrOmp1cmlzZGlj
+dGlvbj48bWFyazpjbGFzcz4xNTwvbWFyazpjbGFzcz48bWFyazpsYWJlbD50ZXN0LS0tdmFsaWRh
+dGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+dGVzdC0tdmFsaWRhdGU8L21hcms6bGFiZWw+PG1h
+cms6bGFiZWw+dGVzdC1hbmQtdmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+dGVzdC1h
+bmR2YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0LXZhbGlkYXRlPC9tYXJrOmxh
+YmVsPjxtYXJrOmxhYmVsPnRlc3RhbmQtdmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+
+dGVzdGFuZHZhbGlkYXRlPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnRlc3RldC12YWxpZGF0ZTwv
+bWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0ZXR2YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazps
+YWJlbD50ZXN0dmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6Z29vZHNBbmRTZXJ2aWNlcz5ndWl0
+YXI8L21hcms6Z29vZHNBbmRTZXJ2aWNlcz48bWFyazpyZWdOdW0+MTIzNDwvbWFyazpyZWdOdW0+
+PG1hcms6cmVnRGF0ZT4yMDEzLTAxLTAxVDAwOjAwOjAwLjAwMFo8L21hcms6cmVnRGF0ZT48L21h
+cms6dHJhZGVtYXJrPjwvbWFyazptYXJrPjxkczpTaWduYXR1cmUgeG1sbnM6ZHM9Imh0dHA6Ly93
+d3cudzMub3JnLzIwMDAvMDkveG1sZHNpZyMiIElkPSJfODY1OTE3Y2ItNmNkOS00NDcxLWExMDMt
+M2MzYjEyNTYxY2I0Ij48ZHM6U2lnbmVkSW5mbz48ZHM6Q2Fub25pY2FsaXphdGlvbk1ldGhvZCBB
+bGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjxkczpT
+aWduYXR1cmVNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGRz
+aWctbW9yZSNyc2Etc2hhMjU2Ii8+PGRzOlJlZmVyZW5jZSBVUkk9IiNfODgxNWExZTQtMGQxNi00
+M2M4LTllZTEtNTAyOWI2YTgwYzI4Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29y
+aXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1
+cmUiLz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94
+bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGht
+PSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFs
+dWU+NXBGWnNMeXg0SU5iRmVJbStZUlZ6ZHI3dncyNHpmVmltRS9DL3JrTGIyST08L2RzOkRpZ2Vz
+dFZhbHVlPjwvZHM6UmVmZXJlbmNlPjxkczpSZWZlcmVuY2UgVVJJPSIjXzEzMzQ0ZTY4LWE1ZWYt
+NDAyZC05ZDg4LTRlMTdkMGE3N2YzZCI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdv
+cml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJh
+bnNmb3Jtcz48ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAw
+MS8wNC94bWxlbmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPnd0RE1FWUxRaFcrdzdPM0pYYVRT
+clV1ejdwNHIzd3UyUldrSlJ1alRuVW89PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48
+L2RzOlNpZ25lZEluZm8+PGRzOlNpZ25hdHVyZVZhbHVlIElkPSJfOGFlZjEyMDEtMmUwYi00YmZh
+LTg0YTAtNmU5NzExYjVjOWE4Ij5HSXFjNCsyL2VvbzFnWm95SFVIVTk5ZkZ2WldJUUxXaVptdU42
+bEkzR3hHdWRFQVpETHhvdDJjSjZ5dWlYblJnOVErNnYzRlVnTnNDJiMxMzsKQU84OG45OFNhemhW
+aytlaFhVa0VHemQwMzQrK0JWZzlwaURnRTluNTczWHZvSVExQjNvQWpuYTI3dXRDOC9JS2RjWTM1
+Wkx0WThXdiYjMTM7CitIalZuOUVkNnFXaFk2eFFHS0xaQ2sxL0Fsa2VhdEZzaDVTRFBnVkJ2Y3J6
+aFNpenZnSFFZSTVQM2tZdTlLZzNGYVhDUk5OQWUwN0ImIzEzOwpQRUVLNkVXWnFWdHJZdVVUcUtM
+Tm1OQTlmWHgrZTkrNHZsa001TWE1Y2ZXQ0gzOWRoWkh2MG91Y090dEsxM1Bvd2laKzArdnRTRG1j
+JiMxMzsKWGtWK3lmREkwbkR4VDNsRUx6bGl1QUlxa0FvSGRYS1Vndk1tWVdWSThQTm4zU2hZOGpH
+M3ZJR3Z1NHVvYWVrZm8vWDdoSnhNajROeSYjMTM7Cm9GM2pocDVMTFlTRmE5bkFVSEZOYlp6QnhC
+Ry9NNlZmOE5kM0hoUERmL0xZcWxxZ0NrcWtjQ3h2blRJZWV2NHhCSTNDMkRDNkVqNFUmIzEzOwpx
+VnUxVnNGV0FmaUtWYVVwbVlDeFlaeWFLL3FsQTZqV0VjQU1QVUJSZGxTQWdTdUZDTmRiZnRXK294
+U1Jta1plbStPbE9oWHdoUCt3JiMxMzsKWlhrTGlzVmIzZksrQWlRYWpENjU2Rm41V0JWMmkvWWZI
+ckJJM2s3SlByeGFJTmxreVgxZmVCM3hieG5ORlJsS1hJUkpmdVMyQVRnRSYjMTM7CkhwWndPTlRM
+SXVJWGlUUDlZbFViVW5HY3NXU3NzNXd4cTBXK3g2eWk1OC84YUVVMnZXOGVteXpNRGZDYWJicGl2
+ZjlZbUJQMEpCST08L2RzOlNpZ25hdHVyZVZhbHVlPjxkczpLZXlJbmZvIElkPSJfMTMzNDRlNjgt
+YTVlZi00MDJkLTlkODgtNGUxN2QwYTc3ZjNkIj48ZHM6WDUwOURhdGE+PGRzOlg1MDlDZXJ0aWZp
+Y2F0ZT5NSUlIWHpDQ0JVZWdBd0lCQWdJVVhxSS92ZDE4Q2FnOThvTnBkelY3Qml5LzZFQXdEUVlK
+S29aSWh2Y05BUUVOQlFBd2ZERUxNQWtHJiMxMzsKQTFVRUJoTUNWVk14UERBNkJnTlZCQW9NTTBs
+dWRHVnlibVYwSUVOdmNuQnZjbUYwYVc5dUlHWnZjaUJCYzNOcFoyNWxaQ0JPWVcxbCYjMTM7CmN5
+QmhibVFnVG5WdFltVnljekV2TUMwR0ExVUVBd3dtU1VOQlRrNGdWSEpoWkdWdFlYSnJJRU5zWldG
+eWFXNW5hRzkxYzJVZ1VHbHMmIzEzOwpiM1FnUTBFd0hoY05Nakl4TVRFMk1UTXlPRFU1V2hjTk1q
+Y3hNVEUxTVRNeU9EVTVXakNCMERFTE1Ba0dBMVVFQmhNQ1FrVXhFVEFQJiMxMzsKQmdOVkJBZ1RD
+RUp5ZFhOelpXeHpNUkl3RUFZRFZRUUhFd2xXYVd4MmIyOXlaR1V4TXpBeEJnTlZCQW9US2tSbGJH
+OXBkSFJsSUVOdiYjMTM7CmJuTjFiSFJwYm1jZ1lXNWtJRUZrZG1semIzSjVJRU5XUWtFdlUwTlNU
+REUrTUR3R0ExVUVBeE0xU1VOQlRrNGdWRTFEU0NCQmRYUm8mIzEzOwpiM0pwZW1Wa0lGUnlZV1Js
+YldGeWF5QlFhV3h2ZENCV1lXeHBaR0YwYjNJZ1ZtRnNhV1F4SlRBakJna3Foa2lHOXcwQkNRRVdG
+bUpsJiMxMzsKZEcxamFITnRaRUJrWld4dmFYUjBaUzVqYjIwd2dnSWlNQTBHQ1NxR1NJYjNEUUVC
+QVFVQUE0SUNEd0F3Z2dJS0FvSUNBUUM2Rkp3eiYjMTM7CktxUVZYNmZHMy9FTFJTR1dWOUdyS2FG
+TUttaFdJeGVwd1JaTjZNeE1xa2Q1RG5ZZmlUK1dwOThqRWtxZ1R4MlVNYjlxdWdjR05WNmcmIzEz
+OwozNS9DclFiL0YvbXozQzRzZkxOdURwU3FLOVFGOCtwYVRINmhRbXJPcHFWK1VUdmRqOVNNZ0tH
+eUZpelM4OENEV014NHczaTRGQUtlJiMxMzsKNk5Sc0pSR1RBdEtEdU1IY0E0c2owOEdqZTNsUFdj
+Z0Z2Y1FORFZlRUJUdU9IQkcrUmhqN1YxSmlOR1AvNGVwVFhURlhnUEZEZ2V6MyYjMTM7CllBZnhx
+cGJ1TzRUWDZiYllkazJudk1MRnZMRU5rQ0ZZdWxuWVB6Z25FQkdTTUtJYUFJbGIrc2NIQ3ZXZ1dq
+MlRMZ3doMkdKTmN6Vk0mIzEzOwoxTFBNcUdTK1VraTlNaDc5ODIyL3hvYXI0OTh4RHgyWXgvOHN3
+Z0VOTFNnQ3NRQVc4bk1nd1duNkFiWWwyUkFCWHVyYXlGc240UDFSJiMxMzsKdVFObVVwL3FyUktS
+dlNKcjFPTGtIWmZGVGNTWVFhVml1TVlQWHpHejh0bU1MbG1JL0I2QUNINEF3Uk1kbll2Rk8zS0kx
+UkJuUEtJZCYjMTM7Cnd3ZlVwWjVJVElwYkE3Q0dnVHgxcXh0TTF3SVVyN3BIZUtQNmpWZTNrZERM
+ZysvQloyeE1FdEJrNWE4WTdCNHYzeHdIWEdUdlY4bU4mIzEzOwowQWcvU3lUL1FVeUVSaFhVeUFO
+MitFd1orU1FDVXlOZnppb1dRODc4ZUd5a1UrNDYrQmJnSTNJSXIzNlhLUHdtenQwU1orS0kzdG5G
+JiMxMzsKVGxuOW1YMEtDMGlkb2o1eWt6UG9DL01JZWQwc3A0VGlneEViV054N0VGODBQdlIvRERF
+d1ZQRUVra2p5NjNYRnVseGlDUUlEQVFBQiYjMTM7Cm80SUJnakNDQVg0d0RBWURWUjBUQVFIL0JB
+SXdBREFPQmdOVkhROEJBZjhFQkFNQ0I0QXdIUVlEVlIwT0JCWUVGSG45czBERWEya3YmIzEzOwpn
+RS9lSU9Uc3FvVzg1TVhGTUlHNkJnTlZIU01FZ2JJd2dhK0FGRWQ3VDY1NlVaRzEwYitkTnVtR2Z6
+WVdCS2xGb1lHQXBINHdmREVMJiMxMzsKTUFrR0ExVUVCaE1DVlZNeFBEQTZCZ05WQkFvTU0wbHVk
+R1Z5Ym1WMElFTnZjbkJ2Y21GMGFXOXVJR1p2Y2lCQmMzTnBaMjVsWkNCTyYjMTM7CllXMWxjeUJo
+Ym1RZ1RuVnRZbVZ5Y3pFdk1DMEdBMVVFQXd3bVNVTkJUazRnVkhKaFpHVnRZWEpySUVOc1pXRnlh
+VzVuYUc5MWMyVWcmIzEzOwpVR2xzYjNRZ1EwR0NGSHBxYlRGZUpjUHRVQzlYdXVQS1BzTHdEUitN
+TURRR0ExVWRId1F0TUNzd0thQW5vQ1dHSTJoMGRIQTZMeTlqJiMxMzsKY213dWFXTmhibTR1YjNK
+bkwzUnRZMmhmY0dsc2IzUXVZM0pzTUV3R0ExVWRJQVJGTUVNd0VBWU9Ld1lCQkFHQ3lSc0JCWU03
+REFvdyYjMTM7Ckx3WUlLd1lCQlFVSEFnRXdJekFoQmdnckJnRUZCUWNDQVJZVmFIUjBjSE02THk5
+amNITXVhV05oYm00dWIzSm5NQTBHQ1NxR1NJYjMmIzEzOwpEUUVCRFFVQUE0SUNBUUJkU2F0NTZ1
+ZWpMbkFqRklGOTVkallXSTZzLy9ONllYeHNyck1rR0JQOEVlelB5aExoNmF3UDR6N1E5UUFJJiMx
+MzsKUVprWW94cmwvMXkwK2J5VjJxblRVVUNMUnBLL0JEcC9oY2Z3UGZLQ0EvMlJRQ0hKcmI2K3ow
+ZW5EUEZSSzBOS213T2NkbEd0VWswbSYjMTM7ClBnV0dTS3R1d1ZzUEFoVERKdWhvc1pPaGtOZitu
+U09PSHJRT24xRTJyek9yZC9rUWxxaUN3Ukg5Nzk2TnBUQStIU01mT29iSkVFUHEmIzEzOwp0cEY3
+UDVxYnd0bDk1VWE1T3A0QWhhNzBISGZVRlM0Qk9RS0xCVmZNWmRPUitpUG9oNU93QUsraHRZa0ZD
+RzlQMldIdTd3ZjhFQytXJiMxMzsKN2s5Nmd2VGQ4eEU3b3VvYWJUMng2WWZZcUVsUEhpVS9JTTln
+VnpXV0wvc3ZZRHlTVnVvRndCakROTjFjZHEwcU9ZUjF5dVMxYy85RCYjMTM7CkZSN2VvN0dGRUN5
+K1RCZDdJaUtSZkJWZVlHT09QTW5vRmZ4UkxXcnBzV05ud0Q3bGtQa0xDZ0ZDays4eUVjT1JnNjI1
+bW82NXo0eTYmIzEzOwpKNEs4Zm9kYTdxd21YTlAzUlMxOG9uNkJIdDhsUStiWGdPSG14SUhrMGFP
+MHFORHFndkxyMkZseUxHSkdpRU1ScURNTVI2L2EwNmJ0JiMxMzsKa25VTUhsN0NxTWZqSWtqUDRW
+Tk55R1BkSmd3Vmsya2ViOXVORnZKQ3hUK00yZkdYUTFOYkpOZnR2NU1nU3NwOU4xeSt4NmdBM0Vo
+dyYjMTM7CnlIbG1KQjRZTXRvOHRUVjFpODR4UFh4aTJDQWVEYUdEdXdvc3Q4WVVDU2pxN1JDSzh0
+R2NhQVlya1hRWTJ5UWZYM2N3RHNFeFJxVlcmIzEzOwp5cmp5UnQrTjZtSzk5UT09PC9kczpYNTA5
+Q2VydGlmaWNhdGU+PC9kczpYNTA5RGF0YT48L2RzOktleUluZm8+PC9kczpTaWduYXR1cmU+PC9z
+bWQ6c2lnbmVkTWFyaz4K
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Agent-English/Trademark-Agent-English-Revoked.smd b/core/src/test/resources/google/registry/tmch/idn/Agent-English/Trademark-Agent-English-Revoked.smd
new file mode 100644
index 000000000..b570d646f
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Agent-English/Trademark-Agent-English-Revoked.smd
@@ -0,0 +1,125 @@
+Marks: Test & Validate
+smdID: 000000871669081530967-65535
+U-labels: test---validate, test--validate, test-and-validate, test-andvalidate, test-validate, testand-validate, testandvalidate, testet-validate, testetvalidate, testvalidate
+notBefore: 2022-11-22T01:45:30.967Z
+notAfter: 2027-10-18T14:57:36.681Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il9kZDg2
+ZWM0Mi04Y2QzLTRmMjktYTJlMi1lZTM1MjczZGE2ODAiPjxzbWQ6aWQ+MDAwMDAwODcxNjY5MDgx
+NTMwOTY3LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMTo0NTozMC45NjdaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0xOFQxNDo1NzozNi42ODFaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
+cmFkZW1hcms+PG1hcms6aWQ+MDAwMTM3MTUwMzA2ODA0OTE1MDMwNjgwNDktMTwvbWFyazppZD48
+bWFyazptYXJrTmFtZT5UZXN0ICZhbXA7IFZhbGlkYXRlPC9tYXJrOm1hcmtOYW1lPjxtYXJrOmhv
+bGRlciBlbnRpdGxlbWVudD0ib3duZXIiPjxtYXJrOm5hbWU+VG9ueSBIb2xsYW5kPC9tYXJrOm5h
+bWU+PG1hcms6b3JnPkFnIGNvcnBvcmF0aW9uPC9tYXJrOm9yZz48bWFyazphZGRyPjxtYXJrOnN0
+cmVldD4xMzA1IEJyaWdodCBBdmVudWU8L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+QXJjYWRpYTwv
+bWFyazpjaXR5PjxtYXJrOnBjPjkwMDI4PC9tYXJrOnBjPjxtYXJrOmNjPlVTPC9tYXJrOmNjPjwv
+bWFyazphZGRyPjwvbWFyazpob2xkZXI+PG1hcms6Y29udGFjdCB0eXBlPSJhZ2VudCI+PG1hcms6
+bmFtZT5Ub255IEhvbGxhbmQ8L21hcms6bmFtZT48bWFyazpvcmc+QWcgY29ycG9yYXRpb248L21h
+cms6b3JnPjxtYXJrOmFkZHI+PG1hcms6c3RyZWV0PkJyaWdodCBBdmVudWUgMTMwNSA8L21hcms6
+c3RyZWV0PjxtYXJrOmNpdHk+QXJjYWRpYTwvbWFyazpjaXR5PjxtYXJrOnNwPkNBPC9tYXJrOnNw
+PjxtYXJrOnBjPjkwMDI4PC9tYXJrOnBjPjxtYXJrOmNjPlVTPC9tYXJrOmNjPjwvbWFyazphZGRy
+PjxtYXJrOnZvaWNlPisxLjIwMjU1NjIzMDI8L21hcms6dm9pY2U+PG1hcms6ZmF4PisxLjIwMjU1
+NjIzMDE8L21hcms6ZmF4PjxtYXJrOmVtYWlsPmluZm9AYWdjb3Jwb3JhdGlvbi5jb208L21hcms6
+ZW1haWw+PC9tYXJrOmNvbnRhY3Q+PG1hcms6anVyaXNkaWN0aW9uPlVTPC9tYXJrOmp1cmlzZGlj
+dGlvbj48bWFyazpjbGFzcz4xNTwvbWFyazpjbGFzcz48bWFyazpsYWJlbD50ZXN0LS0tdmFsaWRh
+dGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+dGVzdC0tdmFsaWRhdGU8L21hcms6bGFiZWw+PG1h
+cms6bGFiZWw+dGVzdC1hbmQtdmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+dGVzdC1h
+bmR2YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0LXZhbGlkYXRlPC9tYXJrOmxh
+YmVsPjxtYXJrOmxhYmVsPnRlc3RhbmQtdmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+
+dGVzdGFuZHZhbGlkYXRlPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnRlc3RldC12YWxpZGF0ZTwv
+bWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0ZXR2YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazps
+YWJlbD50ZXN0dmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6Z29vZHNBbmRTZXJ2aWNlcz5ndWl0
+YXI8L21hcms6Z29vZHNBbmRTZXJ2aWNlcz48bWFyazpyZWdOdW0+MTIzNDwvbWFyazpyZWdOdW0+
+PG1hcms6cmVnRGF0ZT4yMDEzLTAxLTAxVDAwOjAwOjAwLjAwMFo8L21hcms6cmVnRGF0ZT48L21h
+cms6dHJhZGVtYXJrPjwvbWFyazptYXJrPjxkczpTaWduYXR1cmUgeG1sbnM6ZHM9Imh0dHA6Ly93
+d3cudzMub3JnLzIwMDAvMDkveG1sZHNpZyMiIElkPSJfMzYyODMyY2EtYmFjNy00NjE4LTk1NmMt
+NWZiMzcxMDU2NDY2Ij48ZHM6U2lnbmVkSW5mbz48ZHM6Q2Fub25pY2FsaXphdGlvbk1ldGhvZCBB
+bGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjxkczpT
+aWduYXR1cmVNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGRz
+aWctbW9yZSNyc2Etc2hhMjU2Ii8+PGRzOlJlZmVyZW5jZSBVUkk9IiNfZGQ4NmVjNDItOGNkMy00
+ZjI5LWEyZTItZWUzNTI3M2RhNjgwIj48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29y
+aXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1
+cmUiLz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94
+bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGht
+PSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFs
+dWU+VlJBSStHQ1UwL0lYMk16WjFya01RRUV1L3ZZSFlrWU9STEx3NzAvWUF4ST08L2RzOkRpZ2Vz
+dFZhbHVlPjwvZHM6UmVmZXJlbmNlPjxkczpSZWZlcmVuY2UgVVJJPSIjXzE2ZjllOWMxLWM4ZGYt
+NGE0Zi1hYTRiLTQ0MzliYzlmN2IyMiI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdv
+cml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJh
+bnNmb3Jtcz48ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAw
+MS8wNC94bWxlbmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPkpwbUNmLy9DenRRZFYvYXlnUFNL
+dVZERTRuR1RRRG04ZCtSZ2NvK29VNjg9PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48
+L2RzOlNpZ25lZEluZm8+PGRzOlNpZ25hdHVyZVZhbHVlIElkPSJfYjFhZjdmOTUtNDU2YS00Y2Qx
+LThjZTgtZmY0NzczMWFlYTI2Ij5FQ0JTaFF5a1V1YlZCVklXUGtyZk5UUEJqNFRza0h1NVNsc0FJ
+Ujh1djQ5V3o3M2tITzU5L0FYMXdOWDVVcjR6ckZaT1FNQmIwYldTJiMxMzsKM2Z3V1JhemgxbEdP
+UFZFRlg4b2pZRWhvbGppczc2SWw5SERvTVBSZVpUaEJTaVliNU9Bc3RhTGpueUUzN2VDcFNWb2wr
+bVB4a2lsNCYjMTM7CjJWUFlQVWVpdHd6Lzh2alVGaE1MWHNtaFBKMkRuQ0gyYmNxRzR6TDh2WkNH
+R0I4TlZLNmdiZlhVY2RBVEo1MUcrTG1yYWJuSEdEcjUmIzEzOwpQSzM2MTBGYzUrcFdrT25NTmdy
+eEhtSjRTM3ZVUmJlV3l3RVhxZitHSTdQdEhpRGdLR05Td0taY0lJMjgzbzFiUWthdXR5Q094TlAy
+JiMxMzsKMENnODFSaXJVN3FRdVFmbCtVNU85NkswQWY3QzdYZjJPeW8vcXBHL2lRRzN4bkc0d1Fq
+UVBvN0JpU0QrS0lkVGVxZGEybnlZYytKZSYjMTM7CnFnUi9CS1J1WGlBU0Z3RFAydEtxK1dYcnly
+cTBPZEcwcm5TckxHZytjazU4V3dDMDVwcnd4ay9YY1haOW1abG5NdGVhSmUyU0ZvUDgmIzEzOwpE
+aHY3WXhJK3E3dVFkc3ZhWVhkcnBEcU8zQy93ZTJrOVJLWFBGYWdMWjZsZm00NVlrMGhuVjlvTXRv
+Q28zZWNFQzh4WXllczFiLzI3JiMxMzsKL25Ca3FRZWFqbTN5cjd4WGgzMy8wNkxYYUxPT0pLbU5q
+TzhPbFdTQWliM0Nmc3ZCVkJCRHEwV3l0M0RrRk5Ia0phejZaSFlVZWg3cyYjMTM7CjRRZ25IMEhU
+aWJ5UjM1eitJVkJOK0ZkNG5MV0pRTUJKMzVrcXl6UW4zSFBqVXA2d05UeDVBM0NYTlVlaURjUVY5
+T0srSnNZb2ZZUT08L2RzOlNpZ25hdHVyZVZhbHVlPjxkczpLZXlJbmZvIElkPSJfMTZmOWU5YzEt
+YzhkZi00YTRmLWFhNGItNDQzOWJjOWY3YjIyIj48ZHM6WDUwOURhdGE+PGRzOlg1MDlDZXJ0aWZp
+Y2F0ZT5NSUlIWHpDQ0JVZWdBd0lCQWdJVVhxSS92ZDE4Q2FnOThvTnBkelY3Qml5LzZFQXdEUVlK
+S29aSWh2Y05BUUVOQlFBd2ZERUxNQWtHJiMxMzsKQTFVRUJoTUNWVk14UERBNkJnTlZCQW9NTTBs
+dWRHVnlibVYwSUVOdmNuQnZjbUYwYVc5dUlHWnZjaUJCYzNOcFoyNWxaQ0JPWVcxbCYjMTM7CmN5
+QmhibVFnVG5WdFltVnljekV2TUMwR0ExVUVBd3dtU1VOQlRrNGdWSEpoWkdWdFlYSnJJRU5zWldG
+eWFXNW5hRzkxYzJVZ1VHbHMmIzEzOwpiM1FnUTBFd0hoY05Nakl4TVRFMk1UTXlPRFU1V2hjTk1q
+Y3hNVEUxTVRNeU9EVTVXakNCMERFTE1Ba0dBMVVFQmhNQ1FrVXhFVEFQJiMxMzsKQmdOVkJBZ1RD
+RUp5ZFhOelpXeHpNUkl3RUFZRFZRUUhFd2xXYVd4MmIyOXlaR1V4TXpBeEJnTlZCQW9US2tSbGJH
+OXBkSFJsSUVOdiYjMTM7CmJuTjFiSFJwYm1jZ1lXNWtJRUZrZG1semIzSjVJRU5XUWtFdlUwTlNU
+REUrTUR3R0ExVUVBeE0xU1VOQlRrNGdWRTFEU0NCQmRYUm8mIzEzOwpiM0pwZW1Wa0lGUnlZV1Js
+YldGeWF5QlFhV3h2ZENCV1lXeHBaR0YwYjNJZ1ZtRnNhV1F4SlRBakJna3Foa2lHOXcwQkNRRVdG
+bUpsJiMxMzsKZEcxamFITnRaRUJrWld4dmFYUjBaUzVqYjIwd2dnSWlNQTBHQ1NxR1NJYjNEUUVC
+QVFVQUE0SUNEd0F3Z2dJS0FvSUNBUUM2Rkp3eiYjMTM7CktxUVZYNmZHMy9FTFJTR1dWOUdyS2FG
+TUttaFdJeGVwd1JaTjZNeE1xa2Q1RG5ZZmlUK1dwOThqRWtxZ1R4MlVNYjlxdWdjR05WNmcmIzEz
+OwozNS9DclFiL0YvbXozQzRzZkxOdURwU3FLOVFGOCtwYVRINmhRbXJPcHFWK1VUdmRqOVNNZ0tH
+eUZpelM4OENEV014NHczaTRGQUtlJiMxMzsKNk5Sc0pSR1RBdEtEdU1IY0E0c2owOEdqZTNsUFdj
+Z0Z2Y1FORFZlRUJUdU9IQkcrUmhqN1YxSmlOR1AvNGVwVFhURlhnUEZEZ2V6MyYjMTM7CllBZnhx
+cGJ1TzRUWDZiYllkazJudk1MRnZMRU5rQ0ZZdWxuWVB6Z25FQkdTTUtJYUFJbGIrc2NIQ3ZXZ1dq
+MlRMZ3doMkdKTmN6Vk0mIzEzOwoxTFBNcUdTK1VraTlNaDc5ODIyL3hvYXI0OTh4RHgyWXgvOHN3
+Z0VOTFNnQ3NRQVc4bk1nd1duNkFiWWwyUkFCWHVyYXlGc240UDFSJiMxMzsKdVFObVVwL3FyUktS
+dlNKcjFPTGtIWmZGVGNTWVFhVml1TVlQWHpHejh0bU1MbG1JL0I2QUNINEF3Uk1kbll2Rk8zS0kx
+UkJuUEtJZCYjMTM7Cnd3ZlVwWjVJVElwYkE3Q0dnVHgxcXh0TTF3SVVyN3BIZUtQNmpWZTNrZERM
+ZysvQloyeE1FdEJrNWE4WTdCNHYzeHdIWEdUdlY4bU4mIzEzOwowQWcvU3lUL1FVeUVSaFhVeUFO
+MitFd1orU1FDVXlOZnppb1dRODc4ZUd5a1UrNDYrQmJnSTNJSXIzNlhLUHdtenQwU1orS0kzdG5G
+JiMxMzsKVGxuOW1YMEtDMGlkb2o1eWt6UG9DL01JZWQwc3A0VGlneEViV054N0VGODBQdlIvRERF
+d1ZQRUVra2p5NjNYRnVseGlDUUlEQVFBQiYjMTM7Cm80SUJnakNDQVg0d0RBWURWUjBUQVFIL0JB
+SXdBREFPQmdOVkhROEJBZjhFQkFNQ0I0QXdIUVlEVlIwT0JCWUVGSG45czBERWEya3YmIzEzOwpn
+RS9lSU9Uc3FvVzg1TVhGTUlHNkJnTlZIU01FZ2JJd2dhK0FGRWQ3VDY1NlVaRzEwYitkTnVtR2Z6
+WVdCS2xGb1lHQXBINHdmREVMJiMxMzsKTUFrR0ExVUVCaE1DVlZNeFBEQTZCZ05WQkFvTU0wbHVk
+R1Z5Ym1WMElFTnZjbkJ2Y21GMGFXOXVJR1p2Y2lCQmMzTnBaMjVsWkNCTyYjMTM7CllXMWxjeUJo
+Ym1RZ1RuVnRZbVZ5Y3pFdk1DMEdBMVVFQXd3bVNVTkJUazRnVkhKaFpHVnRZWEpySUVOc1pXRnlh
+VzVuYUc5MWMyVWcmIzEzOwpVR2xzYjNRZ1EwR0NGSHBxYlRGZUpjUHRVQzlYdXVQS1BzTHdEUitN
+TURRR0ExVWRId1F0TUNzd0thQW5vQ1dHSTJoMGRIQTZMeTlqJiMxMzsKY213dWFXTmhibTR1YjNK
+bkwzUnRZMmhmY0dsc2IzUXVZM0pzTUV3R0ExVWRJQVJGTUVNd0VBWU9Ld1lCQkFHQ3lSc0JCWU03
+REFvdyYjMTM7Ckx3WUlLd1lCQlFVSEFnRXdJekFoQmdnckJnRUZCUWNDQVJZVmFIUjBjSE02THk5
+amNITXVhV05oYm00dWIzSm5NQTBHQ1NxR1NJYjMmIzEzOwpEUUVCRFFVQUE0SUNBUUJkU2F0NTZ1
+ZWpMbkFqRklGOTVkallXSTZzLy9ONllYeHNyck1rR0JQOEVlelB5aExoNmF3UDR6N1E5UUFJJiMx
+MzsKUVprWW94cmwvMXkwK2J5VjJxblRVVUNMUnBLL0JEcC9oY2Z3UGZLQ0EvMlJRQ0hKcmI2K3ow
+ZW5EUEZSSzBOS213T2NkbEd0VWswbSYjMTM7ClBnV0dTS3R1d1ZzUEFoVERKdWhvc1pPaGtOZitu
+U09PSHJRT24xRTJyek9yZC9rUWxxaUN3Ukg5Nzk2TnBUQStIU01mT29iSkVFUHEmIzEzOwp0cEY3
+UDVxYnd0bDk1VWE1T3A0QWhhNzBISGZVRlM0Qk9RS0xCVmZNWmRPUitpUG9oNU93QUsraHRZa0ZD
+RzlQMldIdTd3ZjhFQytXJiMxMzsKN2s5Nmd2VGQ4eEU3b3VvYWJUMng2WWZZcUVsUEhpVS9JTTln
+VnpXV0wvc3ZZRHlTVnVvRndCakROTjFjZHEwcU9ZUjF5dVMxYy85RCYjMTM7CkZSN2VvN0dGRUN5
+K1RCZDdJaUtSZkJWZVlHT09QTW5vRmZ4UkxXcnBzV05ud0Q3bGtQa0xDZ0ZDays4eUVjT1JnNjI1
+bW82NXo0eTYmIzEzOwpKNEs4Zm9kYTdxd21YTlAzUlMxOG9uNkJIdDhsUStiWGdPSG14SUhrMGFP
+MHFORHFndkxyMkZseUxHSkdpRU1ScURNTVI2L2EwNmJ0JiMxMzsKa25VTUhsN0NxTWZqSWtqUDRW
+Tk55R1BkSmd3Vmsya2ViOXVORnZKQ3hUK00yZkdYUTFOYkpOZnR2NU1nU3NwOU4xeSt4NmdBM0Vo
+dyYjMTM7CnlIbG1KQjRZTXRvOHRUVjFpODR4UFh4aTJDQWVEYUdEdXdvc3Q4WVVDU2pxN1JDSzh0
+R2NhQVlya1hRWTJ5UWZYM2N3RHNFeFJxVlcmIzEzOwp5cmp5UnQrTjZtSzk5UT09PC9kczpYNTA5
+Q2VydGlmaWNhdGU+PC9kczpYNTA5RGF0YT48L2RzOktleUluZm8+PC9kczpTaWduYXR1cmU+PC9z
+bWQ6c2lnbmVkTWFyaz4K
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Agent-English/TreatyStatute-Agent-English-Active.smd b/core/src/test/resources/google/registry/tmch/idn/Agent-English/TreatyStatute-Agent-English-Active.smd
new file mode 100644
index 000000000..3b1872519
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Agent-English/TreatyStatute-Agent-English-Active.smd
@@ -0,0 +1,125 @@
+Marks: Test & Validate
+smdID: 000000881669081701095-65535
+U-labels: test---validate, test--validate, test-and-validate, test-andvalidate, test-validate, testand-validate, testandvalidate, testvalidate
+notBefore: 2022-11-22T01:48:21.095Z
+notAfter: 2027-10-18T14:57:36.681Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il9mYWM0
+YmY2OC0yODJiLTQxNzYtODQyOC0wZjYxYWNiZmM2MDEiPjxzbWQ6aWQ+MDAwMDAwODgxNjY5MDgx
+NzAxMDk1LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMTo0ODoyMS4wOTVaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0xOFQxNDo1NzozNi42ODFaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
+cmVhdHlPclN0YXR1dGU+PG1hcms6aWQ+MDAwMTM3MTUwMzA2ODIzMjE1MDMwNjgyMzItMTwvbWFy
+azppZD48bWFyazptYXJrTmFtZT5UZXN0ICZhbXA7IFZhbGlkYXRlPC9tYXJrOm1hcmtOYW1lPjxt
+YXJrOmhvbGRlciBlbnRpdGxlbWVudD0ib3duZXIiPjxtYXJrOm5hbWU+VG9ueSBIb2xsYW5kPC9t
+YXJrOm5hbWU+PG1hcms6b3JnPkFnIGNvcnBvcmF0aW9uPC9tYXJrOm9yZz48bWFyazphZGRyPjxt
+YXJrOnN0cmVldD4xMzA1IEJyaWdodCBBdmVudWU8L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+QXJj
+YWRpYTwvbWFyazpjaXR5PjxtYXJrOnBjPjkwMDI4PC9tYXJrOnBjPjxtYXJrOmNjPlVTPC9tYXJr
+OmNjPjwvbWFyazphZGRyPjwvbWFyazpob2xkZXI+PG1hcms6Y29udGFjdCB0eXBlPSJhZ2VudCI+
+PG1hcms6bmFtZT5Ub255IEhvbGxhbmQ8L21hcms6bmFtZT48bWFyazpvcmc+QWcgY29ycG9yYXRp
+b248L21hcms6b3JnPjxtYXJrOmFkZHI+PG1hcms6c3RyZWV0PkJyaWdodCBBdmVudWUgMTMwNSA8
+L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+QXJjYWRpYTwvbWFyazpjaXR5PjxtYXJrOnNwPkNBPC9t
+YXJrOnNwPjxtYXJrOnBjPjkwMDI4PC9tYXJrOnBjPjxtYXJrOmNjPlVTPC9tYXJrOmNjPjwvbWFy
+azphZGRyPjxtYXJrOnZvaWNlPisxLjIwMjU1NjIzMDI8L21hcms6dm9pY2U+PG1hcms6ZmF4Pisx
+LjIwMjU1NjIzMDE8L21hcms6ZmF4PjxtYXJrOmVtYWlsPmluZm9AYWdjb3Jwb3JhdGlvbi5jb208
+L21hcms6ZW1haWw+PC9tYXJrOmNvbnRhY3Q+PG1hcms6cHJvdGVjdGlvbj48bWFyazpjYz5VUzwv
+bWFyazpjYz48bWFyazpydWxpbmc+VVM8L21hcms6cnVsaW5nPjwvbWFyazpwcm90ZWN0aW9uPjxt
+YXJrOmxhYmVsPnRlc3QtLS12YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0LS12
+YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0LWFuZC12YWxpZGF0ZTwvbWFyazps
+YWJlbD48bWFyazpsYWJlbD50ZXN0LWFuZHZhbGlkYXRlPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVs
+PnRlc3QtdmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+dGVzdGFuZC12YWxpZGF0ZTwv
+bWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0YW5kdmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6
+bGFiZWw+dGVzdHZhbGlkYXRlPC9tYXJrOmxhYmVsPjxtYXJrOmdvb2RzQW5kU2VydmljZXM+Z3Vp
+dGFyPC9tYXJrOmdvb2RzQW5kU2VydmljZXM+PG1hcms6cmVmTnVtPjEyMzQ8L21hcms6cmVmTnVt
+PjxtYXJrOnByb0RhdGU+MjAwMC0wMS0wMVQwMDowMDowMC4wMDBaPC9tYXJrOnByb0RhdGU+PG1h
+cms6dGl0bGU+Z3VpdGFyPC9tYXJrOnRpdGxlPjxtYXJrOmV4ZWNEYXRlPjIwMTMtMDItMDJUMDA6
+MDA6MDAuMDAwWjwvbWFyazpleGVjRGF0ZT48L21hcms6dHJlYXR5T3JTdGF0dXRlPjwvbWFyazpt
+YXJrPjxkczpTaWduYXR1cmUgeG1sbnM6ZHM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1s
+ZHNpZyMiIElkPSJfODllY2JhMWEtMDExOS00MmUyLTk2ZDMtOTQzYWRkMjZiNDhiIj48ZHM6U2ln
+bmVkSW5mbz48ZHM6Q2Fub25pY2FsaXphdGlvbk1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cu
+dzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjxkczpTaWduYXR1cmVNZXRob2QgQWxnb3Jp
+dGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGRzaWctbW9yZSNyc2Etc2hhMjU2Ii8+
+PGRzOlJlZmVyZW5jZSBVUkk9IiNfZmFjNGJmNjgtMjgyYi00MTc2LTg0MjgtMGY2MWFjYmZjNjAx
+Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5v
+cmcvMjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48ZHM6VHJhbnNmb3JtIEFs
+Z29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpU
+cmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8y
+MDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+MnBRQ3VpV2hxZG1ndTlocGtv
+ZHdTUVIvQ0xXV05QbEhsOGRjWTdhaWpZbz08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNl
+PjxkczpSZWZlcmVuY2UgVVJJPSIjXzQwYmMzZThiLTIzMTUtNGU5NC05YjY3LTVhZjg1NzNkNTIy
+MSI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMu
+b3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6RGlnZXN0TWV0
+aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxlbmMjc2hhMjU2Ii8+
+PGRzOkRpZ2VzdFZhbHVlPkZ0SXJzL0IvdmlxVE1vbi9rblRHbE54cmlua0lWZVdPZHZiOVo3TTVO
+NEU9PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48L2RzOlNpZ25lZEluZm8+PGRzOlNp
+Z25hdHVyZVZhbHVlIElkPSJfNjVlMGY4ZjktNDJkMy00YTg3LThlNTMtNDk4NjI3NGVjMTQ3Ij5t
+cXJQMm5HdTVnQzVEQjA0cGlEcjMwYWJraXpBaFZ0OXowdHdrUEdYdThhZkJoUnpaK0dzNVFReUZo
+MDJTTnJ5MDlhdTlCWlBGUUpNJiMxMzsKTmpFYThUYzJxWll1L3pRZWIxVXlkWnBidGgvakp2Y0dV
+TWJHQkt3WkJzSWZUanNUNS8xTDJxOWtFUkU3VTdCbUs2dTRKY3N0VERhNSYjMTM7ClJ0VEpaMHBI
+NVV6UzlseGtuNDR5Rlk5R1VBODZDckk3WGozQkpGRnVac1pvWG5LUE15YzRrY1gvRjdDc1NYVzdk
+SHl4YkRYRkFjNUwmIzEzOwo4bm9iZzM4dngzUVI1V25mWDg0NW5kYmJ3elQ4ZCs2SXo4Q2lFeU5i
+UVlITDNiZ0MwV2N0Ky9TSm9Nd25JVFFlZFBUTjZPS1Zuek5LJiMxMzsKR3BVeEFaTDNVdUFmdUN2
+dVlNdlVzQnNSeStlR2hMZUN1MWFhd0ZPVXoxYkg4bUg0bHcrRzhZMFJFNkF4eFdSWlc4NytmYkhD
+QndpZyYjMTM7ClNWSEhRZ1c2RzU4d21mcVNmT2lXSmc5VStWU1EyYzlvSEpqOFpHNWJ0TnMvRllX
+ekFvYmZGd0dLd2ZESU4rZ3E0UTVTczR1ZnFwWksmIzEzOwp6YnF5ODFjSTB4NWtuTDFpZkdPMGdV
+QlZsQmlnRVFFdDE2bitOYUJ1NGgrTmJwUEtHaEtMS2UzcHNyUTVackhQaUVMcDBBM0ZabDQ0JiMx
+MzsKQnZzTk12R21LM0x3WUNyNEdRdmdlSTlLa1UvaXFEYmppVHBuWlR3ME1sNkdDdG9FajBiTlN4
+aXFWRVdVNmwrUGhVc2ZUOWFYOGduVyYjMTM7CmoweDkxcTJtSnBrTGN4eVFna1pyZ1RtSVRYVFNO
+c2U2RzRYOVpRQ2NRQlVGWXFjSllHWi9DazZkV084cnRaQjNtOE9QaUdZUXJDMD08L2RzOlNpZ25h
+dHVyZVZhbHVlPjxkczpLZXlJbmZvIElkPSJfNDBiYzNlOGItMjMxNS00ZTk0LTliNjctNWFmODU3
+M2Q1MjIxIj48ZHM6WDUwOURhdGE+PGRzOlg1MDlDZXJ0aWZpY2F0ZT5NSUlIWHpDQ0JVZWdBd0lC
+QWdJVVhxSS92ZDE4Q2FnOThvTnBkelY3Qml5LzZFQXdEUVlKS29aSWh2Y05BUUVOQlFBd2ZERUxN
+QWtHJiMxMzsKQTFVRUJoTUNWVk14UERBNkJnTlZCQW9NTTBsdWRHVnlibVYwSUVOdmNuQnZjbUYw
+YVc5dUlHWnZjaUJCYzNOcFoyNWxaQ0JPWVcxbCYjMTM7CmN5QmhibVFnVG5WdFltVnljekV2TUMw
+R0ExVUVBd3dtU1VOQlRrNGdWSEpoWkdWdFlYSnJJRU5zWldGeWFXNW5hRzkxYzJVZ1VHbHMmIzEz
+OwpiM1FnUTBFd0hoY05Nakl4TVRFMk1UTXlPRFU1V2hjTk1qY3hNVEUxTVRNeU9EVTVXakNCMERF
+TE1Ba0dBMVVFQmhNQ1FrVXhFVEFQJiMxMzsKQmdOVkJBZ1RDRUp5ZFhOelpXeHpNUkl3RUFZRFZR
+UUhFd2xXYVd4MmIyOXlaR1V4TXpBeEJnTlZCQW9US2tSbGJHOXBkSFJsSUVOdiYjMTM7CmJuTjFi
+SFJwYm1jZ1lXNWtJRUZrZG1semIzSjVJRU5XUWtFdlUwTlNUREUrTUR3R0ExVUVBeE0xU1VOQlRr
+NGdWRTFEU0NCQmRYUm8mIzEzOwpiM0pwZW1Wa0lGUnlZV1JsYldGeWF5QlFhV3h2ZENCV1lXeHBa
+R0YwYjNJZ1ZtRnNhV1F4SlRBakJna3Foa2lHOXcwQkNRRVdGbUpsJiMxMzsKZEcxamFITnRaRUJr
+Wld4dmFYUjBaUzVqYjIwd2dnSWlNQTBHQ1NxR1NJYjNEUUVCQVFVQUE0SUNEd0F3Z2dJS0FvSUNB
+UUM2Rkp3eiYjMTM7CktxUVZYNmZHMy9FTFJTR1dWOUdyS2FGTUttaFdJeGVwd1JaTjZNeE1xa2Q1
+RG5ZZmlUK1dwOThqRWtxZ1R4MlVNYjlxdWdjR05WNmcmIzEzOwozNS9DclFiL0YvbXozQzRzZkxO
+dURwU3FLOVFGOCtwYVRINmhRbXJPcHFWK1VUdmRqOVNNZ0tHeUZpelM4OENEV014NHczaTRGQUtl
+JiMxMzsKNk5Sc0pSR1RBdEtEdU1IY0E0c2owOEdqZTNsUFdjZ0Z2Y1FORFZlRUJUdU9IQkcrUmhq
+N1YxSmlOR1AvNGVwVFhURlhnUEZEZ2V6MyYjMTM7CllBZnhxcGJ1TzRUWDZiYllkazJudk1MRnZM
+RU5rQ0ZZdWxuWVB6Z25FQkdTTUtJYUFJbGIrc2NIQ3ZXZ1dqMlRMZ3doMkdKTmN6Vk0mIzEzOwox
+TFBNcUdTK1VraTlNaDc5ODIyL3hvYXI0OTh4RHgyWXgvOHN3Z0VOTFNnQ3NRQVc4bk1nd1duNkFi
+WWwyUkFCWHVyYXlGc240UDFSJiMxMzsKdVFObVVwL3FyUktSdlNKcjFPTGtIWmZGVGNTWVFhVml1
+TVlQWHpHejh0bU1MbG1JL0I2QUNINEF3Uk1kbll2Rk8zS0kxUkJuUEtJZCYjMTM7Cnd3ZlVwWjVJ
+VElwYkE3Q0dnVHgxcXh0TTF3SVVyN3BIZUtQNmpWZTNrZERMZysvQloyeE1FdEJrNWE4WTdCNHYz
+eHdIWEdUdlY4bU4mIzEzOwowQWcvU3lUL1FVeUVSaFhVeUFOMitFd1orU1FDVXlOZnppb1dRODc4
+ZUd5a1UrNDYrQmJnSTNJSXIzNlhLUHdtenQwU1orS0kzdG5GJiMxMzsKVGxuOW1YMEtDMGlkb2o1
+eWt6UG9DL01JZWQwc3A0VGlneEViV054N0VGODBQdlIvRERFd1ZQRUVra2p5NjNYRnVseGlDUUlE
+QVFBQiYjMTM7Cm80SUJnakNDQVg0d0RBWURWUjBUQVFIL0JBSXdBREFPQmdOVkhROEJBZjhFQkFN
+Q0I0QXdIUVlEVlIwT0JCWUVGSG45czBERWEya3YmIzEzOwpnRS9lSU9Uc3FvVzg1TVhGTUlHNkJn
+TlZIU01FZ2JJd2dhK0FGRWQ3VDY1NlVaRzEwYitkTnVtR2Z6WVdCS2xGb1lHQXBINHdmREVMJiMx
+MzsKTUFrR0ExVUVCaE1DVlZNeFBEQTZCZ05WQkFvTU0wbHVkR1Z5Ym1WMElFTnZjbkJ2Y21GMGFX
+OXVJR1p2Y2lCQmMzTnBaMjVsWkNCTyYjMTM7CllXMWxjeUJoYm1RZ1RuVnRZbVZ5Y3pFdk1DMEdB
+MVVFQXd3bVNVTkJUazRnVkhKaFpHVnRZWEpySUVOc1pXRnlhVzVuYUc5MWMyVWcmIzEzOwpVR2xz
+YjNRZ1EwR0NGSHBxYlRGZUpjUHRVQzlYdXVQS1BzTHdEUitNTURRR0ExVWRId1F0TUNzd0thQW5v
+Q1dHSTJoMGRIQTZMeTlqJiMxMzsKY213dWFXTmhibTR1YjNKbkwzUnRZMmhmY0dsc2IzUXVZM0pz
+TUV3R0ExVWRJQVJGTUVNd0VBWU9Ld1lCQkFHQ3lSc0JCWU03REFvdyYjMTM7Ckx3WUlLd1lCQlFV
+SEFnRXdJekFoQmdnckJnRUZCUWNDQVJZVmFIUjBjSE02THk5amNITXVhV05oYm00dWIzSm5NQTBH
+Q1NxR1NJYjMmIzEzOwpEUUVCRFFVQUE0SUNBUUJkU2F0NTZ1ZWpMbkFqRklGOTVkallXSTZzLy9O
+NllYeHNyck1rR0JQOEVlelB5aExoNmF3UDR6N1E5UUFJJiMxMzsKUVprWW94cmwvMXkwK2J5VjJx
+blRVVUNMUnBLL0JEcC9oY2Z3UGZLQ0EvMlJRQ0hKcmI2K3owZW5EUEZSSzBOS213T2NkbEd0VWsw
+bSYjMTM7ClBnV0dTS3R1d1ZzUEFoVERKdWhvc1pPaGtOZituU09PSHJRT24xRTJyek9yZC9rUWxx
+aUN3Ukg5Nzk2TnBUQStIU01mT29iSkVFUHEmIzEzOwp0cEY3UDVxYnd0bDk1VWE1T3A0QWhhNzBI
+SGZVRlM0Qk9RS0xCVmZNWmRPUitpUG9oNU93QUsraHRZa0ZDRzlQMldIdTd3ZjhFQytXJiMxMzsK
+N2s5Nmd2VGQ4eEU3b3VvYWJUMng2WWZZcUVsUEhpVS9JTTlnVnpXV0wvc3ZZRHlTVnVvRndCakRO
+TjFjZHEwcU9ZUjF5dVMxYy85RCYjMTM7CkZSN2VvN0dGRUN5K1RCZDdJaUtSZkJWZVlHT09QTW5v
+RmZ4UkxXcnBzV05ud0Q3bGtQa0xDZ0ZDays4eUVjT1JnNjI1bW82NXo0eTYmIzEzOwpKNEs4Zm9k
+YTdxd21YTlAzUlMxOG9uNkJIdDhsUStiWGdPSG14SUhrMGFPMHFORHFndkxyMkZseUxHSkdpRU1S
+cURNTVI2L2EwNmJ0JiMxMzsKa25VTUhsN0NxTWZqSWtqUDRWTk55R1BkSmd3Vmsya2ViOXVORnZK
+Q3hUK00yZkdYUTFOYkpOZnR2NU1nU3NwOU4xeSt4NmdBM0VodyYjMTM7CnlIbG1KQjRZTXRvOHRU
+VjFpODR4UFh4aTJDQWVEYUdEdXdvc3Q4WVVDU2pxN1JDSzh0R2NhQVlya1hRWTJ5UWZYM2N3RHNF
+eFJxVlcmIzEzOwp5cmp5UnQrTjZtSzk5UT09PC9kczpYNTA5Q2VydGlmaWNhdGU+PC9kczpYNTA5
+RGF0YT48L2RzOktleUluZm8+PC9kczpTaWduYXR1cmU+PC9zbWQ6c2lnbmVkTWFyaz4K
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Agent-English/TreatyStatute-Agent-English-Revoked.smd b/core/src/test/resources/google/registry/tmch/idn/Agent-English/TreatyStatute-Agent-English-Revoked.smd
new file mode 100644
index 000000000..1b290dacd
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Agent-English/TreatyStatute-Agent-English-Revoked.smd
@@ -0,0 +1,125 @@
+Marks: Test & Validate
+smdID: 000000881669081534681-65535
+U-labels: test---validate, test--validate, test-and-validate, test-andvalidate, test-validate, testand-validate, testandvalidate, testvalidate
+notBefore: 2022-11-22T01:45:34.681Z
+notAfter: 2027-10-18T14:57:36.681Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il8xMGUw
+NWZkNC1hMDZmLTRjZWYtODc1MC0xZTc0ZDM1NTgzN2UiPjxzbWQ6aWQ+MDAwMDAwODgxNjY5MDgx
+NTM0NjgxLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMTo0NTozNC42ODFaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0xOFQxNDo1NzozNi42ODFaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
+cmVhdHlPclN0YXR1dGU+PG1hcms6aWQ+MDAwMTM3MTUwMzA2ODIzMjE1MDMwNjgyMzItMTwvbWFy
+azppZD48bWFyazptYXJrTmFtZT5UZXN0ICZhbXA7IFZhbGlkYXRlPC9tYXJrOm1hcmtOYW1lPjxt
+YXJrOmhvbGRlciBlbnRpdGxlbWVudD0ib3duZXIiPjxtYXJrOm5hbWU+VG9ueSBIb2xsYW5kPC9t
+YXJrOm5hbWU+PG1hcms6b3JnPkFnIGNvcnBvcmF0aW9uPC9tYXJrOm9yZz48bWFyazphZGRyPjxt
+YXJrOnN0cmVldD4xMzA1IEJyaWdodCBBdmVudWU8L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+QXJj
+YWRpYTwvbWFyazpjaXR5PjxtYXJrOnBjPjkwMDI4PC9tYXJrOnBjPjxtYXJrOmNjPlVTPC9tYXJr
+OmNjPjwvbWFyazphZGRyPjwvbWFyazpob2xkZXI+PG1hcms6Y29udGFjdCB0eXBlPSJhZ2VudCI+
+PG1hcms6bmFtZT5Ub255IEhvbGxhbmQ8L21hcms6bmFtZT48bWFyazpvcmc+QWcgY29ycG9yYXRp
+b248L21hcms6b3JnPjxtYXJrOmFkZHI+PG1hcms6c3RyZWV0PkJyaWdodCBBdmVudWUgMTMwNSA8
+L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+QXJjYWRpYTwvbWFyazpjaXR5PjxtYXJrOnNwPkNBPC9t
+YXJrOnNwPjxtYXJrOnBjPjkwMDI4PC9tYXJrOnBjPjxtYXJrOmNjPlVTPC9tYXJrOmNjPjwvbWFy
+azphZGRyPjxtYXJrOnZvaWNlPisxLjIwMjU1NjIzMDI8L21hcms6dm9pY2U+PG1hcms6ZmF4Pisx
+LjIwMjU1NjIzMDE8L21hcms6ZmF4PjxtYXJrOmVtYWlsPmluZm9AYWdjb3Jwb3JhdGlvbi5jb208
+L21hcms6ZW1haWw+PC9tYXJrOmNvbnRhY3Q+PG1hcms6cHJvdGVjdGlvbj48bWFyazpjYz5VUzwv
+bWFyazpjYz48bWFyazpydWxpbmc+VVM8L21hcms6cnVsaW5nPjwvbWFyazpwcm90ZWN0aW9uPjxt
+YXJrOmxhYmVsPnRlc3QtLS12YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0LS12
+YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0LWFuZC12YWxpZGF0ZTwvbWFyazps
+YWJlbD48bWFyazpsYWJlbD50ZXN0LWFuZHZhbGlkYXRlPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVs
+PnRlc3QtdmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+dGVzdGFuZC12YWxpZGF0ZTwv
+bWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0YW5kdmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6
+bGFiZWw+dGVzdHZhbGlkYXRlPC9tYXJrOmxhYmVsPjxtYXJrOmdvb2RzQW5kU2VydmljZXM+Z3Vp
+dGFyPC9tYXJrOmdvb2RzQW5kU2VydmljZXM+PG1hcms6cmVmTnVtPjEyMzQ8L21hcms6cmVmTnVt
+PjxtYXJrOnByb0RhdGU+MjAwMC0wMS0wMVQwMDowMDowMC4wMDBaPC9tYXJrOnByb0RhdGU+PG1h
+cms6dGl0bGU+Z3VpdGFyPC9tYXJrOnRpdGxlPjxtYXJrOmV4ZWNEYXRlPjIwMTMtMDItMDJUMDA6
+MDA6MDAuMDAwWjwvbWFyazpleGVjRGF0ZT48L21hcms6dHJlYXR5T3JTdGF0dXRlPjwvbWFyazpt
+YXJrPjxkczpTaWduYXR1cmUgeG1sbnM6ZHM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1s
+ZHNpZyMiIElkPSJfODdmNmVmOGEtMzY4Zi00NDI1LTgyZTktMGYxZDFkM2U4Y2YzIj48ZHM6U2ln
+bmVkSW5mbz48ZHM6Q2Fub25pY2FsaXphdGlvbk1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cu
+dzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjxkczpTaWduYXR1cmVNZXRob2QgQWxnb3Jp
+dGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGRzaWctbW9yZSNyc2Etc2hhMjU2Ii8+
+PGRzOlJlZmVyZW5jZSBVUkk9IiNfMTBlMDVmZDQtYTA2Zi00Y2VmLTg3NTAtMWU3NGQzNTU4Mzdl
+Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5v
+cmcvMjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48ZHM6VHJhbnNmb3JtIEFs
+Z29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpU
+cmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8y
+MDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+cldjSFBTcGxVS3hMVFVsTVgr
+QmI1dzBoclRJRjM1NitoODF1QlZBWEFkTT08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNl
+PjxkczpSZWZlcmVuY2UgVVJJPSIjXzAzNTY1ODQxLWZhOTYtNGNmMy1hY2E1LTUxYmEwMjNiZWY2
+ZSI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMu
+b3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6RGlnZXN0TWV0
+aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxlbmMjc2hhMjU2Ii8+
+PGRzOkRpZ2VzdFZhbHVlPmI5YTNwTDQydWpyUnVmNExML3F1ZzF2cmd6VURBQ2VnNFRVbzRadDk4
+TlU9PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48L2RzOlNpZ25lZEluZm8+PGRzOlNp
+Z25hdHVyZVZhbHVlIElkPSJfYWY5ZDBkNTUtM2E5YS00YTk5LTg2M2YtZTdjMjBiYTBhZGE2Ij5B
+YTZ6VG5nbENlN1lrR2U2V1JMT0doYmFXOENlQzhKTnhCamFPd2daT1F4MldEd3RLVnhDeXkxTTlh
+YzNwbmxhYnZlNmJIK2tyWi9VJiMxMzsKWUZETGJncnZwWWtiZGdRVXgzZzhPS2JJMU4xSlFUeWhZ
+WFAvU1MvRkdjb3kwdEl0eE9YRTNXMFJibTNVeDkvbXpJcHN3YzZlT2puRSYjMTM7Clh6blpOeDNz
+VXBpc1F2L2E3cjFDZzNEMm13aEJvaW5yb1RYQVV1WEdsclNOb3c3d0ZTZGxmRytEc0Uzb0hHNytY
+VThjNzRDYWMxYlQmIzEzOwpBQ2YrNnV3TnVEV0lOczRTL0Izd1M3alRIa2dRT0pvUXZ2QjdncEFW
+cm9kK0lKQUN4Z2Uvc1lDQ2hJQ0JDMnZGNXVzWHlKVHlSeWpxJiMxMzsKdm9jQ0kzNlBkek9xSDNn
+S0h5NTNERHd2cy9QV3BGRGErd0ZMcXQ2ZTVPWG1KekV1Ukw5Vk9KQXIvbzAwWEJDQ21FVWkrSi9h
+Y2g1WSYjMTM7CnVaSWw1N2luclN0c0VVUW55TXBYRGFja1JLOFFIYUlFaWpvS3JjNDlDbHY3ZTNB
+dXpNdUVkb2JOMHBjQXpyTUJTMTJydFRycU10ZW4mIzEzOwpRMGIzWmpHcjhFbEg2UlNBYnZUZGpE
+TEdBeDhUVit6Y1hoZTd6dlludEN2Zmh1MjB5QzlVSDVMNXFWa093ZWdWOUN4N1d3VDVFMFBpJiMx
+MzsKTytpTDZEWElwaldjNHVTNmpHUEhjcUZFUnBWdVd6Y2tFVDV2YVVDZ1A2ZlhIOFZndlF3R1lI
+Ylp1dG1tWmtrUFpPYXBQSGJNWWlPZyYjMTM7CmlvTlZoZmxUYmxJUmk3MGJHNzRMckhXczI4bC96
+QzZRY3Z2WFZEdmRHejFZQkR4c0hnSHBFYzIxT0l0NHpwM1FaNStXREZpTlNUMD08L2RzOlNpZ25h
+dHVyZVZhbHVlPjxkczpLZXlJbmZvIElkPSJfMDM1NjU4NDEtZmE5Ni00Y2YzLWFjYTUtNTFiYTAy
+M2JlZjZlIj48ZHM6WDUwOURhdGE+PGRzOlg1MDlDZXJ0aWZpY2F0ZT5NSUlIWHpDQ0JVZWdBd0lC
+QWdJVVhxSS92ZDE4Q2FnOThvTnBkelY3Qml5LzZFQXdEUVlKS29aSWh2Y05BUUVOQlFBd2ZERUxN
+QWtHJiMxMzsKQTFVRUJoTUNWVk14UERBNkJnTlZCQW9NTTBsdWRHVnlibVYwSUVOdmNuQnZjbUYw
+YVc5dUlHWnZjaUJCYzNOcFoyNWxaQ0JPWVcxbCYjMTM7CmN5QmhibVFnVG5WdFltVnljekV2TUMw
+R0ExVUVBd3dtU1VOQlRrNGdWSEpoWkdWdFlYSnJJRU5zWldGeWFXNW5hRzkxYzJVZ1VHbHMmIzEz
+OwpiM1FnUTBFd0hoY05Nakl4TVRFMk1UTXlPRFU1V2hjTk1qY3hNVEUxTVRNeU9EVTVXakNCMERF
+TE1Ba0dBMVVFQmhNQ1FrVXhFVEFQJiMxMzsKQmdOVkJBZ1RDRUp5ZFhOelpXeHpNUkl3RUFZRFZR
+UUhFd2xXYVd4MmIyOXlaR1V4TXpBeEJnTlZCQW9US2tSbGJHOXBkSFJsSUVOdiYjMTM7CmJuTjFi
+SFJwYm1jZ1lXNWtJRUZrZG1semIzSjVJRU5XUWtFdlUwTlNUREUrTUR3R0ExVUVBeE0xU1VOQlRr
+NGdWRTFEU0NCQmRYUm8mIzEzOwpiM0pwZW1Wa0lGUnlZV1JsYldGeWF5QlFhV3h2ZENCV1lXeHBa
+R0YwYjNJZ1ZtRnNhV1F4SlRBakJna3Foa2lHOXcwQkNRRVdGbUpsJiMxMzsKZEcxamFITnRaRUJr
+Wld4dmFYUjBaUzVqYjIwd2dnSWlNQTBHQ1NxR1NJYjNEUUVCQVFVQUE0SUNEd0F3Z2dJS0FvSUNB
+UUM2Rkp3eiYjMTM7CktxUVZYNmZHMy9FTFJTR1dWOUdyS2FGTUttaFdJeGVwd1JaTjZNeE1xa2Q1
+RG5ZZmlUK1dwOThqRWtxZ1R4MlVNYjlxdWdjR05WNmcmIzEzOwozNS9DclFiL0YvbXozQzRzZkxO
+dURwU3FLOVFGOCtwYVRINmhRbXJPcHFWK1VUdmRqOVNNZ0tHeUZpelM4OENEV014NHczaTRGQUtl
+JiMxMzsKNk5Sc0pSR1RBdEtEdU1IY0E0c2owOEdqZTNsUFdjZ0Z2Y1FORFZlRUJUdU9IQkcrUmhq
+N1YxSmlOR1AvNGVwVFhURlhnUEZEZ2V6MyYjMTM7CllBZnhxcGJ1TzRUWDZiYllkazJudk1MRnZM
+RU5rQ0ZZdWxuWVB6Z25FQkdTTUtJYUFJbGIrc2NIQ3ZXZ1dqMlRMZ3doMkdKTmN6Vk0mIzEzOwox
+TFBNcUdTK1VraTlNaDc5ODIyL3hvYXI0OTh4RHgyWXgvOHN3Z0VOTFNnQ3NRQVc4bk1nd1duNkFi
+WWwyUkFCWHVyYXlGc240UDFSJiMxMzsKdVFObVVwL3FyUktSdlNKcjFPTGtIWmZGVGNTWVFhVml1
+TVlQWHpHejh0bU1MbG1JL0I2QUNINEF3Uk1kbll2Rk8zS0kxUkJuUEtJZCYjMTM7Cnd3ZlVwWjVJ
+VElwYkE3Q0dnVHgxcXh0TTF3SVVyN3BIZUtQNmpWZTNrZERMZysvQloyeE1FdEJrNWE4WTdCNHYz
+eHdIWEdUdlY4bU4mIzEzOwowQWcvU3lUL1FVeUVSaFhVeUFOMitFd1orU1FDVXlOZnppb1dRODc4
+ZUd5a1UrNDYrQmJnSTNJSXIzNlhLUHdtenQwU1orS0kzdG5GJiMxMzsKVGxuOW1YMEtDMGlkb2o1
+eWt6UG9DL01JZWQwc3A0VGlneEViV054N0VGODBQdlIvRERFd1ZQRUVra2p5NjNYRnVseGlDUUlE
+QVFBQiYjMTM7Cm80SUJnakNDQVg0d0RBWURWUjBUQVFIL0JBSXdBREFPQmdOVkhROEJBZjhFQkFN
+Q0I0QXdIUVlEVlIwT0JCWUVGSG45czBERWEya3YmIzEzOwpnRS9lSU9Uc3FvVzg1TVhGTUlHNkJn
+TlZIU01FZ2JJd2dhK0FGRWQ3VDY1NlVaRzEwYitkTnVtR2Z6WVdCS2xGb1lHQXBINHdmREVMJiMx
+MzsKTUFrR0ExVUVCaE1DVlZNeFBEQTZCZ05WQkFvTU0wbHVkR1Z5Ym1WMElFTnZjbkJ2Y21GMGFX
+OXVJR1p2Y2lCQmMzTnBaMjVsWkNCTyYjMTM7CllXMWxjeUJoYm1RZ1RuVnRZbVZ5Y3pFdk1DMEdB
+MVVFQXd3bVNVTkJUazRnVkhKaFpHVnRZWEpySUVOc1pXRnlhVzVuYUc5MWMyVWcmIzEzOwpVR2xz
+YjNRZ1EwR0NGSHBxYlRGZUpjUHRVQzlYdXVQS1BzTHdEUitNTURRR0ExVWRId1F0TUNzd0thQW5v
+Q1dHSTJoMGRIQTZMeTlqJiMxMzsKY213dWFXTmhibTR1YjNKbkwzUnRZMmhmY0dsc2IzUXVZM0pz
+TUV3R0ExVWRJQVJGTUVNd0VBWU9Ld1lCQkFHQ3lSc0JCWU03REFvdyYjMTM7Ckx3WUlLd1lCQlFV
+SEFnRXdJekFoQmdnckJnRUZCUWNDQVJZVmFIUjBjSE02THk5amNITXVhV05oYm00dWIzSm5NQTBH
+Q1NxR1NJYjMmIzEzOwpEUUVCRFFVQUE0SUNBUUJkU2F0NTZ1ZWpMbkFqRklGOTVkallXSTZzLy9O
+NllYeHNyck1rR0JQOEVlelB5aExoNmF3UDR6N1E5UUFJJiMxMzsKUVprWW94cmwvMXkwK2J5VjJx
+blRVVUNMUnBLL0JEcC9oY2Z3UGZLQ0EvMlJRQ0hKcmI2K3owZW5EUEZSSzBOS213T2NkbEd0VWsw
+bSYjMTM7ClBnV0dTS3R1d1ZzUEFoVERKdWhvc1pPaGtOZituU09PSHJRT24xRTJyek9yZC9rUWxx
+aUN3Ukg5Nzk2TnBUQStIU01mT29iSkVFUHEmIzEzOwp0cEY3UDVxYnd0bDk1VWE1T3A0QWhhNzBI
+SGZVRlM0Qk9RS0xCVmZNWmRPUitpUG9oNU93QUsraHRZa0ZDRzlQMldIdTd3ZjhFQytXJiMxMzsK
+N2s5Nmd2VGQ4eEU3b3VvYWJUMng2WWZZcUVsUEhpVS9JTTlnVnpXV0wvc3ZZRHlTVnVvRndCakRO
+TjFjZHEwcU9ZUjF5dVMxYy85RCYjMTM7CkZSN2VvN0dGRUN5K1RCZDdJaUtSZkJWZVlHT09QTW5v
+RmZ4UkxXcnBzV05ud0Q3bGtQa0xDZ0ZDays4eUVjT1JnNjI1bW82NXo0eTYmIzEzOwpKNEs4Zm9k
+YTdxd21YTlAzUlMxOG9uNkJIdDhsUStiWGdPSG14SUhrMGFPMHFORHFndkxyMkZseUxHSkdpRU1S
+cURNTVI2L2EwNmJ0JiMxMzsKa25VTUhsN0NxTWZqSWtqUDRWTk55R1BkSmd3Vmsya2ViOXVORnZK
+Q3hUK00yZkdYUTFOYkpOZnR2NU1nU3NwOU4xeSt4NmdBM0VodyYjMTM7CnlIbG1KQjRZTXRvOHRU
+VjFpODR4UFh4aTJDQWVEYUdEdXdvc3Q4WVVDU2pxN1JDSzh0R2NhQVlya1hRWTJ5UWZYM2N3RHNF
+eFJxVlcmIzEzOwp5cmp5UnQrTjZtSzk5UT09PC9kczpYNTA5Q2VydGlmaWNhdGU+PC9kczpYNTA5
+RGF0YT48L2RzOktleUluZm8+PC9kczpTaWduYXR1cmU+PC9zbWQ6c2lnbmVkTWFyaz4K
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Agent-French/Court-Agent-French-Active.smd b/core/src/test/resources/google/registry/tmch/idn/Agent-French/Court-Agent-French-Active.smd
new file mode 100644
index 000000000..cfe639aad
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Agent-French/Court-Agent-French-Active.smd
@@ -0,0 +1,124 @@
+Marks: Essai & évaluation
+smdID: 000000821669082290670-65535
+U-labels: xn--essai---valuation-itb, xn--essai--valuation-hqb, xn--essai-et-valuation-jwb, xn--essai-etvaluation-itb, xn--essai-valuation-gnb, xn--essaiet-valuation-itb, xn--essaietvaluation-hqb, xn--essaivaluation-fkb
+notBefore: 2022-11-22T01:58:10.670Z
+notAfter: 2027-10-18T14:46:53.013Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il9jOGNk
+MmM5ZC02Zjk0LTRmZTMtOTg1Mi1iMWViMWMxMTU3ZTkiPjxzbWQ6aWQ+MDAwMDAwODIxNjY5MDgy
+MjkwNjcwLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMTo1ODoxMC42NzBaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0xOFQxNDo0Njo1My4wMTNaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazpj
+b3VydD48bWFyazppZD4wMDAxMzkxNTAzMDY3MTg5MTUwMzA2NzE4OS0xPC9tYXJrOmlkPjxtYXJr
+Om1hcmtOYW1lPkVzc2FpICZhbXA7IMOpdmFsdWF0aW9uPC9tYXJrOm1hcmtOYW1lPjxtYXJrOmhv
+bGRlciBlbnRpdGxlbWVudD0ib3duZXIiPjxtYXJrOm9yZz5BZ2VuY2UgZW4gRnJhbmNlPC9tYXJr
+Om9yZz48bWFyazphZGRyPjxtYXJrOnN0cmVldD4xMCBBdmVudWUgUm91c3NlYXV4PC9tYXJrOnN0
+cmVldD48bWFyazpjaXR5PlZlcnNhaWxsZXM8L21hcms6Y2l0eT48bWFyazpwYz4zMzA4MTwvbWFy
+azpwYz48bWFyazpjYz5GUjwvbWFyazpjYz48L21hcms6YWRkcj48L21hcms6aG9sZGVyPjxtYXJr
+OmNvbnRhY3QgdHlwZT0iYWdlbnQiPjxtYXJrOm5hbWU+RnJhbmMgTGVicnVuPC9tYXJrOm5hbWU+
+PG1hcms6b3JnPkFnZW5jZSBlbiBGcmFuY2U8L21hcms6b3JnPjxtYXJrOmFkZHI+PG1hcms6c3Ry
+ZWV0PkF2ZW51ZSBSb3Vzc2VhdXggMTAgPC9tYXJrOnN0cmVldD48bWFyazpjaXR5PlZlcnNhaWxs
+ZXM8L21hcms6Y2l0eT48bWFyazpwYz4zMzA4MTwvbWFyazpwYz48bWFyazpjYz5GUjwvbWFyazpj
+Yz48L21hcms6YWRkcj48bWFyazp2b2ljZT4rMzMuMTI1NzgxMjUwPC9tYXJrOnZvaWNlPjxtYXJr
+OmZheD4rMzMuMTI1NzgxMjUxPC9tYXJrOmZheD48bWFyazplbWFpbD5pbmZvQGFnZW5jZS1lbi1m
+cmFuY2UuZnI8L21hcms6ZW1haWw+PC9tYXJrOmNvbnRhY3Q+PG1hcms6bGFiZWw+eG4tLWVzc2Fp
+LS0tdmFsdWF0aW9uLWl0YjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tZXNzYWktLXZhbHVh
+dGlvbi1ocWI8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLWVzc2FpLWV0LXZhbHVhdGlvbi1q
+d2I8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLWVzc2FpLWV0dmFsdWF0aW9uLWl0YjwvbWFy
+azpsYWJlbD48bWFyazpsYWJlbD54bi0tZXNzYWktdmFsdWF0aW9uLWduYjwvbWFyazpsYWJlbD48
+bWFyazpsYWJlbD54bi0tZXNzYWlldC12YWx1YXRpb24taXRiPC9tYXJrOmxhYmVsPjxtYXJrOmxh
+YmVsPnhuLS1lc3NhaWV0dmFsdWF0aW9uLWhxYjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0t
+ZXNzYWl2YWx1YXRpb24tZmtiPC9tYXJrOmxhYmVsPjxtYXJrOmdvb2RzQW5kU2VydmljZXM+Z3Vp
+dGFyPC9tYXJrOmdvb2RzQW5kU2VydmljZXM+PG1hcms6cmVmTnVtPjEyMzQ8L21hcms6cmVmTnVt
+PjxtYXJrOnByb0RhdGU+MjAxMy0wMS0wMVQwMDowMDowMC4wMDBaPC9tYXJrOnByb0RhdGU+PG1h
+cms6Y2M+RlI8L21hcms6Y2M+PG1hcms6Y291cnROYW1lPmd1aXRhcmU8L21hcms6Y291cnROYW1l
+PjwvbWFyazpjb3VydD48L21hcms6bWFyaz48ZHM6U2lnbmF0dXJlIHhtbG5zOmRzPSJodHRwOi8v
+d3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjIiBJZD0iXzMyYTE4M2Q0LTJlMDYtNGQ0Yi1hNDlh
+LWYyNTJhNTc0OTAzMSI+PGRzOlNpZ25lZEluZm8+PGRzOkNhbm9uaWNhbGl6YXRpb25NZXRob2Qg
+QWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48ZHM6
+U2lnbmF0dXJlTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxk
+c2lnLW1vcmUjcnNhLXNoYTI1NiIvPjxkczpSZWZlcmVuY2UgVVJJPSIjX2M4Y2QyYzlkLTZmOTQt
+NGZlMy05ODUyLWIxZWIxYzExNTdlOSI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdv
+cml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1sZHNpZyNlbnZlbG9wZWQtc2lnbmF0
+dXJlIi8+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAv
+eG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRo
+bT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxlbmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZh
+bHVlPnBtZEVGTjhGc2oyekgycFN4dHJKUUhEcFExWkFWaWE4cExoUk0ycmExU2M9PC9kczpEaWdl
+c3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48ZHM6UmVmZXJlbmNlIFVSST0iI181MDZkYTFlOC02MDE2
+LTQzNTMtOWZiYy04YjYwZDA3YWY2MWQiPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxn
+b3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRy
+YW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIw
+MDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1ZT5VM3NLSmgyeW9DUWVubVdOR2to
+YjN6Ynp1QW00bWt4V3VtOUdkZ0tKMjFvPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+
+PC9kczpTaWduZWRJbmZvPjxkczpTaWduYXR1cmVWYWx1ZSBJZD0iXzQwZmFmNzA0LTIxMjYtNDJk
+YS1iOGI1LTE1ODgyYWUxNTdlNSI+U3hqMWdFVkI0MVVKNHpFaEF0V0ROb0RPcG9BV082anJabzBQ
+eFNYWVFFd0RlakJxb0t5d2RnQ3VuaWs0NWp3cGN0b3dUZkd1YTNnMyYjMTM7CitLRkNMU0daNThh
+Z0YydDB3bVhJYmN2YU50RUkzVVBjbXFDdXM5UDIyU2dHV3FaR1NnbGw0ZUlpZWdNYlZyNFU2REYz
+L1hNb1FBVmMmIzEzOwpVdHU5c0RJR0FFWC92bUNublNCYjMyMWRnY043SHAybXBrVVVRUC9vT3k5
+ZE9sOXlhMG9XSzF1cHpsNjIzcCtLNzJKQlhSdWYweXo3JiMxMzsKSERWaXRHTmt5cDJyRHdETTY2
+N2VDd1NnZWpCeGo1a0VBak5wR1lOMkM1MUpMeVFlZ01rTE9URmpUNzJaMW1iY0tUWlZXOTZ3dkJx
+bSYjMTM7CmdWWWtDYUJ0Z3JLcXlHc0M3QWQzZ0tNcXFYeFcyTTdUZXFHeVNzQzZnTWZEN0VGUlNh
+NmxmenY3S3liRnA4d3NUMGF2cWdCR3RNMUkmIzEzOwpLamRUd2V1MDMxL1NranVBbmhpRHkvYVI5
+Q1krWGJXWVl0ZWV3ZGhWZEJxZnY3dVhWenlweWdDVndhbXpucWlmQk1MdU5yUjRVdmpiJiMxMzsK
+NElhTS9OckpUSnlFN3BJLzNzdHY2eVN2aCtON0R1aFR2d1JtS3RWVEdkYzVlWUtwYWR6R2tDOSt1
+bmFYamk4NXIrVks2VmEwbXM2YiYjMTM7CkcwbkpaYzB3UzMzcnV4QVJ6ZTlqWjM5SmJ3R09Xcnhr
+b2Y4YTl6c3U3RjdtZThQcmkzZ0VDRWNjSXFkYTdEWnlGTmlTY3l5K2FMb00mIzEzOwo3Z3d4ZWEx
+aDZVWmZ0SzZYU2dhSGd6bUxVWWx2ZGpsN2dzQ3IzOUx0T0NVZUlpOHVra2hYd2xXMUFUdWFBQkZr
+UlJMaHozcVNZR2s9PC9kczpTaWduYXR1cmVWYWx1ZT48ZHM6S2V5SW5mbyBJZD0iXzUwNmRhMWU4
+LTYwMTYtNDM1My05ZmJjLThiNjBkMDdhZjYxZCI+PGRzOlg1MDlEYXRhPjxkczpYNTA5Q2VydGlm
+aWNhdGU+TUlJSFh6Q0NCVWVnQXdJQkFnSVVYcUkvdmQxOENhZzk4b05wZHpWN0JpeS82RUF3RFFZ
+SktvWklodmNOQVFFTkJRQXdmREVMTUFrRyYjMTM7CkExVUVCaE1DVlZNeFBEQTZCZ05WQkFvTU0w
+bHVkR1Z5Ym1WMElFTnZjbkJ2Y21GMGFXOXVJR1p2Y2lCQmMzTnBaMjVsWkNCT1lXMWwmIzEzOwpj
+eUJoYm1RZ1RuVnRZbVZ5Y3pFdk1DMEdBMVVFQXd3bVNVTkJUazRnVkhKaFpHVnRZWEpySUVOc1pX
+RnlhVzVuYUc5MWMyVWdVR2xzJiMxMzsKYjNRZ1EwRXdIaGNOTWpJeE1URTJNVE15T0RVNVdoY05N
+amN4TVRFMU1UTXlPRFU1V2pDQjBERUxNQWtHQTFVRUJoTUNRa1V4RVRBUCYjMTM7CkJnTlZCQWdU
+Q0VKeWRYTnpaV3h6TVJJd0VBWURWUVFIRXdsV2FXeDJiMjl5WkdVeE16QXhCZ05WQkFvVEtrUmxi
+RzlwZEhSbElFTnYmIzEzOwpibk4xYkhScGJtY2dZVzVrSUVGa2RtbHpiM0o1SUVOV1FrRXZVME5T
+VERFK01Ed0dBMVVFQXhNMVNVTkJUazRnVkUxRFNDQkJkWFJvJiMxMzsKYjNKcGVtVmtJRlJ5WVdS
+bGJXRnlheUJRYVd4dmRDQldZV3hwWkdGMGIzSWdWbUZzYVdReEpUQWpCZ2txaGtpRzl3MEJDUUVX
+Rm1KbCYjMTM7CmRHMWphSE50WkVCa1pXeHZhWFIwWlM1amIyMHdnZ0lpTUEwR0NTcUdTSWIzRFFF
+QkFRVUFBNElDRHdBd2dnSUtBb0lDQVFDNkZKd3omIzEzOwpLcVFWWDZmRzMvRUxSU0dXVjlHckth
+Rk1LbWhXSXhlcHdSWk42TXhNcWtkNURuWWZpVCtXcDk4akVrcWdUeDJVTWI5cXVnY0dOVjZnJiMx
+MzsKMzUvQ3JRYi9GL216M0M0c2ZMTnVEcFNxSzlRRjgrcGFUSDZoUW1yT3BxVitVVHZkajlTTWdL
+R3lGaXpTODhDRFdNeDR3M2k0RkFLZSYjMTM7CjZOUnNKUkdUQXRLRHVNSGNBNHNqMDhHamUzbFBX
+Y2dGdmNRTkRWZUVCVHVPSEJHK1JoajdWMUppTkdQLzRlcFRYVEZYZ1BGRGdlejMmIzEzOwpZQWZ4
+cXBidU80VFg2YmJZZGsybnZNTEZ2TEVOa0NGWXVsbllQemduRUJHU01LSWFBSWxiK3NjSEN2V2dX
+ajJUTGd3aDJHSk5jelZNJiMxMzsKMUxQTXFHUytVa2k5TWg3OTgyMi94b2FyNDk4eER4Mll4Lzhz
+d2dFTkxTZ0NzUUFXOG5NZ3dXbjZBYllsMlJBQlh1cmF5RnNuNFAxUiYjMTM7CnVRTm1VcC9xclJL
+UnZTSnIxT0xrSFpmRlRjU1lRYVZpdU1ZUFh6R3o4dG1NTGxtSS9CNkFDSDRBd1JNZG5ZdkZPM0tJ
+MVJCblBLSWQmIzEzOwp3d2ZVcFo1SVRJcGJBN0NHZ1R4MXF4dE0xd0lVcjdwSGVLUDZqVmUza2RE
+TGcrL0JaMnhNRXRCazVhOFk3QjR2M3h3SFhHVHZWOG1OJiMxMzsKMEFnL1N5VC9RVXlFUmhYVXlB
+TjIrRXdaK1NRQ1V5TmZ6aW9XUTg3OGVHeWtVKzQ2K0JiZ0kzSUlyMzZYS1B3bXp0MFNaK0tJM3Ru
+RiYjMTM7ClRsbjltWDBLQzBpZG9qNXlrelBvQy9NSWVkMHNwNFRpZ3hFYldOeDdFRjgwUHZSL0RE
+RXdWUEVFa2tqeTYzWEZ1bHhpQ1FJREFRQUImIzEzOwpvNElCZ2pDQ0FYNHdEQVlEVlIwVEFRSC9C
+QUl3QURBT0JnTlZIUThCQWY4RUJBTUNCNEF3SFFZRFZSME9CQllFRkhuOXMwREVhMmt2JiMxMzsK
+Z0UvZUlPVHNxb1c4NU1YRk1JRzZCZ05WSFNNRWdiSXdnYStBRkVkN1Q2NTZVWkcxMGIrZE51bUdm
+ellXQktsRm9ZR0FwSDR3ZkRFTCYjMTM7Ck1Ba0dBMVVFQmhNQ1ZWTXhQREE2QmdOVkJBb01NMGx1
+ZEdWeWJtVjBJRU52Y25CdmNtRjBhVzl1SUdadmNpQkJjM05wWjI1bFpDQk8mIzEzOwpZVzFsY3lC
+aGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF3d21TVU5CVGs0Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5
+YVc1bmFHOTFjMlVnJiMxMzsKVUdsc2IzUWdRMEdDRkhwcWJURmVKY1B0VUM5WHV1UEtQc0x3RFIr
+TU1EUUdBMVVkSHdRdE1Dc3dLYUFub0NXR0kyaDBkSEE2THk5aiYjMTM7CmNtd3VhV05oYm00dWIz
+Sm5MM1J0WTJoZmNHbHNiM1F1WTNKc01Fd0dBMVVkSUFSRk1FTXdFQVlPS3dZQkJBR0N5UnNCQllN
+N0RBb3cmIzEzOwpMd1lJS3dZQkJRVUhBZ0V3SXpBaEJnZ3JCZ0VGQlFjQ0FSWVZhSFIwY0hNNkx5
+OWpjSE11YVdOaGJtNHViM0puTUEwR0NTcUdTSWIzJiMxMzsKRFFFQkRRVUFBNElDQVFCZFNhdDU2
+dWVqTG5BakZJRjk1ZGpZV0k2cy8vTjZZWHhzcnJNa0dCUDhFZXpQeWhMaDZhd1A0ejdROVFBSSYj
+MTM7ClFaa1lveHJsLzF5MCtieVYycW5UVVVDTFJwSy9CRHAvaGNmd1BmS0NBLzJSUUNISnJiNit6
+MGVuRFBGUkswTkttd09jZGxHdFVrMG0mIzEzOwpQZ1dHU0t0dXdWc1BBaFRESnVob3NaT2hrTmYr
+blNPT0hyUU9uMUUycnpPcmQva1FscWlDd1JIOTc5Nk5wVEErSFNNZk9vYkpFRVBxJiMxMzsKdHBG
+N1A1cWJ3dGw5NVVhNU9wNEFoYTcwSEhmVUZTNEJPUUtMQlZmTVpkT1IraVBvaDVPd0FLK2h0WWtG
+Q0c5UDJXSHU3d2Y4RUMrVyYjMTM7CjdrOTZndlRkOHhFN291b2FiVDJ4NllmWXFFbFBIaVUvSU05
+Z1Z6V1dML3N2WUR5U1Z1b0Z3QmpETk4xY2RxMHFPWVIxeXVTMWMvOUQmIzEzOwpGUjdlbzdHRkVD
+eStUQmQ3SWlLUmZCVmVZR09PUE1ub0ZmeFJMV3Jwc1dObndEN2xrUGtMQ2dGQ2srOHlFY09SZzYy
+NW1vNjV6NHk2JiMxMzsKSjRLOGZvZGE3cXdtWE5QM1JTMThvbjZCSHQ4bFErYlhnT0hteElIazBh
+TzBxTkRxZ3ZMcjJGbHlMR0pHaUVNUnFETU1SNi9hMDZidCYjMTM7CmtuVU1IbDdDcU1maklralA0
+Vk5OeUdQZEpnd1ZrMmtlYjl1TkZ2SkN4VCtNMmZHWFExTmJKTmZ0djVNZ1NzcDlOMXkreDZnQTNF
+aHcmIzEzOwp5SGxtSkI0WU10bzh0VFYxaTg0eFBYeGkyQ0FlRGFHRHV3b3N0OFlVQ1NqcTdSQ0s4
+dEdjYUFZcmtYUVkyeVFmWDNjd0RzRXhScVZXJiMxMzsKeXJqeVJ0K042bUs5OVE9PTwvZHM6WDUw
+OUNlcnRpZmljYXRlPjwvZHM6WDUwOURhdGE+PC9kczpLZXlJbmZvPjwvZHM6U2lnbmF0dXJlPjwv
+c21kOnNpZ25lZE1hcms+Cg==
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Agent-French/Court-Agent-French-Revoked.smd b/core/src/test/resources/google/registry/tmch/idn/Agent-French/Court-Agent-French-Revoked.smd
new file mode 100644
index 000000000..3a1fc1a91
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Agent-French/Court-Agent-French-Revoked.smd
@@ -0,0 +1,124 @@
+Marks: Essai & évaluation
+smdID: 000000821669082071641-65535
+U-labels: xn--essai---valuation-itb, xn--essai--valuation-hqb, xn--essai-et-valuation-jwb, xn--essai-etvaluation-itb, xn--essai-valuation-gnb, xn--essaiet-valuation-itb, xn--essaietvaluation-hqb, xn--essaivaluation-fkb
+notBefore: 2022-11-22T01:54:31.641Z
+notAfter: 2027-10-18T14:46:53.013Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il8wODFh
+Nzc4Yi1lMDQxLTQ4MDctODhmZS1kYTY2NzI4MjNiZmQiPjxzbWQ6aWQ+MDAwMDAwODIxNjY5MDgy
+MDcxNjQxLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMTo1NDozMS42NDFaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0xOFQxNDo0Njo1My4wMTNaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazpj
+b3VydD48bWFyazppZD4wMDAxMzkxNTAzMDY3MTg5MTUwMzA2NzE4OS0xPC9tYXJrOmlkPjxtYXJr
+Om1hcmtOYW1lPkVzc2FpICZhbXA7IMOpdmFsdWF0aW9uPC9tYXJrOm1hcmtOYW1lPjxtYXJrOmhv
+bGRlciBlbnRpdGxlbWVudD0ib3duZXIiPjxtYXJrOm9yZz5BZ2VuY2UgZW4gRnJhbmNlPC9tYXJr
+Om9yZz48bWFyazphZGRyPjxtYXJrOnN0cmVldD4xMCBBdmVudWUgUm91c3NlYXV4PC9tYXJrOnN0
+cmVldD48bWFyazpjaXR5PlZlcnNhaWxsZXM8L21hcms6Y2l0eT48bWFyazpwYz4zMzA4MTwvbWFy
+azpwYz48bWFyazpjYz5GUjwvbWFyazpjYz48L21hcms6YWRkcj48L21hcms6aG9sZGVyPjxtYXJr
+OmNvbnRhY3QgdHlwZT0iYWdlbnQiPjxtYXJrOm5hbWU+RnJhbmMgTGVicnVuPC9tYXJrOm5hbWU+
+PG1hcms6b3JnPkFnZW5jZSBlbiBGcmFuY2U8L21hcms6b3JnPjxtYXJrOmFkZHI+PG1hcms6c3Ry
+ZWV0PkF2ZW51ZSBSb3Vzc2VhdXggMTAgPC9tYXJrOnN0cmVldD48bWFyazpjaXR5PlZlcnNhaWxs
+ZXM8L21hcms6Y2l0eT48bWFyazpwYz4zMzA4MTwvbWFyazpwYz48bWFyazpjYz5GUjwvbWFyazpj
+Yz48L21hcms6YWRkcj48bWFyazp2b2ljZT4rMzMuMTI1NzgxMjUwPC9tYXJrOnZvaWNlPjxtYXJr
+OmZheD4rMzMuMTI1NzgxMjUxPC9tYXJrOmZheD48bWFyazplbWFpbD5pbmZvQGFnZW5jZS1lbi1m
+cmFuY2UuZnI8L21hcms6ZW1haWw+PC9tYXJrOmNvbnRhY3Q+PG1hcms6bGFiZWw+eG4tLWVzc2Fp
+LS0tdmFsdWF0aW9uLWl0YjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tZXNzYWktLXZhbHVh
+dGlvbi1ocWI8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLWVzc2FpLWV0LXZhbHVhdGlvbi1q
+d2I8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLWVzc2FpLWV0dmFsdWF0aW9uLWl0YjwvbWFy
+azpsYWJlbD48bWFyazpsYWJlbD54bi0tZXNzYWktdmFsdWF0aW9uLWduYjwvbWFyazpsYWJlbD48
+bWFyazpsYWJlbD54bi0tZXNzYWlldC12YWx1YXRpb24taXRiPC9tYXJrOmxhYmVsPjxtYXJrOmxh
+YmVsPnhuLS1lc3NhaWV0dmFsdWF0aW9uLWhxYjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0t
+ZXNzYWl2YWx1YXRpb24tZmtiPC9tYXJrOmxhYmVsPjxtYXJrOmdvb2RzQW5kU2VydmljZXM+Z3Vp
+dGFyPC9tYXJrOmdvb2RzQW5kU2VydmljZXM+PG1hcms6cmVmTnVtPjEyMzQ8L21hcms6cmVmTnVt
+PjxtYXJrOnByb0RhdGU+MjAxMy0wMS0wMVQwMDowMDowMC4wMDBaPC9tYXJrOnByb0RhdGU+PG1h
+cms6Y2M+RlI8L21hcms6Y2M+PG1hcms6Y291cnROYW1lPmd1aXRhcmU8L21hcms6Y291cnROYW1l
+PjwvbWFyazpjb3VydD48L21hcms6bWFyaz48ZHM6U2lnbmF0dXJlIHhtbG5zOmRzPSJodHRwOi8v
+d3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjIiBJZD0iXzE0MTNlNzAzLTQzMGMtNGUyZi1iNjgy
+LTBmYjE2NmM4NmIwZSI+PGRzOlNpZ25lZEluZm8+PGRzOkNhbm9uaWNhbGl6YXRpb25NZXRob2Qg
+QWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48ZHM6
+U2lnbmF0dXJlTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxk
+c2lnLW1vcmUjcnNhLXNoYTI1NiIvPjxkczpSZWZlcmVuY2UgVVJJPSIjXzA4MWE3NzhiLWUwNDEt
+NDgwNy04OGZlLWRhNjY3MjgyM2JmZCI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdv
+cml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1sZHNpZyNlbnZlbG9wZWQtc2lnbmF0
+dXJlIi8+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAv
+eG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRo
+bT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxlbmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZh
+bHVlPlVkU0lXaDM0UXgvUmFEZGdoc2tUYjduUEZDSW9xb3JSeHZNL0thaFlYc289PC9kczpEaWdl
+c3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48ZHM6UmVmZXJlbmNlIFVSST0iI18xNmY0N2ViMy0zNWY1
+LTQxNGYtYmZjNy1iMDQ3Mzk1N2M0OGQiPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxn
+b3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRy
+YW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIw
+MDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1ZT5rVThUWnZ2TjV2OE1ZTnh2MFlu
+cE9BSTJBSUNnZUk1NmlQaXBYeFhnVktzPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+
+PC9kczpTaWduZWRJbmZvPjxkczpTaWduYXR1cmVWYWx1ZSBJZD0iXzg2OTA2YjkwLTk4NzMtNDI5
+NS1iZTI2LTEyN2Y2NjAxYTBhMCI+UWJyaTBVTGtJdlowdnNSQXJDbTU4M1daMElqUmxQTDRWYnIr
+aFRaa2ZjRlVyVEV1NTk5SHR3N3hZQUFsdHV0SDBIeU9ITTcxakx0dyYjMTM7Ck1EVzBXdHZvcGtW
+TUY4WkdDNVZVREtwMkdObmRuV2RvY2VrOUd5SVIzMDZLeEtONTZEaVhxYmVmYkRmdUpWYjQwNHJI
+RUhIK1FyV2cmIzEzOwpUNis5TVI1UjBXelRNR25hZmJndmJnZ25XYzRka2Ixdk5VQ29UQUZwZnhR
+ditHUFFySDlGVC9idHJ5WE52K0xDOGxFQWZYUUdkWHZwJiMxMzsKaG15VWRXRmQvK0VKZm50ODNB
+M0pram1WT0NHT0pCcXM1MkdJaWtvamJMZUJKN2pJeGZ0eEtUQ28rWjlwYkYxc0ZoYTJCeCs2VVFM
+UiYjMTM7CmdIcHZCOXZwMjhPMnBhMXhJTm5POGhrNWUrekhnRkV5cVcweGcwN1Noam1OYlhCTHFU
+WHk5Q2tCTEd3cVNBZkRLSHZRaGpMUEFxWHImIzEzOwo1SEg3MlcwcG1vMEZJQmNJUWJFclFvTCtt
+YTVvdkp3MDJENnQ4VFBRYWx5NHVreDdTd3MyY3NRQzI2aVRHQ1k2dWdwRlF4RkxkZ3psJiMxMzsK
+NlF4QmptYVgzVkZJWGl2UXJkZzFyeXhwSmEyYmZGbHI1ZWZhcWN1MHpvM09BYitqOGxBcSsrTlNz
+ajRMWFMwNU0xRjdDaWNDbGhFTiYjMTM7CmNGV3NvNExiOHNuY3JPLzJlN29laDMvMlkxb1h4ckJ5
+Z2JUbVFxbXhNM3BBa0dpaHA1T0RyR1BwMk1pWmk2VmRHaFc2WlZHZXdWcU0mIzEzOwo0b2xBSEpB
+bThNa3JnRm9GdHZNVTNoa0NYTEt5QUcvZHZkME9WQU5SUEFmWDlseGduLzc1ZklIblBEV0VmZStF
+bkgvdGZOWWpzU0U9PC9kczpTaWduYXR1cmVWYWx1ZT48ZHM6S2V5SW5mbyBJZD0iXzE2ZjQ3ZWIz
+LTM1ZjUtNDE0Zi1iZmM3LWIwNDczOTU3YzQ4ZCI+PGRzOlg1MDlEYXRhPjxkczpYNTA5Q2VydGlm
+aWNhdGU+TUlJSFh6Q0NCVWVnQXdJQkFnSVVYcUkvdmQxOENhZzk4b05wZHpWN0JpeS82RUF3RFFZ
+SktvWklodmNOQVFFTkJRQXdmREVMTUFrRyYjMTM7CkExVUVCaE1DVlZNeFBEQTZCZ05WQkFvTU0w
+bHVkR1Z5Ym1WMElFTnZjbkJ2Y21GMGFXOXVJR1p2Y2lCQmMzTnBaMjVsWkNCT1lXMWwmIzEzOwpj
+eUJoYm1RZ1RuVnRZbVZ5Y3pFdk1DMEdBMVVFQXd3bVNVTkJUazRnVkhKaFpHVnRZWEpySUVOc1pX
+RnlhVzVuYUc5MWMyVWdVR2xzJiMxMzsKYjNRZ1EwRXdIaGNOTWpJeE1URTJNVE15T0RVNVdoY05N
+amN4TVRFMU1UTXlPRFU1V2pDQjBERUxNQWtHQTFVRUJoTUNRa1V4RVRBUCYjMTM7CkJnTlZCQWdU
+Q0VKeWRYTnpaV3h6TVJJd0VBWURWUVFIRXdsV2FXeDJiMjl5WkdVeE16QXhCZ05WQkFvVEtrUmxi
+RzlwZEhSbElFTnYmIzEzOwpibk4xYkhScGJtY2dZVzVrSUVGa2RtbHpiM0o1SUVOV1FrRXZVME5T
+VERFK01Ed0dBMVVFQXhNMVNVTkJUazRnVkUxRFNDQkJkWFJvJiMxMzsKYjNKcGVtVmtJRlJ5WVdS
+bGJXRnlheUJRYVd4dmRDQldZV3hwWkdGMGIzSWdWbUZzYVdReEpUQWpCZ2txaGtpRzl3MEJDUUVX
+Rm1KbCYjMTM7CmRHMWphSE50WkVCa1pXeHZhWFIwWlM1amIyMHdnZ0lpTUEwR0NTcUdTSWIzRFFF
+QkFRVUFBNElDRHdBd2dnSUtBb0lDQVFDNkZKd3omIzEzOwpLcVFWWDZmRzMvRUxSU0dXVjlHckth
+Rk1LbWhXSXhlcHdSWk42TXhNcWtkNURuWWZpVCtXcDk4akVrcWdUeDJVTWI5cXVnY0dOVjZnJiMx
+MzsKMzUvQ3JRYi9GL216M0M0c2ZMTnVEcFNxSzlRRjgrcGFUSDZoUW1yT3BxVitVVHZkajlTTWdL
+R3lGaXpTODhDRFdNeDR3M2k0RkFLZSYjMTM7CjZOUnNKUkdUQXRLRHVNSGNBNHNqMDhHamUzbFBX
+Y2dGdmNRTkRWZUVCVHVPSEJHK1JoajdWMUppTkdQLzRlcFRYVEZYZ1BGRGdlejMmIzEzOwpZQWZ4
+cXBidU80VFg2YmJZZGsybnZNTEZ2TEVOa0NGWXVsbllQemduRUJHU01LSWFBSWxiK3NjSEN2V2dX
+ajJUTGd3aDJHSk5jelZNJiMxMzsKMUxQTXFHUytVa2k5TWg3OTgyMi94b2FyNDk4eER4Mll4Lzhz
+d2dFTkxTZ0NzUUFXOG5NZ3dXbjZBYllsMlJBQlh1cmF5RnNuNFAxUiYjMTM7CnVRTm1VcC9xclJL
+UnZTSnIxT0xrSFpmRlRjU1lRYVZpdU1ZUFh6R3o4dG1NTGxtSS9CNkFDSDRBd1JNZG5ZdkZPM0tJ
+MVJCblBLSWQmIzEzOwp3d2ZVcFo1SVRJcGJBN0NHZ1R4MXF4dE0xd0lVcjdwSGVLUDZqVmUza2RE
+TGcrL0JaMnhNRXRCazVhOFk3QjR2M3h3SFhHVHZWOG1OJiMxMzsKMEFnL1N5VC9RVXlFUmhYVXlB
+TjIrRXdaK1NRQ1V5TmZ6aW9XUTg3OGVHeWtVKzQ2K0JiZ0kzSUlyMzZYS1B3bXp0MFNaK0tJM3Ru
+RiYjMTM7ClRsbjltWDBLQzBpZG9qNXlrelBvQy9NSWVkMHNwNFRpZ3hFYldOeDdFRjgwUHZSL0RE
+RXdWUEVFa2tqeTYzWEZ1bHhpQ1FJREFRQUImIzEzOwpvNElCZ2pDQ0FYNHdEQVlEVlIwVEFRSC9C
+QUl3QURBT0JnTlZIUThCQWY4RUJBTUNCNEF3SFFZRFZSME9CQllFRkhuOXMwREVhMmt2JiMxMzsK
+Z0UvZUlPVHNxb1c4NU1YRk1JRzZCZ05WSFNNRWdiSXdnYStBRkVkN1Q2NTZVWkcxMGIrZE51bUdm
+ellXQktsRm9ZR0FwSDR3ZkRFTCYjMTM7Ck1Ba0dBMVVFQmhNQ1ZWTXhQREE2QmdOVkJBb01NMGx1
+ZEdWeWJtVjBJRU52Y25CdmNtRjBhVzl1SUdadmNpQkJjM05wWjI1bFpDQk8mIzEzOwpZVzFsY3lC
+aGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF3d21TVU5CVGs0Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5
+YVc1bmFHOTFjMlVnJiMxMzsKVUdsc2IzUWdRMEdDRkhwcWJURmVKY1B0VUM5WHV1UEtQc0x3RFIr
+TU1EUUdBMVVkSHdRdE1Dc3dLYUFub0NXR0kyaDBkSEE2THk5aiYjMTM7CmNtd3VhV05oYm00dWIz
+Sm5MM1J0WTJoZmNHbHNiM1F1WTNKc01Fd0dBMVVkSUFSRk1FTXdFQVlPS3dZQkJBR0N5UnNCQllN
+N0RBb3cmIzEzOwpMd1lJS3dZQkJRVUhBZ0V3SXpBaEJnZ3JCZ0VGQlFjQ0FSWVZhSFIwY0hNNkx5
+OWpjSE11YVdOaGJtNHViM0puTUEwR0NTcUdTSWIzJiMxMzsKRFFFQkRRVUFBNElDQVFCZFNhdDU2
+dWVqTG5BakZJRjk1ZGpZV0k2cy8vTjZZWHhzcnJNa0dCUDhFZXpQeWhMaDZhd1A0ejdROVFBSSYj
+MTM7ClFaa1lveHJsLzF5MCtieVYycW5UVVVDTFJwSy9CRHAvaGNmd1BmS0NBLzJSUUNISnJiNit6
+MGVuRFBGUkswTkttd09jZGxHdFVrMG0mIzEzOwpQZ1dHU0t0dXdWc1BBaFRESnVob3NaT2hrTmYr
+blNPT0hyUU9uMUUycnpPcmQva1FscWlDd1JIOTc5Nk5wVEErSFNNZk9vYkpFRVBxJiMxMzsKdHBG
+N1A1cWJ3dGw5NVVhNU9wNEFoYTcwSEhmVUZTNEJPUUtMQlZmTVpkT1IraVBvaDVPd0FLK2h0WWtG
+Q0c5UDJXSHU3d2Y4RUMrVyYjMTM7CjdrOTZndlRkOHhFN291b2FiVDJ4NllmWXFFbFBIaVUvSU05
+Z1Z6V1dML3N2WUR5U1Z1b0Z3QmpETk4xY2RxMHFPWVIxeXVTMWMvOUQmIzEzOwpGUjdlbzdHRkVD
+eStUQmQ3SWlLUmZCVmVZR09PUE1ub0ZmeFJMV3Jwc1dObndEN2xrUGtMQ2dGQ2srOHlFY09SZzYy
+NW1vNjV6NHk2JiMxMzsKSjRLOGZvZGE3cXdtWE5QM1JTMThvbjZCSHQ4bFErYlhnT0hteElIazBh
+TzBxTkRxZ3ZMcjJGbHlMR0pHaUVNUnFETU1SNi9hMDZidCYjMTM7CmtuVU1IbDdDcU1maklralA0
+Vk5OeUdQZEpnd1ZrMmtlYjl1TkZ2SkN4VCtNMmZHWFExTmJKTmZ0djVNZ1NzcDlOMXkreDZnQTNF
+aHcmIzEzOwp5SGxtSkI0WU10bzh0VFYxaTg0eFBYeGkyQ0FlRGFHRHV3b3N0OFlVQ1NqcTdSQ0s4
+dEdjYUFZcmtYUVkyeVFmWDNjd0RzRXhScVZXJiMxMzsKeXJqeVJ0K042bUs5OVE9PTwvZHM6WDUw
+OUNlcnRpZmljYXRlPjwvZHM6WDUwOURhdGE+PC9kczpLZXlJbmZvPjwvZHM6U2lnbmF0dXJlPjwv
+c21kOnNpZ25lZE1hcms+Cg==
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Agent-French/Trademark-Agent-French-Active.smd b/core/src/test/resources/google/registry/tmch/idn/Agent-French/Trademark-Agent-French-Active.smd
new file mode 100644
index 000000000..cadf7aecb
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Agent-French/Trademark-Agent-French-Active.smd
@@ -0,0 +1,126 @@
+Marks: Essai & évaluation
+smdID: 000000831669082294457-65535
+U-labels: xn--essai---valuation-itb, xn--essai--valuation-hqb, xn--essai-and-valuation-kzb, xn--essai-andvaluation-jwb, xn--essai-valuation-gnb, xn--essaiand-valuation-jwb, xn--essaiandvaluation-itb, xn--essaiet-valuation-itb, xn--essaietvaluation-hqb, xn--essaivaluation-fkb
+notBefore: 2022-11-22T01:58:14.457Z
+notAfter: 2027-10-18T14:46:53.013Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il9jZDlj
+MGM3Yy1kMmUzLTRkMDAtOGI0Zi1jYmI3N2Q4MjUxNjMiPjxzbWQ6aWQ+MDAwMDAwODMxNjY5MDgy
+Mjk0NDU3LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMTo1ODoxNC40NTdaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0xOFQxNDo0Njo1My4wMTNaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
+cmFkZW1hcms+PG1hcms6aWQ+MDAwMTM5MTUwMzA2NzM4MjE1MDMwNjczODItMTwvbWFyazppZD48
+bWFyazptYXJrTmFtZT5Fc3NhaSAmYW1wOyDDqXZhbHVhdGlvbjwvbWFyazptYXJrTmFtZT48bWFy
+azpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpvcmc+QWdlbmNlIGVuIEZyYW5jZTwv
+bWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpzdHJlZXQ+MTAgQXZlbnVlIFJvdXNzZWF1eDwvbWFy
+azpzdHJlZXQ+PG1hcms6Y2l0eT5WZXJzYWlsbGVzPC9tYXJrOmNpdHk+PG1hcms6cGM+MzMwODE8
+L21hcms6cGM+PG1hcms6Y2M+RlI8L21hcms6Y2M+PC9tYXJrOmFkZHI+PC9tYXJrOmhvbGRlcj48
+bWFyazpjb250YWN0IHR5cGU9ImFnZW50Ij48bWFyazpuYW1lPkZyYW5jIExlYnJ1bjwvbWFyazpu
+YW1lPjxtYXJrOm9yZz5BZ2VuY2UgZW4gRnJhbmNlPC9tYXJrOm9yZz48bWFyazphZGRyPjxtYXJr
+OnN0cmVldD5BdmVudWUgUm91c3NlYXV4IDEwIDwvbWFyazpzdHJlZXQ+PG1hcms6Y2l0eT5WZXJz
+YWlsbGVzPC9tYXJrOmNpdHk+PG1hcms6cGM+MzMwODE8L21hcms6cGM+PG1hcms6Y2M+RlI8L21h
+cms6Y2M+PC9tYXJrOmFkZHI+PG1hcms6dm9pY2U+KzMzLjEyNTc4MTI1MDwvbWFyazp2b2ljZT48
+bWFyazpmYXg+KzMzLjEyNTc4MTI1MTwvbWFyazpmYXg+PG1hcms6ZW1haWw+aW5mb0BhZ2VuY2Ut
+ZW4tZnJhbmNlLmZyPC9tYXJrOmVtYWlsPjwvbWFyazpjb250YWN0PjxtYXJrOmp1cmlzZGljdGlv
+bj5VUzwvbWFyazpqdXJpc2RpY3Rpb24+PG1hcms6Y2xhc3M+MTU8L21hcms6Y2xhc3M+PG1hcms6
+bGFiZWw+eG4tLWVzc2FpLS0tdmFsdWF0aW9uLWl0YjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54
+bi0tZXNzYWktLXZhbHVhdGlvbi1ocWI8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLWVzc2Fp
+LWFuZC12YWx1YXRpb24ta3piPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1lc3NhaS1hbmR2
+YWx1YXRpb24tandiPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1lc3NhaS12YWx1YXRpb24t
+Z25iPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1lc3NhaWFuZC12YWx1YXRpb24tandiPC9t
+YXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1lc3NhaWFuZHZhbHVhdGlvbi1pdGI8L21hcms6bGFi
+ZWw+PG1hcms6bGFiZWw+eG4tLWVzc2FpZXQtdmFsdWF0aW9uLWl0YjwvbWFyazpsYWJlbD48bWFy
+azpsYWJlbD54bi0tZXNzYWlldHZhbHVhdGlvbi1ocWI8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+
+eG4tLWVzc2FpdmFsdWF0aW9uLWZrYjwvbWFyazpsYWJlbD48bWFyazpnb29kc0FuZFNlcnZpY2Vz
+Pmd1aXRhcjwvbWFyazpnb29kc0FuZFNlcnZpY2VzPjxtYXJrOnJlZ051bT4xMjM0PC9tYXJrOnJl
+Z051bT48bWFyazpyZWdEYXRlPjIwMTMtMDEtMDFUMDA6MDA6MDAuMDAwWjwvbWFyazpyZWdEYXRl
+PjwvbWFyazp0cmFkZW1hcms+PC9tYXJrOm1hcms+PGRzOlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0
+cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyIgSWQ9Il8zZjRmMjFkMC1hNzJhLTQxM2Yt
+OWJlYi1hMTQ5ZWYwOTZiNzciPjxkczpTaWduZWRJbmZvPjxkczpDYW5vbmljYWxpemF0aW9uTWV0
+aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+
+PGRzOlNpZ25hdHVyZU1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQv
+eG1sZHNpZy1tb3JlI3JzYS1zaGEyNTYiLz48ZHM6UmVmZXJlbmNlIFVSST0iI19jZDljMGM3Yy1k
+MmUzLTRkMDAtOGI0Zi1jYmI3N2Q4MjUxNjMiPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0g
+QWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjZW52ZWxvcGVkLXNp
+Z25hdHVyZSIvPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAx
+LzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdv
+cml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdl
+c3RWYWx1ZT5vYWZoUW5vWTU1MjR0emVyWWZZN3FZUnJHcHppZWE2UzFuWklvQkhFZDJvPTwvZHM6
+RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PGRzOlJlZmVyZW5jZSBVUkk9IiNfM2YwZGQzMzgt
+MWVhYi00MzY5LWI1MDYtYmRmNmNmMDRiZmFjIj48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3Jt
+IEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9k
+czpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9y
+Zy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+RVlNRFY4cjRWdUFRU3g5
+L0l3K3c2T3BuQzhvQ2pxamtVQ2Y4YmdZeXhKaz08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJl
+bmNlPjwvZHM6U2lnbmVkSW5mbz48ZHM6U2lnbmF0dXJlVmFsdWUgSWQ9Il9jOWE4NTA2Ni04OWYw
+LTQ5ZGUtYTQxNC1hZWNiODRjNjk1NmIiPnNWcTA0a3ZhRkh2b2t5aUZXWUxlMHRhS3VnU0h2ZGFK
+ZjVJb01Saks3S0hzQUFTYlBIVlNuM0FDMHZvbzc0WTFLZ0JRVFdMR0lBMEEmIzEzOwpSMnlva1lJ
+NFBTT2duWnFYWERzYmh2ZFgvcmZ3Z0p3Y0U0bzhvQ3NicFJjY2ZsQ3dQT1A4WUZseTIya3hzdU9h
+UGxSZGRUaDU3VUZyJiMxMzsKTzdjNnJ2YnVFNzZnb1k2YnZ1eldWU0ZudHE0d3M3ZTkxUmt1TkZa
+MmxJQUVTaXlzLzA5eXozUGNSZVN4ek94bWxHUzZEUldqZ1FXMiYjMTM7Ck1FUlY3UmowNnpLMDBR
+ZVQwRWZya2hwQWR4SVNZVUsxNHBDbkdRWHFLVE5GeFQvVEEwZGllVzg5ejY0MHA3WEpZeDA3eXR6
+a1J4TWImIzEzOwpjZzROa2hZNlhPY2lXc3VMQkxkMWJ0Sk8rUEszRU9PT0FpUXZEaGtLTnJ6Ymp2
+c0dLM0lHTXE3d2ZyeTYwVGNwMk9OdWhBbHllbzNSJiMxMzsKMmViV3hURXdnQ3pweEtlbzM2MFlr
+ZFU5dXJ2a2F4cmg4eDRaRm1rNlZBaTdTUk9mek1iS1J0dks4WGhuZ3RCS3ZEb1NnOUpuOFRMTCYj
+MTM7CmdyNDN0QmpEYVl0ZCtEMjNtbU5JY0xnMEJJM2JUdVI4elRuMWlPaEc1U3RRMmFVejJmWm5y
+enhtSzlEUjJjRXlyQVJhQkxLc0ZsQmgmIzEzOwpGc0RHQlhHVCthaWtyVlJuakFWek5iYjBtaGt3
+UTNZTXVXV2pIdHAwM1J3SExaM3dScTZTS2VjTmZMYWhqVjEvalJqdERKVEFEaWhCJiMxMzsKNllY
+eW9wNmMybUkxZEJlb0ZONEpGd3d2ZkRJT1NFREtDTlFITllocDUxZ2R4cGtwRTFzU0lzcHczRXFx
+aVFSRUFzL2l4cFRVOEtRPTwvZHM6U2lnbmF0dXJlVmFsdWU+PGRzOktleUluZm8gSWQ9Il8zZjBk
+ZDMzOC0xZWFiLTQzNjktYjUwNi1iZGY2Y2YwNGJmYWMiPjxkczpYNTA5RGF0YT48ZHM6WDUwOUNl
+cnRpZmljYXRlPk1JSUhYekNDQlVlZ0F3SUJBZ0lVWHFJL3ZkMThDYWc5OG9OcGR6VjdCaXkvNkVB
+d0RRWUpLb1pJaHZjTkFRRU5CUUF3ZkRFTE1Ba0cmIzEzOwpBMVVFQmhNQ1ZWTXhQREE2QmdOVkJB
+b01NMGx1ZEdWeWJtVjBJRU52Y25CdmNtRjBhVzl1SUdadmNpQkJjM05wWjI1bFpDQk9ZVzFsJiMx
+MzsKY3lCaGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF3d21TVU5CVGs0Z1ZISmhaR1Z0WVhKcklF
+TnNaV0Z5YVc1bmFHOTFjMlVnVUdscyYjMTM7CmIzUWdRMEV3SGhjTk1qSXhNVEUyTVRNeU9EVTVX
+aGNOTWpjeE1URTFNVE15T0RVNVdqQ0IwREVMTUFrR0ExVUVCaE1DUWtVeEVUQVAmIzEzOwpCZ05W
+QkFnVENFSnlkWE56Wld4ek1SSXdFQVlEVlFRSEV3bFdhV3gyYjI5eVpHVXhNekF4QmdOVkJBb1RL
+a1JsYkc5cGRIUmxJRU52JiMxMzsKYm5OMWJIUnBibWNnWVc1a0lFRmtkbWx6YjNKNUlFTldRa0V2
+VTBOU1RERStNRHdHQTFVRUF4TTFTVU5CVGs0Z1ZFMURTQ0JCZFhSbyYjMTM7CmIzSnBlbVZrSUZS
+eVlXUmxiV0Z5YXlCUWFXeHZkQ0JXWVd4cFpHRjBiM0lnVm1Gc2FXUXhKVEFqQmdrcWhraUc5dzBC
+Q1FFV0ZtSmwmIzEzOwpkRzFqYUhOdFpFQmtaV3h2YVhSMFpTNWpiMjB3Z2dJaU1BMEdDU3FHU0li
+M0RRRUJBUVVBQTRJQ0R3QXdnZ0lLQW9JQ0FRQzZGSnd6JiMxMzsKS3FRVlg2ZkczL0VMUlNHV1Y5
+R3JLYUZNS21oV0l4ZXB3UlpONk14TXFrZDVEbllmaVQrV3A5OGpFa3FnVHgyVU1iOXF1Z2NHTlY2
+ZyYjMTM7CjM1L0NyUWIvRi9tejNDNHNmTE51RHBTcUs5UUY4K3BhVEg2aFFtck9wcVYrVVR2ZGo5
+U01nS0d5Rml6Uzg4Q0RXTXg0dzNpNEZBS2UmIzEzOwo2TlJzSlJHVEF0S0R1TUhjQTRzajA4R2pl
+M2xQV2NnRnZjUU5EVmVFQlR1T0hCRytSaGo3VjFKaU5HUC80ZXBUWFRGWGdQRkRnZXozJiMxMzsK
+WUFmeHFwYnVPNFRYNmJiWWRrMm52TUxGdkxFTmtDRll1bG5ZUHpnbkVCR1NNS0lhQUlsYitzY0hD
+dldnV2oyVExnd2gyR0pOY3pWTSYjMTM7CjFMUE1xR1MrVWtpOU1oNzk4MjIveG9hcjQ5OHhEeDJZ
+eC84c3dnRU5MU2dDc1FBVzhuTWd3V242QWJZbDJSQUJYdXJheUZzbjRQMVImIzEzOwp1UU5tVXAv
+cXJSS1J2U0pyMU9Ma0haZkZUY1NZUWFWaXVNWVBYekd6OHRtTUxsbUkvQjZBQ0g0QXdSTWRuWXZG
+TzNLSTFSQm5QS0lkJiMxMzsKd3dmVXBaNUlUSXBiQTdDR2dUeDFxeHRNMXdJVXI3cEhlS1A2alZl
+M2tkRExnKy9CWjJ4TUV0Qms1YThZN0I0djN4d0hYR1R2VjhtTiYjMTM7CjBBZy9TeVQvUVV5RVJo
+WFV5QU4yK0V3WitTUUNVeU5memlvV1E4NzhlR3lrVSs0NitCYmdJM0lJcjM2WEtQd216dDBTWitL
+STN0bkYmIzEzOwpUbG45bVgwS0MwaWRvajV5a3pQb0MvTUllZDBzcDRUaWd4RWJXTng3RUY4MFB2
+Ui9EREV3VlBFRWtrank2M1hGdWx4aUNRSURBUUFCJiMxMzsKbzRJQmdqQ0NBWDR3REFZRFZSMFRB
+UUgvQkFJd0FEQU9CZ05WSFE4QkFmOEVCQU1DQjRBd0hRWURWUjBPQkJZRUZIbjlzMERFYTJrdiYj
+MTM7CmdFL2VJT1RzcW9XODVNWEZNSUc2QmdOVkhTTUVnYkl3Z2ErQUZFZDdUNjU2VVpHMTBiK2RO
+dW1HZnpZV0JLbEZvWUdBcEg0d2ZERUwmIzEzOwpNQWtHQTFVRUJoTUNWVk14UERBNkJnTlZCQW9N
+TTBsdWRHVnlibVYwSUVOdmNuQnZjbUYwYVc5dUlHWnZjaUJCYzNOcFoyNWxaQ0JPJiMxMzsKWVcx
+bGN5QmhibVFnVG5WdFltVnljekV2TUMwR0ExVUVBd3dtU1VOQlRrNGdWSEpoWkdWdFlYSnJJRU5z
+WldGeWFXNW5hRzkxYzJVZyYjMTM7ClVHbHNiM1FnUTBHQ0ZIcHFiVEZlSmNQdFVDOVh1dVBLUHNM
+d0RSK01NRFFHQTFVZEh3UXRNQ3N3S2FBbm9DV0dJMmgwZEhBNkx5OWomIzEzOwpjbXd1YVdOaGJt
+NHViM0puTDNSdFkyaGZjR2xzYjNRdVkzSnNNRXdHQTFVZElBUkZNRU13RUFZT0t3WUJCQUdDeVJz
+QkJZTTdEQW93JiMxMzsKTHdZSUt3WUJCUVVIQWdFd0l6QWhCZ2dyQmdFRkJRY0NBUllWYUhSMGNI
+TTZMeTlqY0hNdWFXTmhibTR1YjNKbk1BMEdDU3FHU0liMyYjMTM7CkRRRUJEUVVBQTRJQ0FRQmRT
+YXQ1NnVlakxuQWpGSUY5NWRqWVdJNnMvL042WVh4c3JyTWtHQlA4RWV6UHloTGg2YXdQNHo3UTlR
+QUkmIzEzOwpRWmtZb3hybC8xeTArYnlWMnFuVFVVQ0xScEsvQkRwL2hjZndQZktDQS8yUlFDSEpy
+YjYrejBlbkRQRlJLME5LbXdPY2RsR3RVazBtJiMxMzsKUGdXR1NLdHV3VnNQQWhUREp1aG9zWk9o
+a05mK25TT09IclFPbjFFMnJ6T3JkL2tRbHFpQ3dSSDk3OTZOcFRBK0hTTWZPb2JKRUVQcSYjMTM7
+CnRwRjdQNXFid3RsOTVVYTVPcDRBaGE3MEhIZlVGUzRCT1FLTEJWZk1aZE9SK2lQb2g1T3dBSyto
+dFlrRkNHOVAyV0h1N3dmOEVDK1cmIzEzOwo3azk2Z3ZUZDh4RTdvdW9hYlQyeDZZZllxRWxQSGlV
+L0lNOWdWeldXTC9zdllEeVNWdW9Gd0JqRE5OMWNkcTBxT1lSMXl1UzFjLzlEJiMxMzsKRlI3ZW83
+R0ZFQ3krVEJkN0lpS1JmQlZlWUdPT1BNbm9GZnhSTFdycHNXTm53RDdsa1BrTENnRkNrKzh5RWNP
+Umc2MjVtbzY1ejR5NiYjMTM7Cko0Szhmb2RhN3F3bVhOUDNSUzE4b242Qkh0OGxRK2JYZ09IbXhJ
+SGswYU8wcU5EcWd2THIyRmx5TEdKR2lFTVJxRE1NUjYvYTA2YnQmIzEzOwprblVNSGw3Q3FNZmpJ
+a2pQNFZOTnlHUGRKZ3dWazJrZWI5dU5GdkpDeFQrTTJmR1hRMU5iSk5mdHY1TWdTc3A5TjF5K3g2
+Z0EzRWh3JiMxMzsKeUhsbUpCNFlNdG84dFRWMWk4NHhQWHhpMkNBZURhR0R1d29zdDhZVUNTanE3
+UkNLOHRHY2FBWXJrWFFZMnlRZlgzY3dEc0V4UnFWVyYjMTM7CnlyanlSdCtONm1LOTlRPT08L2Rz
+Olg1MDlDZXJ0aWZpY2F0ZT48L2RzOlg1MDlEYXRhPjwvZHM6S2V5SW5mbz48L2RzOlNpZ25hdHVy
+ZT48L3NtZDpzaWduZWRNYXJrPgo=
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Agent-French/Trademark-Agent-French-Revoked.smd b/core/src/test/resources/google/registry/tmch/idn/Agent-French/Trademark-Agent-French-Revoked.smd
new file mode 100644
index 000000000..1ce17b602
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Agent-French/Trademark-Agent-French-Revoked.smd
@@ -0,0 +1,126 @@
+Marks: Essai & évaluation
+smdID: 000000831669082075540-65535
+U-labels: xn--essai---valuation-itb, xn--essai--valuation-hqb, xn--essai-and-valuation-kzb, xn--essai-andvaluation-jwb, xn--essai-valuation-gnb, xn--essaiand-valuation-jwb, xn--essaiandvaluation-itb, xn--essaiet-valuation-itb, xn--essaietvaluation-hqb, xn--essaivaluation-fkb
+notBefore: 2022-11-22T01:54:35.540Z
+notAfter: 2027-10-18T14:46:53.013Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il85NmVk
+ZDM5OS00NmE0LTRmY2ItOWFkZi1mODE0NDBlMDMxOWMiPjxzbWQ6aWQ+MDAwMDAwODMxNjY5MDgy
+MDc1NTQwLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMTo1NDozNS41NDBaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0xOFQxNDo0Njo1My4wMTNaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
+cmFkZW1hcms+PG1hcms6aWQ+MDAwMTM5MTUwMzA2NzM4MjE1MDMwNjczODItMTwvbWFyazppZD48
+bWFyazptYXJrTmFtZT5Fc3NhaSAmYW1wOyDDqXZhbHVhdGlvbjwvbWFyazptYXJrTmFtZT48bWFy
+azpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpvcmc+QWdlbmNlIGVuIEZyYW5jZTwv
+bWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpzdHJlZXQ+MTAgQXZlbnVlIFJvdXNzZWF1eDwvbWFy
+azpzdHJlZXQ+PG1hcms6Y2l0eT5WZXJzYWlsbGVzPC9tYXJrOmNpdHk+PG1hcms6cGM+MzMwODE8
+L21hcms6cGM+PG1hcms6Y2M+RlI8L21hcms6Y2M+PC9tYXJrOmFkZHI+PC9tYXJrOmhvbGRlcj48
+bWFyazpjb250YWN0IHR5cGU9ImFnZW50Ij48bWFyazpuYW1lPkZyYW5jIExlYnJ1bjwvbWFyazpu
+YW1lPjxtYXJrOm9yZz5BZ2VuY2UgZW4gRnJhbmNlPC9tYXJrOm9yZz48bWFyazphZGRyPjxtYXJr
+OnN0cmVldD5BdmVudWUgUm91c3NlYXV4IDEwIDwvbWFyazpzdHJlZXQ+PG1hcms6Y2l0eT5WZXJz
+YWlsbGVzPC9tYXJrOmNpdHk+PG1hcms6cGM+MzMwODE8L21hcms6cGM+PG1hcms6Y2M+RlI8L21h
+cms6Y2M+PC9tYXJrOmFkZHI+PG1hcms6dm9pY2U+KzMzLjEyNTc4MTI1MDwvbWFyazp2b2ljZT48
+bWFyazpmYXg+KzMzLjEyNTc4MTI1MTwvbWFyazpmYXg+PG1hcms6ZW1haWw+aW5mb0BhZ2VuY2Ut
+ZW4tZnJhbmNlLmZyPC9tYXJrOmVtYWlsPjwvbWFyazpjb250YWN0PjxtYXJrOmp1cmlzZGljdGlv
+bj5VUzwvbWFyazpqdXJpc2RpY3Rpb24+PG1hcms6Y2xhc3M+MTU8L21hcms6Y2xhc3M+PG1hcms6
+bGFiZWw+eG4tLWVzc2FpLS0tdmFsdWF0aW9uLWl0YjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54
+bi0tZXNzYWktLXZhbHVhdGlvbi1ocWI8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLWVzc2Fp
+LWFuZC12YWx1YXRpb24ta3piPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1lc3NhaS1hbmR2
+YWx1YXRpb24tandiPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1lc3NhaS12YWx1YXRpb24t
+Z25iPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1lc3NhaWFuZC12YWx1YXRpb24tandiPC9t
+YXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1lc3NhaWFuZHZhbHVhdGlvbi1pdGI8L21hcms6bGFi
+ZWw+PG1hcms6bGFiZWw+eG4tLWVzc2FpZXQtdmFsdWF0aW9uLWl0YjwvbWFyazpsYWJlbD48bWFy
+azpsYWJlbD54bi0tZXNzYWlldHZhbHVhdGlvbi1ocWI8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+
+eG4tLWVzc2FpdmFsdWF0aW9uLWZrYjwvbWFyazpsYWJlbD48bWFyazpnb29kc0FuZFNlcnZpY2Vz
+Pmd1aXRhcjwvbWFyazpnb29kc0FuZFNlcnZpY2VzPjxtYXJrOnJlZ051bT4xMjM0PC9tYXJrOnJl
+Z051bT48bWFyazpyZWdEYXRlPjIwMTMtMDEtMDFUMDA6MDA6MDAuMDAwWjwvbWFyazpyZWdEYXRl
+PjwvbWFyazp0cmFkZW1hcms+PC9tYXJrOm1hcms+PGRzOlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0
+cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyIgSWQ9Il9hZGFiODg3Ni1iNGY0LTQ3NDIt
+OTIwMi1hNzBiOTMzNTk1MWQiPjxkczpTaWduZWRJbmZvPjxkczpDYW5vbmljYWxpemF0aW9uTWV0
+aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+
+PGRzOlNpZ25hdHVyZU1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQv
+eG1sZHNpZy1tb3JlI3JzYS1zaGEyNTYiLz48ZHM6UmVmZXJlbmNlIFVSST0iI185NmVkZDM5OS00
+NmE0LTRmY2ItOWFkZi1mODE0NDBlMDMxOWMiPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0g
+QWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjZW52ZWxvcGVkLXNp
+Z25hdHVyZSIvPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAx
+LzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdv
+cml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdl
+c3RWYWx1ZT45V3FxM0hFd25lU2JZMjRKSEhya1gvYVJaejlIYVZqbVBkZVRndFJMSVZFPTwvZHM6
+RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PGRzOlJlZmVyZW5jZSBVUkk9IiNfZmY3YmMwNGMt
+YjIyMC00ZjMxLTg3OTQtMTM5Y2JkYzVjMzEwIj48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3Jt
+IEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9k
+czpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9y
+Zy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+RFVXUzh3ZHdsK2JJMldH
+UytwWFZTcEJqZW14cm5TVnYyQ3FWcTNNRHFIcz08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJl
+bmNlPjwvZHM6U2lnbmVkSW5mbz48ZHM6U2lnbmF0dXJlVmFsdWUgSWQ9Il8xYTNiYmQ3Mi04MTM4
+LTQxZmQtYjg2OS1jYmNiNjAwZDllNzQiPllHNjg5SjBPQWVjOXFxbjdxVlZ5dXBmZ0N3cjVvb05j
+OUViMGtTakpxV1Y4NUJiNExPVVRGVVFXSG5jL1FjWjZQNnJxM092SXh3SWomIzEzOwppY2wzRW9p
+VHF2SXFGZzhrWjZ5MXBrQnljWkE3VEMrZzVoVGUvMzY3SVUycG40MDNUZ2xJTVFzUFVCdDBhWTNC
+NXhlb2hqc254UGRmJiMxMzsKTkZseDVoS2RHdnZhSlUxM3d4b3YwUW80Q2pOcC96RjcxZWdNNEtC
+Z2lRYlpRSDEwb3FZbXZVNWpGdWxaZ1JjdENRbTNNdng0N0hEMiYjMTM7Ckg2aUFSWFM2MHkvTGZa
+d1lIUlhpMTNmTCtRUCsxLzA0dnlNb2t5cE9HcHhyNVVyb0FZT2dGTWhSR0Y5SW9hTGFDOUdPQkFh
+NVhIZW0mIzEzOwp6aXgxenY4MHR3SUpPVld4QVpDQlJoVC9HNEprUW5LOXgvY3FTcy9Dd240aEt4
+Yzl0UEZZMWJ3aDZpVEFBSWlrMllNMXdWZytiMHo2JiMxMzsKY3g1NUhZRmRBb09ucHRpeFZ2S3Qy
+ZVJKL1hEdW9LdFYzeDFsaXdBam1uZllNUnZqWVlhc3VRa25FWDFSbHB1MUVpaFFveW1TQUJUZyYj
+MTM7Cnd0aTRsd29ZTUozOEVlUEl0TnJIcjRZenlvcVB5Qmt6Z3Fld0t2aENxMEh1M3hKV00xMGE4
+aEhhSGQ2a094eDg1VG9KZXhUUTdQZjQmIzEzOwovOEJFVldFcDhqZlpDR0RlSXNzR3JXdGg3RnlY
+QWR4VVBzTHBmVHRzNWxYVnp3NXEzc21WUCtIZUhLWE9XeUQydmFCWmp2c1FFT0pVJiMxMzsKZGVK
+WTZzTTRMVU93YndhdG5MajNmYTlpRTFvZjVsaXRGbmQ3Q09COVQrRzc4ZzVTa0F4c2NtdVFRdEl3
+QzJFM1JIRXlOaHhQaDFrPTwvZHM6U2lnbmF0dXJlVmFsdWU+PGRzOktleUluZm8gSWQ9Il9mZjdi
+YzA0Yy1iMjIwLTRmMzEtODc5NC0xMzljYmRjNWMzMTAiPjxkczpYNTA5RGF0YT48ZHM6WDUwOUNl
+cnRpZmljYXRlPk1JSUhYekNDQlVlZ0F3SUJBZ0lVWHFJL3ZkMThDYWc5OG9OcGR6VjdCaXkvNkVB
+d0RRWUpLb1pJaHZjTkFRRU5CUUF3ZkRFTE1Ba0cmIzEzOwpBMVVFQmhNQ1ZWTXhQREE2QmdOVkJB
+b01NMGx1ZEdWeWJtVjBJRU52Y25CdmNtRjBhVzl1SUdadmNpQkJjM05wWjI1bFpDQk9ZVzFsJiMx
+MzsKY3lCaGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF3d21TVU5CVGs0Z1ZISmhaR1Z0WVhKcklF
+TnNaV0Z5YVc1bmFHOTFjMlVnVUdscyYjMTM7CmIzUWdRMEV3SGhjTk1qSXhNVEUyTVRNeU9EVTVX
+aGNOTWpjeE1URTFNVE15T0RVNVdqQ0IwREVMTUFrR0ExVUVCaE1DUWtVeEVUQVAmIzEzOwpCZ05W
+QkFnVENFSnlkWE56Wld4ek1SSXdFQVlEVlFRSEV3bFdhV3gyYjI5eVpHVXhNekF4QmdOVkJBb1RL
+a1JsYkc5cGRIUmxJRU52JiMxMzsKYm5OMWJIUnBibWNnWVc1a0lFRmtkbWx6YjNKNUlFTldRa0V2
+VTBOU1RERStNRHdHQTFVRUF4TTFTVU5CVGs0Z1ZFMURTQ0JCZFhSbyYjMTM7CmIzSnBlbVZrSUZS
+eVlXUmxiV0Z5YXlCUWFXeHZkQ0JXWVd4cFpHRjBiM0lnVm1Gc2FXUXhKVEFqQmdrcWhraUc5dzBC
+Q1FFV0ZtSmwmIzEzOwpkRzFqYUhOdFpFQmtaV3h2YVhSMFpTNWpiMjB3Z2dJaU1BMEdDU3FHU0li
+M0RRRUJBUVVBQTRJQ0R3QXdnZ0lLQW9JQ0FRQzZGSnd6JiMxMzsKS3FRVlg2ZkczL0VMUlNHV1Y5
+R3JLYUZNS21oV0l4ZXB3UlpONk14TXFrZDVEbllmaVQrV3A5OGpFa3FnVHgyVU1iOXF1Z2NHTlY2
+ZyYjMTM7CjM1L0NyUWIvRi9tejNDNHNmTE51RHBTcUs5UUY4K3BhVEg2aFFtck9wcVYrVVR2ZGo5
+U01nS0d5Rml6Uzg4Q0RXTXg0dzNpNEZBS2UmIzEzOwo2TlJzSlJHVEF0S0R1TUhjQTRzajA4R2pl
+M2xQV2NnRnZjUU5EVmVFQlR1T0hCRytSaGo3VjFKaU5HUC80ZXBUWFRGWGdQRkRnZXozJiMxMzsK
+WUFmeHFwYnVPNFRYNmJiWWRrMm52TUxGdkxFTmtDRll1bG5ZUHpnbkVCR1NNS0lhQUlsYitzY0hD
+dldnV2oyVExnd2gyR0pOY3pWTSYjMTM7CjFMUE1xR1MrVWtpOU1oNzk4MjIveG9hcjQ5OHhEeDJZ
+eC84c3dnRU5MU2dDc1FBVzhuTWd3V242QWJZbDJSQUJYdXJheUZzbjRQMVImIzEzOwp1UU5tVXAv
+cXJSS1J2U0pyMU9Ma0haZkZUY1NZUWFWaXVNWVBYekd6OHRtTUxsbUkvQjZBQ0g0QXdSTWRuWXZG
+TzNLSTFSQm5QS0lkJiMxMzsKd3dmVXBaNUlUSXBiQTdDR2dUeDFxeHRNMXdJVXI3cEhlS1A2alZl
+M2tkRExnKy9CWjJ4TUV0Qms1YThZN0I0djN4d0hYR1R2VjhtTiYjMTM7CjBBZy9TeVQvUVV5RVJo
+WFV5QU4yK0V3WitTUUNVeU5memlvV1E4NzhlR3lrVSs0NitCYmdJM0lJcjM2WEtQd216dDBTWitL
+STN0bkYmIzEzOwpUbG45bVgwS0MwaWRvajV5a3pQb0MvTUllZDBzcDRUaWd4RWJXTng3RUY4MFB2
+Ui9EREV3VlBFRWtrank2M1hGdWx4aUNRSURBUUFCJiMxMzsKbzRJQmdqQ0NBWDR3REFZRFZSMFRB
+UUgvQkFJd0FEQU9CZ05WSFE4QkFmOEVCQU1DQjRBd0hRWURWUjBPQkJZRUZIbjlzMERFYTJrdiYj
+MTM7CmdFL2VJT1RzcW9XODVNWEZNSUc2QmdOVkhTTUVnYkl3Z2ErQUZFZDdUNjU2VVpHMTBiK2RO
+dW1HZnpZV0JLbEZvWUdBcEg0d2ZERUwmIzEzOwpNQWtHQTFVRUJoTUNWVk14UERBNkJnTlZCQW9N
+TTBsdWRHVnlibVYwSUVOdmNuQnZjbUYwYVc5dUlHWnZjaUJCYzNOcFoyNWxaQ0JPJiMxMzsKWVcx
+bGN5QmhibVFnVG5WdFltVnljekV2TUMwR0ExVUVBd3dtU1VOQlRrNGdWSEpoWkdWdFlYSnJJRU5z
+WldGeWFXNW5hRzkxYzJVZyYjMTM7ClVHbHNiM1FnUTBHQ0ZIcHFiVEZlSmNQdFVDOVh1dVBLUHNM
+d0RSK01NRFFHQTFVZEh3UXRNQ3N3S2FBbm9DV0dJMmgwZEhBNkx5OWomIzEzOwpjbXd1YVdOaGJt
+NHViM0puTDNSdFkyaGZjR2xzYjNRdVkzSnNNRXdHQTFVZElBUkZNRU13RUFZT0t3WUJCQUdDeVJz
+QkJZTTdEQW93JiMxMzsKTHdZSUt3WUJCUVVIQWdFd0l6QWhCZ2dyQmdFRkJRY0NBUllWYUhSMGNI
+TTZMeTlqY0hNdWFXTmhibTR1YjNKbk1BMEdDU3FHU0liMyYjMTM7CkRRRUJEUVVBQTRJQ0FRQmRT
+YXQ1NnVlakxuQWpGSUY5NWRqWVdJNnMvL042WVh4c3JyTWtHQlA4RWV6UHloTGg2YXdQNHo3UTlR
+QUkmIzEzOwpRWmtZb3hybC8xeTArYnlWMnFuVFVVQ0xScEsvQkRwL2hjZndQZktDQS8yUlFDSEpy
+YjYrejBlbkRQRlJLME5LbXdPY2RsR3RVazBtJiMxMzsKUGdXR1NLdHV3VnNQQWhUREp1aG9zWk9o
+a05mK25TT09IclFPbjFFMnJ6T3JkL2tRbHFpQ3dSSDk3OTZOcFRBK0hTTWZPb2JKRUVQcSYjMTM7
+CnRwRjdQNXFid3RsOTVVYTVPcDRBaGE3MEhIZlVGUzRCT1FLTEJWZk1aZE9SK2lQb2g1T3dBSyto
+dFlrRkNHOVAyV0h1N3dmOEVDK1cmIzEzOwo3azk2Z3ZUZDh4RTdvdW9hYlQyeDZZZllxRWxQSGlV
+L0lNOWdWeldXTC9zdllEeVNWdW9Gd0JqRE5OMWNkcTBxT1lSMXl1UzFjLzlEJiMxMzsKRlI3ZW83
+R0ZFQ3krVEJkN0lpS1JmQlZlWUdPT1BNbm9GZnhSTFdycHNXTm53RDdsa1BrTENnRkNrKzh5RWNP
+Umc2MjVtbzY1ejR5NiYjMTM7Cko0Szhmb2RhN3F3bVhOUDNSUzE4b242Qkh0OGxRK2JYZ09IbXhJ
+SGswYU8wcU5EcWd2THIyRmx5TEdKR2lFTVJxRE1NUjYvYTA2YnQmIzEzOwprblVNSGw3Q3FNZmpJ
+a2pQNFZOTnlHUGRKZ3dWazJrZWI5dU5GdkpDeFQrTTJmR1hRMU5iSk5mdHY1TWdTc3A5TjF5K3g2
+Z0EzRWh3JiMxMzsKeUhsbUpCNFlNdG84dFRWMWk4NHhQWHhpMkNBZURhR0R1d29zdDhZVUNTanE3
+UkNLOHRHY2FBWXJrWFFZMnlRZlgzY3dEc0V4UnFWVyYjMTM7CnlyanlSdCtONm1LOTlRPT08L2Rz
+Olg1MDlDZXJ0aWZpY2F0ZT48L2RzOlg1MDlEYXRhPjwvZHM6S2V5SW5mbz48L2RzOlNpZ25hdHVy
+ZT48L3NtZDpzaWduZWRNYXJrPgo=
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Agent-French/TreatyStatute-Agent-French-Active.smd b/core/src/test/resources/google/registry/tmch/idn/Agent-French/TreatyStatute-Agent-French-Active.smd
new file mode 100644
index 000000000..fe4df3746
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Agent-French/TreatyStatute-Agent-French-Active.smd
@@ -0,0 +1,126 @@
+Marks: Essai & évaluation
+smdID: 000000841669082297850-65535
+U-labels: xn--essai---valuation-itb, xn--essai--valuation-hqb, xn--essai-and-valuation-kzb, xn--essai-andvaluation-jwb, xn--essai-valuation-gnb, xn--essaiand-valuation-jwb, xn--essaiandvaluation-itb, xn--essaivaluation-fkb
+notBefore: 2022-11-22T01:58:17.850Z
+notAfter: 2027-10-18T14:46:53.013Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il8xNzZj
+MTlmYy03M2JmLTQ1MzktODdhYi1iNTkxZGUxYWFiZTEiPjxzbWQ6aWQ+MDAwMDAwODQxNjY5MDgy
+Mjk3ODUwLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMTo1ODoxNy44NTBaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0xOFQxNDo0Njo1My4wMTNaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
+cmVhdHlPclN0YXR1dGU+PG1hcms6aWQ+MDAwMTM5MTUwMzA2NzU4ODE1MDMwNjc1ODgtMTwvbWFy
+azppZD48bWFyazptYXJrTmFtZT5Fc3NhaSAmYW1wOyDDqXZhbHVhdGlvbjwvbWFyazptYXJrTmFt
+ZT48bWFyazpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpvcmc+QWdlbmNlIGVuIEZy
+YW5jZTwvbWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpzdHJlZXQ+MTAgQXZlbnVlIFJvdXNzZWF1
+eDwvbWFyazpzdHJlZXQ+PG1hcms6Y2l0eT5WZXJzYWlsbGVzPC9tYXJrOmNpdHk+PG1hcms6cGM+
+MzMwODE8L21hcms6cGM+PG1hcms6Y2M+RlI8L21hcms6Y2M+PC9tYXJrOmFkZHI+PC9tYXJrOmhv
+bGRlcj48bWFyazpjb250YWN0IHR5cGU9ImFnZW50Ij48bWFyazpuYW1lPkZyYW5jIExlYnJ1bjwv
+bWFyazpuYW1lPjxtYXJrOm9yZz5BZ2VuY2UgZW4gRnJhbmNlPC9tYXJrOm9yZz48bWFyazphZGRy
+PjxtYXJrOnN0cmVldD5BdmVudWUgUm91c3NlYXV4IDEwIDwvbWFyazpzdHJlZXQ+PG1hcms6Y2l0
+eT5WZXJzYWlsbGVzPC9tYXJrOmNpdHk+PG1hcms6cGM+MzMwODE8L21hcms6cGM+PG1hcms6Y2M+
+RlI8L21hcms6Y2M+PC9tYXJrOmFkZHI+PG1hcms6dm9pY2U+KzMzLjEyNTc4MTI1MDwvbWFyazp2
+b2ljZT48bWFyazpmYXg+KzMzLjEyNTc4MTI1MTwvbWFyazpmYXg+PG1hcms6ZW1haWw+aW5mb0Bh
+Z2VuY2UtZW4tZnJhbmNlLmZyPC9tYXJrOmVtYWlsPjwvbWFyazpjb250YWN0PjxtYXJrOnByb3Rl
+Y3Rpb24+PG1hcms6Y2M+VVM8L21hcms6Y2M+PG1hcms6cnVsaW5nPkZSPC9tYXJrOnJ1bGluZz48
+L21hcms6cHJvdGVjdGlvbj48bWFyazpsYWJlbD54bi0tZXNzYWktLS12YWx1YXRpb24taXRiPC9t
+YXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1lc3NhaS0tdmFsdWF0aW9uLWhxYjwvbWFyazpsYWJl
+bD48bWFyazpsYWJlbD54bi0tZXNzYWktYW5kLXZhbHVhdGlvbi1remI8L21hcms6bGFiZWw+PG1h
+cms6bGFiZWw+eG4tLWVzc2FpLWFuZHZhbHVhdGlvbi1qd2I8L21hcms6bGFiZWw+PG1hcms6bGFi
+ZWw+eG4tLWVzc2FpLXZhbHVhdGlvbi1nbmI8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLWVz
+c2FpYW5kLXZhbHVhdGlvbi1qd2I8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLWVzc2FpYW5k
+dmFsdWF0aW9uLWl0YjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tZXNzYWl2YWx1YXRpb24t
+ZmtiPC9tYXJrOmxhYmVsPjxtYXJrOmdvb2RzQW5kU2VydmljZXM+Z3VpdGFyPC9tYXJrOmdvb2Rz
+QW5kU2VydmljZXM+PG1hcms6cmVmTnVtPjEyMzQ8L21hcms6cmVmTnVtPjxtYXJrOnByb0RhdGU+
+MjAwMC0wMS0wMVQwMDowMDowMC4wMDBaPC9tYXJrOnByb0RhdGU+PG1hcms6dGl0bGU+Z3VpdGFy
+ZTwvbWFyazp0aXRsZT48bWFyazpleGVjRGF0ZT4yMDEzLTAyLTAyVDAwOjAwOjAwLjAwMFo8L21h
+cms6ZXhlY0RhdGU+PC9tYXJrOnRyZWF0eU9yU3RhdHV0ZT48L21hcms6bWFyaz48ZHM6U2lnbmF0
+dXJlIHhtbG5zOmRzPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjIiBJZD0iXzI2
+Yzk5ZGRkLWU5Y2MtNDRlZi1iMmU2LTA4ZTQ0NGEzYjBjMyI+PGRzOlNpZ25lZEluZm8+PGRzOkNh
+bm9uaWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEw
+L3htbC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJlTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3
+dy53My5vcmcvMjAwMS8wNC94bWxkc2lnLW1vcmUjcnNhLXNoYTI1NiIvPjxkczpSZWZlcmVuY2Ug
+VVJJPSIjXzE3NmMxOWZjLTczYmYtNDUzOS04N2FiLWI1OTFkZTFhYWJlMSI+PGRzOlRyYW5zZm9y
+bXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1s
+ZHNpZyNlbnZlbG9wZWQtc2lnbmF0dXJlIi8+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6
+Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6
+RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxlbmMj
+c2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPk9KZWx3WXc2cFBxb3h6RzR1ZzRjMDFac2NkQitmU2VZ
+VlJSWHIxSmlqbVE9PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48ZHM6UmVmZXJlbmNl
+IFVSST0iI181ODIzODgyMi0xZjk1LTQ4MWYtYTAyYy04NzdmNTRkMGQ4NzUiPjxkczpUcmFuc2Zv
+cm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3ht
+bC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09
+Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1
+ZT4vSkRCaW5hMm1qRjcyUEk3V1FDZWtlV3FzRnUxdE9TK2dvL05iMlhXQU93PTwvZHM6RGlnZXN0
+VmFsdWU+PC9kczpSZWZlcmVuY2U+PC9kczpTaWduZWRJbmZvPjxkczpTaWduYXR1cmVWYWx1ZSBJ
+ZD0iXzJjMDM1YTVmLWMxNDUtNGJmZS04OTQzLTk4ZDc2ZDM0MGY3MyI+c0FKZUQrZW5ycng4Y3I3
+aWk5Smk0bUJabTM3TnZuMGF0V1FVWHp6eGQyaUViMU16OFhFMys3TjArd0J0TWo0MnBwNDYxQkRT
+ZXB2OCYjMTM7Cm1DTlpHaU1yMmNBSXpWemJ4STNaTGNsOFFWajRtSE9GVVVGMFJxR3ljeStwaXh4
+MnlmakZMcHdEQk10ZVJ5Rzk4ZW1MbXUyWkdmcE0mIzEzOwptNGlpWjB5N2ZqWXJEbzdQaWlFQUFJ
+Z2dmajhYQ1VzaGZXUVRUWVZNOTRRSFI0cmRJdUw3Ymhqd2VURldqaUJtNHZTWjl5ZTBTOVVkJiMx
+MzsKSjB1R1VVZEdnczZRbWFET2VBK1MxK09JQUtoTEVZN085dHpFcnpKU012ek9yM1JjMnlRUlEx
+UC84L3hZaVJRK1c2STFtVFlQbThKeSYjMTM7CmsvY3FFY3JFVFBtVG5qaDR6TlJIYm11bGhYRHRM
+Y1M4YnBURUt0MndBVy9tV0ZrWDhDUjlrYkFYdEVidWlHdkVMRFFobVJUU0N6SkcmIzEzOwpoNlpk
+bEdjWDhFUEdlRmhKcWdqdnVVTDFuY3pqakRGNnlPUlF4UlBPU2Y5alEwRVZpVzRxb0hLY2JZYjky
+eStIR0ludEVuamt6Q25uJiMxMzsKTXgvZXpHYVZLKy9NN0swdHpGS2Y4dHU4RzJYQlFhZ3JDaHVZ
+bERYam1Hc2s2NVlnTXBBcitTWW1zUmhqaFEvSjRVdEwrbDFVVHV5diYjMTM7CjRxMzZ1VWU5ODBr
+WTUvNnhxd1Y2SGhveW1XSEZ3TGJKUlgyRnh3NGhUN0crVTdyd1NoUnBvVXpvTkIyZGQ3T1l0Rk1j
+N2RmVndFZjQmIzEzOwpzTlhjMzhyM1lUZHA5YWkrVU43Y1VxVUROdUpEZU5XMnk5SkRJK1ZWL1FW
+Mm9NQzdMVUR6QlFURmJSRE5QMjhqS3VqTWF0RnVMUXM9PC9kczpTaWduYXR1cmVWYWx1ZT48ZHM6
+S2V5SW5mbyBJZD0iXzU4MjM4ODIyLTFmOTUtNDgxZi1hMDJjLTg3N2Y1NGQwZDg3NSI+PGRzOlg1
+MDlEYXRhPjxkczpYNTA5Q2VydGlmaWNhdGU+TUlJSFh6Q0NCVWVnQXdJQkFnSVVYcUkvdmQxOENh
+Zzk4b05wZHpWN0JpeS82RUF3RFFZSktvWklodmNOQVFFTkJRQXdmREVMTUFrRyYjMTM7CkExVUVC
+aE1DVlZNeFBEQTZCZ05WQkFvTU0wbHVkR1Z5Ym1WMElFTnZjbkJ2Y21GMGFXOXVJR1p2Y2lCQmMz
+TnBaMjVsWkNCT1lXMWwmIzEzOwpjeUJoYm1RZ1RuVnRZbVZ5Y3pFdk1DMEdBMVVFQXd3bVNVTkJU
+azRnVkhKaFpHVnRZWEpySUVOc1pXRnlhVzVuYUc5MWMyVWdVR2xzJiMxMzsKYjNRZ1EwRXdIaGNO
+TWpJeE1URTJNVE15T0RVNVdoY05NamN4TVRFMU1UTXlPRFU1V2pDQjBERUxNQWtHQTFVRUJoTUNR
+a1V4RVRBUCYjMTM7CkJnTlZCQWdUQ0VKeWRYTnpaV3h6TVJJd0VBWURWUVFIRXdsV2FXeDJiMjl5
+WkdVeE16QXhCZ05WQkFvVEtrUmxiRzlwZEhSbElFTnYmIzEzOwpibk4xYkhScGJtY2dZVzVrSUVG
+a2RtbHpiM0o1SUVOV1FrRXZVME5TVERFK01Ed0dBMVVFQXhNMVNVTkJUazRnVkUxRFNDQkJkWFJv
+JiMxMzsKYjNKcGVtVmtJRlJ5WVdSbGJXRnlheUJRYVd4dmRDQldZV3hwWkdGMGIzSWdWbUZzYVdR
+eEpUQWpCZ2txaGtpRzl3MEJDUUVXRm1KbCYjMTM7CmRHMWphSE50WkVCa1pXeHZhWFIwWlM1amIy
+MHdnZ0lpTUEwR0NTcUdTSWIzRFFFQkFRVUFBNElDRHdBd2dnSUtBb0lDQVFDNkZKd3omIzEzOwpL
+cVFWWDZmRzMvRUxSU0dXVjlHckthRk1LbWhXSXhlcHdSWk42TXhNcWtkNURuWWZpVCtXcDk4akVr
+cWdUeDJVTWI5cXVnY0dOVjZnJiMxMzsKMzUvQ3JRYi9GL216M0M0c2ZMTnVEcFNxSzlRRjgrcGFU
+SDZoUW1yT3BxVitVVHZkajlTTWdLR3lGaXpTODhDRFdNeDR3M2k0RkFLZSYjMTM7CjZOUnNKUkdU
+QXRLRHVNSGNBNHNqMDhHamUzbFBXY2dGdmNRTkRWZUVCVHVPSEJHK1JoajdWMUppTkdQLzRlcFRY
+VEZYZ1BGRGdlejMmIzEzOwpZQWZ4cXBidU80VFg2YmJZZGsybnZNTEZ2TEVOa0NGWXVsbllQemdu
+RUJHU01LSWFBSWxiK3NjSEN2V2dXajJUTGd3aDJHSk5jelZNJiMxMzsKMUxQTXFHUytVa2k5TWg3
+OTgyMi94b2FyNDk4eER4Mll4Lzhzd2dFTkxTZ0NzUUFXOG5NZ3dXbjZBYllsMlJBQlh1cmF5RnNu
+NFAxUiYjMTM7CnVRTm1VcC9xclJLUnZTSnIxT0xrSFpmRlRjU1lRYVZpdU1ZUFh6R3o4dG1NTGxt
+SS9CNkFDSDRBd1JNZG5ZdkZPM0tJMVJCblBLSWQmIzEzOwp3d2ZVcFo1SVRJcGJBN0NHZ1R4MXF4
+dE0xd0lVcjdwSGVLUDZqVmUza2RETGcrL0JaMnhNRXRCazVhOFk3QjR2M3h3SFhHVHZWOG1OJiMx
+MzsKMEFnL1N5VC9RVXlFUmhYVXlBTjIrRXdaK1NRQ1V5TmZ6aW9XUTg3OGVHeWtVKzQ2K0JiZ0kz
+SUlyMzZYS1B3bXp0MFNaK0tJM3RuRiYjMTM7ClRsbjltWDBLQzBpZG9qNXlrelBvQy9NSWVkMHNw
+NFRpZ3hFYldOeDdFRjgwUHZSL0RERXdWUEVFa2tqeTYzWEZ1bHhpQ1FJREFRQUImIzEzOwpvNElC
+Z2pDQ0FYNHdEQVlEVlIwVEFRSC9CQUl3QURBT0JnTlZIUThCQWY4RUJBTUNCNEF3SFFZRFZSME9C
+QllFRkhuOXMwREVhMmt2JiMxMzsKZ0UvZUlPVHNxb1c4NU1YRk1JRzZCZ05WSFNNRWdiSXdnYStB
+RkVkN1Q2NTZVWkcxMGIrZE51bUdmellXQktsRm9ZR0FwSDR3ZkRFTCYjMTM7Ck1Ba0dBMVVFQmhN
+Q1ZWTXhQREE2QmdOVkJBb01NMGx1ZEdWeWJtVjBJRU52Y25CdmNtRjBhVzl1SUdadmNpQkJjM05w
+WjI1bFpDQk8mIzEzOwpZVzFsY3lCaGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF3d21TVU5CVGs0
+Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5YVc1bmFHOTFjMlVnJiMxMzsKVUdsc2IzUWdRMEdDRkhwcWJU
+RmVKY1B0VUM5WHV1UEtQc0x3RFIrTU1EUUdBMVVkSHdRdE1Dc3dLYUFub0NXR0kyaDBkSEE2THk5
+aiYjMTM7CmNtd3VhV05oYm00dWIzSm5MM1J0WTJoZmNHbHNiM1F1WTNKc01Fd0dBMVVkSUFSRk1F
+TXdFQVlPS3dZQkJBR0N5UnNCQllNN0RBb3cmIzEzOwpMd1lJS3dZQkJRVUhBZ0V3SXpBaEJnZ3JC
+Z0VGQlFjQ0FSWVZhSFIwY0hNNkx5OWpjSE11YVdOaGJtNHViM0puTUEwR0NTcUdTSWIzJiMxMzsK
+RFFFQkRRVUFBNElDQVFCZFNhdDU2dWVqTG5BakZJRjk1ZGpZV0k2cy8vTjZZWHhzcnJNa0dCUDhF
+ZXpQeWhMaDZhd1A0ejdROVFBSSYjMTM7ClFaa1lveHJsLzF5MCtieVYycW5UVVVDTFJwSy9CRHAv
+aGNmd1BmS0NBLzJSUUNISnJiNit6MGVuRFBGUkswTkttd09jZGxHdFVrMG0mIzEzOwpQZ1dHU0t0
+dXdWc1BBaFRESnVob3NaT2hrTmYrblNPT0hyUU9uMUUycnpPcmQva1FscWlDd1JIOTc5Nk5wVEEr
+SFNNZk9vYkpFRVBxJiMxMzsKdHBGN1A1cWJ3dGw5NVVhNU9wNEFoYTcwSEhmVUZTNEJPUUtMQlZm
+TVpkT1IraVBvaDVPd0FLK2h0WWtGQ0c5UDJXSHU3d2Y4RUMrVyYjMTM7CjdrOTZndlRkOHhFN291
+b2FiVDJ4NllmWXFFbFBIaVUvSU05Z1Z6V1dML3N2WUR5U1Z1b0Z3QmpETk4xY2RxMHFPWVIxeXVT
+MWMvOUQmIzEzOwpGUjdlbzdHRkVDeStUQmQ3SWlLUmZCVmVZR09PUE1ub0ZmeFJMV3Jwc1dObndE
+N2xrUGtMQ2dGQ2srOHlFY09SZzYyNW1vNjV6NHk2JiMxMzsKSjRLOGZvZGE3cXdtWE5QM1JTMThv
+bjZCSHQ4bFErYlhnT0hteElIazBhTzBxTkRxZ3ZMcjJGbHlMR0pHaUVNUnFETU1SNi9hMDZidCYj
+MTM7CmtuVU1IbDdDcU1maklralA0Vk5OeUdQZEpnd1ZrMmtlYjl1TkZ2SkN4VCtNMmZHWFExTmJK
+TmZ0djVNZ1NzcDlOMXkreDZnQTNFaHcmIzEzOwp5SGxtSkI0WU10bzh0VFYxaTg0eFBYeGkyQ0Fl
+RGFHRHV3b3N0OFlVQ1NqcTdSQ0s4dEdjYUFZcmtYUVkyeVFmWDNjd0RzRXhScVZXJiMxMzsKeXJq
+eVJ0K042bUs5OVE9PTwvZHM6WDUwOUNlcnRpZmljYXRlPjwvZHM6WDUwOURhdGE+PC9kczpLZXlJ
+bmZvPjwvZHM6U2lnbmF0dXJlPjwvc21kOnNpZ25lZE1hcms+Cg==
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Agent-French/TreatyStatute-Agent-French-Revoked.smd b/core/src/test/resources/google/registry/tmch/idn/Agent-French/TreatyStatute-Agent-French-Revoked.smd
new file mode 100644
index 000000000..5673b4912
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Agent-French/TreatyStatute-Agent-French-Revoked.smd
@@ -0,0 +1,126 @@
+Marks: Essai & évaluation
+smdID: 000000841669082079052-65535
+U-labels: xn--essai---valuation-itb, xn--essai--valuation-hqb, xn--essai-and-valuation-kzb, xn--essai-andvaluation-jwb, xn--essai-valuation-gnb, xn--essaiand-valuation-jwb, xn--essaiandvaluation-itb, xn--essaivaluation-fkb
+notBefore: 2022-11-22T01:54:39.052Z
+notAfter: 2027-10-18T14:46:53.013Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il8xNzRh
+MzA5ZC1jZmMyLTQzMzktYTE5Mi04MmNkYTJkZmQ2ZWUiPjxzbWQ6aWQ+MDAwMDAwODQxNjY5MDgy
+MDc5MDUyLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMTo1NDozOS4wNTJaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0xOFQxNDo0Njo1My4wMTNaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
+cmVhdHlPclN0YXR1dGU+PG1hcms6aWQ+MDAwMTM5MTUwMzA2NzU4ODE1MDMwNjc1ODgtMTwvbWFy
+azppZD48bWFyazptYXJrTmFtZT5Fc3NhaSAmYW1wOyDDqXZhbHVhdGlvbjwvbWFyazptYXJrTmFt
+ZT48bWFyazpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpvcmc+QWdlbmNlIGVuIEZy
+YW5jZTwvbWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpzdHJlZXQ+MTAgQXZlbnVlIFJvdXNzZWF1
+eDwvbWFyazpzdHJlZXQ+PG1hcms6Y2l0eT5WZXJzYWlsbGVzPC9tYXJrOmNpdHk+PG1hcms6cGM+
+MzMwODE8L21hcms6cGM+PG1hcms6Y2M+RlI8L21hcms6Y2M+PC9tYXJrOmFkZHI+PC9tYXJrOmhv
+bGRlcj48bWFyazpjb250YWN0IHR5cGU9ImFnZW50Ij48bWFyazpuYW1lPkZyYW5jIExlYnJ1bjwv
+bWFyazpuYW1lPjxtYXJrOm9yZz5BZ2VuY2UgZW4gRnJhbmNlPC9tYXJrOm9yZz48bWFyazphZGRy
+PjxtYXJrOnN0cmVldD5BdmVudWUgUm91c3NlYXV4IDEwIDwvbWFyazpzdHJlZXQ+PG1hcms6Y2l0
+eT5WZXJzYWlsbGVzPC9tYXJrOmNpdHk+PG1hcms6cGM+MzMwODE8L21hcms6cGM+PG1hcms6Y2M+
+RlI8L21hcms6Y2M+PC9tYXJrOmFkZHI+PG1hcms6dm9pY2U+KzMzLjEyNTc4MTI1MDwvbWFyazp2
+b2ljZT48bWFyazpmYXg+KzMzLjEyNTc4MTI1MTwvbWFyazpmYXg+PG1hcms6ZW1haWw+aW5mb0Bh
+Z2VuY2UtZW4tZnJhbmNlLmZyPC9tYXJrOmVtYWlsPjwvbWFyazpjb250YWN0PjxtYXJrOnByb3Rl
+Y3Rpb24+PG1hcms6Y2M+VVM8L21hcms6Y2M+PG1hcms6cnVsaW5nPkZSPC9tYXJrOnJ1bGluZz48
+L21hcms6cHJvdGVjdGlvbj48bWFyazpsYWJlbD54bi0tZXNzYWktLS12YWx1YXRpb24taXRiPC9t
+YXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1lc3NhaS0tdmFsdWF0aW9uLWhxYjwvbWFyazpsYWJl
+bD48bWFyazpsYWJlbD54bi0tZXNzYWktYW5kLXZhbHVhdGlvbi1remI8L21hcms6bGFiZWw+PG1h
+cms6bGFiZWw+eG4tLWVzc2FpLWFuZHZhbHVhdGlvbi1qd2I8L21hcms6bGFiZWw+PG1hcms6bGFi
+ZWw+eG4tLWVzc2FpLXZhbHVhdGlvbi1nbmI8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLWVz
+c2FpYW5kLXZhbHVhdGlvbi1qd2I8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLWVzc2FpYW5k
+dmFsdWF0aW9uLWl0YjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tZXNzYWl2YWx1YXRpb24t
+ZmtiPC9tYXJrOmxhYmVsPjxtYXJrOmdvb2RzQW5kU2VydmljZXM+Z3VpdGFyPC9tYXJrOmdvb2Rz
+QW5kU2VydmljZXM+PG1hcms6cmVmTnVtPjEyMzQ8L21hcms6cmVmTnVtPjxtYXJrOnByb0RhdGU+
+MjAwMC0wMS0wMVQwMDowMDowMC4wMDBaPC9tYXJrOnByb0RhdGU+PG1hcms6dGl0bGU+Z3VpdGFy
+ZTwvbWFyazp0aXRsZT48bWFyazpleGVjRGF0ZT4yMDEzLTAyLTAyVDAwOjAwOjAwLjAwMFo8L21h
+cms6ZXhlY0RhdGU+PC9tYXJrOnRyZWF0eU9yU3RhdHV0ZT48L21hcms6bWFyaz48ZHM6U2lnbmF0
+dXJlIHhtbG5zOmRzPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjIiBJZD0iX2Vj
+MTljOThmLWRhMmQtNDYyYS05OTZlLWQ1OTAwYzYwNzk3ZSI+PGRzOlNpZ25lZEluZm8+PGRzOkNh
+bm9uaWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEw
+L3htbC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJlTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3
+dy53My5vcmcvMjAwMS8wNC94bWxkc2lnLW1vcmUjcnNhLXNoYTI1NiIvPjxkczpSZWZlcmVuY2Ug
+VVJJPSIjXzE3NGEzMDlkLWNmYzItNDMzOS1hMTkyLTgyY2RhMmRmZDZlZSI+PGRzOlRyYW5zZm9y
+bXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1s
+ZHNpZyNlbnZlbG9wZWQtc2lnbmF0dXJlIi8+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6
+Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6
+RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxlbmMj
+c2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPnprRlh4NnpjeTYzQUdFRjEvSGk1L25DUVhyNlpTVGpR
+bGlYZ1dDaTI1WDQ9PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48ZHM6UmVmZXJlbmNl
+IFVSST0iI18xMDg0MTBkOS03MTYyLTQ1ZDItOWU5OC01MjQwODllN2YyNzMiPjxkczpUcmFuc2Zv
+cm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3ht
+bC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09
+Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1
+ZT5iRTJPbnVvakNIcHBYMGtxa0hGc2hYY3FtZTZMbWhoYi9yU0ZwNWF2MmQwPTwvZHM6RGlnZXN0
+VmFsdWU+PC9kczpSZWZlcmVuY2U+PC9kczpTaWduZWRJbmZvPjxkczpTaWduYXR1cmVWYWx1ZSBJ
+ZD0iXzRmOTg4MjhjLTNjYmQtNDc0NS04ZmI0LTE3NmFiYWU0MTAyOCI+bHYwMFNPYUwxd1J3cGRM
+ZEx2Y2JlQVJvdnZocmtmOHV4blRMZ2xMamcvZzRGR0dLeFRaM1JhUS9OdVZkdzBLd2ZJemdDRUhI
+bFVkUiYjMTM7Ck5BWU52Zlh2QzEyNlRRNG5ORm9lUzJzUHZrYXZyelFUUTV0b2QzaWtGZ09UZkVr
+dkpsUGE1cUU3Z3NLZWxobFhKMG4vL2w2cURzRjQmIzEzOwpKc2wxUDdYRE1kRnVQcnc3REQ5WDlm
+U0MwQlRBWTAvS0xwY0x5a2d5eGtYQkZSZlpYbEZXdHkwdnIvdE1rbFZtMHNLT0ZrekZKWHc5JiMx
+MzsKZGFaZFdoNE0yWkZVcEpZTFY1Zlh4bEsydmFrMG1BeUltbkNpcEVpTy9VekEwVndYNE9rcEpF
+YWgyUXhnekNySnl6QStOUGVWSGYyNiYjMTM7CjQ0TVhpTWVBYmdEMEdrSTVwbjZ5SC9KeWwyMjd2
+SFBkVkUzVVA4bzRPUlJ0cFVoZ0sxOFczZnhHMXZ5ZFlYNVQ2RzJad04vK29Ca1AmIzEzOwpnT0tI
+bFBKQk5QenQ3Wk9oYWVrTlMrTDVhUXpIZDl3eFZrWVdKaG4rbmVBQ1hnWnl0R05zNktZL2w5cEZ1
+c3hETEs3RFNleDl1dzVTJiMxMzsKV0h6M2tlZlpPUkd5MFYrUys0MVRpRkVwbmxyUHZGMWkyaXE4
+dmNHM2tlRnEwcTlDTlV5TE1UMFdvNVhJTzF3d01iYmtsUGtmUkFCdiYjMTM7CjE3OVgxV3NYT3Nn
+WG1lK2lDcnZTM01Ndkp1R1B6SDZ6QWxKTUQvcDN0NW1RaSttWkx4enpRNUhFUmdVcFM4UmJoZVZl
+MjRyMU9aQ3AmIzEzOwplODJVdXhJNU43M284YktmaEhQaG1xYVBiQmNiUTlDb2tQY3FLT0t3Y3VG
+KzAwMWN0OW5XU04yOTBJZzB0YVhUS0YxOHhycHBmNkU9PC9kczpTaWduYXR1cmVWYWx1ZT48ZHM6
+S2V5SW5mbyBJZD0iXzEwODQxMGQ5LTcxNjItNDVkMi05ZTk4LTUyNDA4OWU3ZjI3MyI+PGRzOlg1
+MDlEYXRhPjxkczpYNTA5Q2VydGlmaWNhdGU+TUlJSFh6Q0NCVWVnQXdJQkFnSVVYcUkvdmQxOENh
+Zzk4b05wZHpWN0JpeS82RUF3RFFZSktvWklodmNOQVFFTkJRQXdmREVMTUFrRyYjMTM7CkExVUVC
+aE1DVlZNeFBEQTZCZ05WQkFvTU0wbHVkR1Z5Ym1WMElFTnZjbkJ2Y21GMGFXOXVJR1p2Y2lCQmMz
+TnBaMjVsWkNCT1lXMWwmIzEzOwpjeUJoYm1RZ1RuVnRZbVZ5Y3pFdk1DMEdBMVVFQXd3bVNVTkJU
+azRnVkhKaFpHVnRZWEpySUVOc1pXRnlhVzVuYUc5MWMyVWdVR2xzJiMxMzsKYjNRZ1EwRXdIaGNO
+TWpJeE1URTJNVE15T0RVNVdoY05NamN4TVRFMU1UTXlPRFU1V2pDQjBERUxNQWtHQTFVRUJoTUNR
+a1V4RVRBUCYjMTM7CkJnTlZCQWdUQ0VKeWRYTnpaV3h6TVJJd0VBWURWUVFIRXdsV2FXeDJiMjl5
+WkdVeE16QXhCZ05WQkFvVEtrUmxiRzlwZEhSbElFTnYmIzEzOwpibk4xYkhScGJtY2dZVzVrSUVG
+a2RtbHpiM0o1SUVOV1FrRXZVME5TVERFK01Ed0dBMVVFQXhNMVNVTkJUazRnVkUxRFNDQkJkWFJv
+JiMxMzsKYjNKcGVtVmtJRlJ5WVdSbGJXRnlheUJRYVd4dmRDQldZV3hwWkdGMGIzSWdWbUZzYVdR
+eEpUQWpCZ2txaGtpRzl3MEJDUUVXRm1KbCYjMTM7CmRHMWphSE50WkVCa1pXeHZhWFIwWlM1amIy
+MHdnZ0lpTUEwR0NTcUdTSWIzRFFFQkFRVUFBNElDRHdBd2dnSUtBb0lDQVFDNkZKd3omIzEzOwpL
+cVFWWDZmRzMvRUxSU0dXVjlHckthRk1LbWhXSXhlcHdSWk42TXhNcWtkNURuWWZpVCtXcDk4akVr
+cWdUeDJVTWI5cXVnY0dOVjZnJiMxMzsKMzUvQ3JRYi9GL216M0M0c2ZMTnVEcFNxSzlRRjgrcGFU
+SDZoUW1yT3BxVitVVHZkajlTTWdLR3lGaXpTODhDRFdNeDR3M2k0RkFLZSYjMTM7CjZOUnNKUkdU
+QXRLRHVNSGNBNHNqMDhHamUzbFBXY2dGdmNRTkRWZUVCVHVPSEJHK1JoajdWMUppTkdQLzRlcFRY
+VEZYZ1BGRGdlejMmIzEzOwpZQWZ4cXBidU80VFg2YmJZZGsybnZNTEZ2TEVOa0NGWXVsbllQemdu
+RUJHU01LSWFBSWxiK3NjSEN2V2dXajJUTGd3aDJHSk5jelZNJiMxMzsKMUxQTXFHUytVa2k5TWg3
+OTgyMi94b2FyNDk4eER4Mll4Lzhzd2dFTkxTZ0NzUUFXOG5NZ3dXbjZBYllsMlJBQlh1cmF5RnNu
+NFAxUiYjMTM7CnVRTm1VcC9xclJLUnZTSnIxT0xrSFpmRlRjU1lRYVZpdU1ZUFh6R3o4dG1NTGxt
+SS9CNkFDSDRBd1JNZG5ZdkZPM0tJMVJCblBLSWQmIzEzOwp3d2ZVcFo1SVRJcGJBN0NHZ1R4MXF4
+dE0xd0lVcjdwSGVLUDZqVmUza2RETGcrL0JaMnhNRXRCazVhOFk3QjR2M3h3SFhHVHZWOG1OJiMx
+MzsKMEFnL1N5VC9RVXlFUmhYVXlBTjIrRXdaK1NRQ1V5TmZ6aW9XUTg3OGVHeWtVKzQ2K0JiZ0kz
+SUlyMzZYS1B3bXp0MFNaK0tJM3RuRiYjMTM7ClRsbjltWDBLQzBpZG9qNXlrelBvQy9NSWVkMHNw
+NFRpZ3hFYldOeDdFRjgwUHZSL0RERXdWUEVFa2tqeTYzWEZ1bHhpQ1FJREFRQUImIzEzOwpvNElC
+Z2pDQ0FYNHdEQVlEVlIwVEFRSC9CQUl3QURBT0JnTlZIUThCQWY4RUJBTUNCNEF3SFFZRFZSME9C
+QllFRkhuOXMwREVhMmt2JiMxMzsKZ0UvZUlPVHNxb1c4NU1YRk1JRzZCZ05WSFNNRWdiSXdnYStB
+RkVkN1Q2NTZVWkcxMGIrZE51bUdmellXQktsRm9ZR0FwSDR3ZkRFTCYjMTM7Ck1Ba0dBMVVFQmhN
+Q1ZWTXhQREE2QmdOVkJBb01NMGx1ZEdWeWJtVjBJRU52Y25CdmNtRjBhVzl1SUdadmNpQkJjM05w
+WjI1bFpDQk8mIzEzOwpZVzFsY3lCaGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF3d21TVU5CVGs0
+Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5YVc1bmFHOTFjMlVnJiMxMzsKVUdsc2IzUWdRMEdDRkhwcWJU
+RmVKY1B0VUM5WHV1UEtQc0x3RFIrTU1EUUdBMVVkSHdRdE1Dc3dLYUFub0NXR0kyaDBkSEE2THk5
+aiYjMTM7CmNtd3VhV05oYm00dWIzSm5MM1J0WTJoZmNHbHNiM1F1WTNKc01Fd0dBMVVkSUFSRk1F
+TXdFQVlPS3dZQkJBR0N5UnNCQllNN0RBb3cmIzEzOwpMd1lJS3dZQkJRVUhBZ0V3SXpBaEJnZ3JC
+Z0VGQlFjQ0FSWVZhSFIwY0hNNkx5OWpjSE11YVdOaGJtNHViM0puTUEwR0NTcUdTSWIzJiMxMzsK
+RFFFQkRRVUFBNElDQVFCZFNhdDU2dWVqTG5BakZJRjk1ZGpZV0k2cy8vTjZZWHhzcnJNa0dCUDhF
+ZXpQeWhMaDZhd1A0ejdROVFBSSYjMTM7ClFaa1lveHJsLzF5MCtieVYycW5UVVVDTFJwSy9CRHAv
+aGNmd1BmS0NBLzJSUUNISnJiNit6MGVuRFBGUkswTkttd09jZGxHdFVrMG0mIzEzOwpQZ1dHU0t0
+dXdWc1BBaFRESnVob3NaT2hrTmYrblNPT0hyUU9uMUUycnpPcmQva1FscWlDd1JIOTc5Nk5wVEEr
+SFNNZk9vYkpFRVBxJiMxMzsKdHBGN1A1cWJ3dGw5NVVhNU9wNEFoYTcwSEhmVUZTNEJPUUtMQlZm
+TVpkT1IraVBvaDVPd0FLK2h0WWtGQ0c5UDJXSHU3d2Y4RUMrVyYjMTM7CjdrOTZndlRkOHhFN291
+b2FiVDJ4NllmWXFFbFBIaVUvSU05Z1Z6V1dML3N2WUR5U1Z1b0Z3QmpETk4xY2RxMHFPWVIxeXVT
+MWMvOUQmIzEzOwpGUjdlbzdHRkVDeStUQmQ3SWlLUmZCVmVZR09PUE1ub0ZmeFJMV3Jwc1dObndE
+N2xrUGtMQ2dGQ2srOHlFY09SZzYyNW1vNjV6NHk2JiMxMzsKSjRLOGZvZGE3cXdtWE5QM1JTMThv
+bjZCSHQ4bFErYlhnT0hteElIazBhTzBxTkRxZ3ZMcjJGbHlMR0pHaUVNUnFETU1SNi9hMDZidCYj
+MTM7CmtuVU1IbDdDcU1maklralA0Vk5OeUdQZEpnd1ZrMmtlYjl1TkZ2SkN4VCtNMmZHWFExTmJK
+TmZ0djVNZ1NzcDlOMXkreDZnQTNFaHcmIzEzOwp5SGxtSkI0WU10bzh0VFYxaTg0eFBYeGkyQ0Fl
+RGFHRHV3b3N0OFlVQ1NqcTdSQ0s4dEdjYUFZcmtYUVkyeVFmWDNjd0RzRXhScVZXJiMxMzsKeXJq
+eVJ0K042bUs5OVE9PTwvZHM6WDUwOUNlcnRpZmljYXRlPjwvZHM6WDUwOURhdGE+PC9kczpLZXlJ
+bmZvPjwvZHM6U2lnbmF0dXJlPjwvc21kOnNpZ25lZE1hcms+Cg==
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Agent-Russian/Court-Agent-Russian-Active.smd b/core/src/test/resources/google/registry/tmch/idn/Agent-Russian/Court-Agent-Russian-Active.smd
new file mode 100644
index 000000000..79f2a8bee
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Agent-Russian/Court-Agent-Russian-Active.smd
@@ -0,0 +1,125 @@
+Marks: Марк & записи
+smdID: 000000731669083245271-65535
+U-labels: xn------5cdd5bials4bfv, xn-----6kcc8ahakq0bft, xn---and--3vef9ckanw2cfz, xn---and-43de2cjamu8bfx, xn----7sbb1agajo6afr, xn--and--43de2cjamu8bfx, xn--and-5cdd5bials4bfv, xn--80aaufaim2afp
+notBefore: 2022-11-22T02:14:05.271Z
+notAfter: 2027-10-18T14:16:55.554Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il84M2Iy
+ZGMzNC0xZmJhLTRjNDQtODcxZi1hZGQ0YmIyNjc1YjIiPjxzbWQ6aWQ+MDAwMDAwNzMxNjY5MDgz
+MjQ1MjcxLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMjoxNDowNS4yNzFaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0xOFQxNDoxNjo1NS41NTRaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazpj
+b3VydD48bWFyazppZD4wMDAxNDExNTAzMDY1MzU1MTUwMzA2NTM1NS0xPC9tYXJrOmlkPjxtYXJr
+Om1hcmtOYW1lPtCc0LDRgNC6ICZhbXA7INC30LDQv9C40YHQuDwvbWFyazptYXJrTmFtZT48bWFy
+azpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpvcmc+0JDQs9C10L3RgtGB0YLQstC+
+PC9tYXJrOm9yZz48bWFyazphZGRyPjxtYXJrOnN0cmVldD7Qn9GA0L7RgdC/0LXQutGCINCS0LXR
+gNC90LDQtNGB0LrQvtCz0L4gMTU8L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+0JzQvtGB0LrQstCw
+PC9tYXJrOmNpdHk+PG1hcms6cGM+MTE3NDg1PC9tYXJrOnBjPjxtYXJrOmNjPlJVPC9tYXJrOmNj
+PjwvbWFyazphZGRyPjwvbWFyazpob2xkZXI+PG1hcms6Y29udGFjdCB0eXBlPSJhZ2VudCI+PG1h
+cms6bmFtZT7QndCw0YLQsNC70YzRjyDQkNC90YLQvtC90L7QstCwPC9tYXJrOm5hbWU+PG1hcms6
+b3JnPtCQ0LPQtdC90YLRgdGC0LLQvjwvbWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpzdHJlZXQ+
+0J/RgNC+0YHQv9C10LrRgiDQktC10YDQvdCw0LTRgdC60L7Qs9C+IDE1PC9tYXJrOnN0cmVldD48
+bWFyazpjaXR5PtCc0L7RgdC60LLQsDwvbWFyazpjaXR5PjxtYXJrOnBjPjExNzQ4NTwvbWFyazpw
+Yz48bWFyazpjYz5SVTwvbWFyazpjYz48L21hcms6YWRkcj48bWFyazp2b2ljZT4rNy45MTg4MjIx
+Njc0PC9tYXJrOnZvaWNlPjxtYXJrOmZheD4rNy45MTg4MjIxNjczPC9tYXJrOmZheD48bWFyazpl
+bWFpbD5pbmZvQGFnZW5jeS5ydTwvbWFyazplbWFpbD48L21hcms6Y29udGFjdD48bWFyazpsYWJl
+bD54bi0tLS0tLTVjZGQ1YmlhbHM0YmZ2PC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS0tLS02
+a2NjOGFoYWtxMGJmdDwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tLWFuZC0tM3ZlZjlja2Fu
+dzJjZno8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLS1hbmQtNDNkZTJjamFtdThiZng8L21h
+cms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLS0tN3NiYjFhZ2FqbzZhZnI8L21hcms6bGFiZWw+PG1h
+cms6bGFiZWw+eG4tLWFuZC0tNDNkZTJjamFtdThiZng8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+
+eG4tLWFuZC01Y2RkNWJpYWxzNGJmdjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tODBhYXVm
+YWltMmFmcDwvbWFyazpsYWJlbD48bWFyazpnb29kc0FuZFNlcnZpY2VzPtCz0LjRgtCw0YDQsCA8
+L21hcms6Z29vZHNBbmRTZXJ2aWNlcz48bWFyazpyZWZOdW0+MTIzNDwvbWFyazpyZWZOdW0+PG1h
+cms6cHJvRGF0ZT4yMDEzLTAxLTAxVDAwOjAwOjAwLjAwMFo8L21hcms6cHJvRGF0ZT48bWFyazpj
+Yz5VUzwvbWFyazpjYz48bWFyazpjb3VydE5hbWU+SG92ZTwvbWFyazpjb3VydE5hbWU+PC9tYXJr
+OmNvdXJ0PjwvbWFyazptYXJrPjxkczpTaWduYXR1cmUgeG1sbnM6ZHM9Imh0dHA6Ly93d3cudzMu
+b3JnLzIwMDAvMDkveG1sZHNpZyMiIElkPSJfM2QwYWI2NGQtMzlhMi00NDI0LWJkZmMtYTg5M2Zm
+MmQ4MzljIj48ZHM6U2lnbmVkSW5mbz48ZHM6Q2Fub25pY2FsaXphdGlvbk1ldGhvZCBBbGdvcml0
+aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjxkczpTaWduYXR1
+cmVNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGRzaWctbW9y
+ZSNyc2Etc2hhMjU2Ii8+PGRzOlJlZmVyZW5jZSBVUkk9IiNfODNiMmRjMzQtMWZiYS00YzQ0LTg3
+MWYtYWRkNGJiMjY3NWIyIj48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0i
+aHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48
+ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhj
+LWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRw
+Oi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+ckVL
+bEdCTkIxM0pZK0grSzRsMG94cTdJemxsbEMybEJBbklKdGNKdm9BND08L2RzOkRpZ2VzdFZhbHVl
+PjwvZHM6UmVmZXJlbmNlPjxkczpSZWZlcmVuY2UgVVJJPSIjX2RkYzAyYjhkLTEwMzUtNGFjMy04
+YmE3LWQxMzJhZGEyNzhjZiI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09
+Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jt
+cz48ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94
+bWxlbmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPjRLV0FXMGtqdkJUOUdDbFYrOW9mOTdLL1Bi
+bFE5SHY0OWYyVTlBVSt4dWM9PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48L2RzOlNp
+Z25lZEluZm8+PGRzOlNpZ25hdHVyZVZhbHVlIElkPSJfMzQ1NGRmN2MtYmQyOC00ODgwLTk4N2Ut
+MWJiOWEwMGQ2ZDgwIj5FMGlXdVZnS0J1U1ZiUDJJdC8veVFSWUlxSHFsWXMydzN6cldwbnBKWEVJ
+Q3lteld3cHFxeDVtZ1pNTmhsVkV1SUZrTDJlUkNZOFVLJiMxMzsKVDExZUlPMXM1d1h1R2pma0Vp
+QW5zRDFLZUZaM2IxRWFpTkRHUEkzc1VKRVMzdmV3aFQ0c1NGUXpTRWlPMUtRK2lBWVppSEtzNU55
+YyYjMTM7CjI1THpFTzF1OTBDNVBXUGVRRjJjRXZja2MxYUp6dVp1TnJOMUpxWEFyWTMxaU9LbGVk
+WW44RVhiR3UrN2hhQTduSmR1ZEsyUFVlaUImIzEzOwpVZ2c0V2kwaFFEam1oMWZxSWhKWXJteVl0
+TjFLZEJ5Q2U2VFRySHRGUzR6cUpWcUhrZGRjWklkcGJMQjkvdlQrUnVIN0lxRUdkRjkrJiMxMzsK
+N01LWkloYjF1ek5zelR1ektOYlQ5QlE5UWh4cVFhc2lRMHZvYWIxMEJLd0V3dWU5MjQvVU5JYy9r
+VVErbndtRWNUTjIwR1lUQlhFUSYjMTM7CkF4Q3pvUENTSTQ5UmNNYmpKNnNPUkU3L21EalI5T0Vh
+RkkxNHRnR0Q1N1ZJd3Bra2RUM0xXS3VkNmRUMTl3L0RJV2I3RExwZmNVNDImIzEzOwpHSWhTS1J6
+YzV2OExRMXNOVDlQQ1J6bUJoQTRBOXpuU1NBNW1paXlDMy9kVkRmTDBkS3VrVW40OHFTb3ZpaXU2
+TzM1MkVUT3VhOFkyJiMxMzsKWE1pNFEyelUwOHRJckNUYUF3dHNuelhYakcyNG5NS1lrS0VtelIw
+QzBORFNjVW1xR1B0ZlNiV3FKQkw4aVh6R09nWE1tNUZyR0VhSCYjMTM7CjNQeEFmL2NjbDcxckxz
+U093bEhLYm9peDcvUSs1QlQzVm0zWnIwVS9sYW1JQjczcXJjTlJCdENVRDNIMTZTbHhjZWNZeUVD
+VEVERT08L2RzOlNpZ25hdHVyZVZhbHVlPjxkczpLZXlJbmZvIElkPSJfZGRjMDJiOGQtMTAzNS00
+YWMzLThiYTctZDEzMmFkYTI3OGNmIj48ZHM6WDUwOURhdGE+PGRzOlg1MDlDZXJ0aWZpY2F0ZT5N
+SUlIWHpDQ0JVZWdBd0lCQWdJVVhxSS92ZDE4Q2FnOThvTnBkelY3Qml5LzZFQXdEUVlKS29aSWh2
+Y05BUUVOQlFBd2ZERUxNQWtHJiMxMzsKQTFVRUJoTUNWVk14UERBNkJnTlZCQW9NTTBsdWRHVnli
+bVYwSUVOdmNuQnZjbUYwYVc5dUlHWnZjaUJCYzNOcFoyNWxaQ0JPWVcxbCYjMTM7CmN5QmhibVFn
+VG5WdFltVnljekV2TUMwR0ExVUVBd3dtU1VOQlRrNGdWSEpoWkdWdFlYSnJJRU5zWldGeWFXNW5h
+RzkxYzJVZ1VHbHMmIzEzOwpiM1FnUTBFd0hoY05Nakl4TVRFMk1UTXlPRFU1V2hjTk1qY3hNVEUx
+TVRNeU9EVTVXakNCMERFTE1Ba0dBMVVFQmhNQ1FrVXhFVEFQJiMxMzsKQmdOVkJBZ1RDRUp5ZFhO
+elpXeHpNUkl3RUFZRFZRUUhFd2xXYVd4MmIyOXlaR1V4TXpBeEJnTlZCQW9US2tSbGJHOXBkSFJs
+SUVOdiYjMTM7CmJuTjFiSFJwYm1jZ1lXNWtJRUZrZG1semIzSjVJRU5XUWtFdlUwTlNUREUrTUR3
+R0ExVUVBeE0xU1VOQlRrNGdWRTFEU0NCQmRYUm8mIzEzOwpiM0pwZW1Wa0lGUnlZV1JsYldGeWF5
+QlFhV3h2ZENCV1lXeHBaR0YwYjNJZ1ZtRnNhV1F4SlRBakJna3Foa2lHOXcwQkNRRVdGbUpsJiMx
+MzsKZEcxamFITnRaRUJrWld4dmFYUjBaUzVqYjIwd2dnSWlNQTBHQ1NxR1NJYjNEUUVCQVFVQUE0
+SUNEd0F3Z2dJS0FvSUNBUUM2Rkp3eiYjMTM7CktxUVZYNmZHMy9FTFJTR1dWOUdyS2FGTUttaFdJ
+eGVwd1JaTjZNeE1xa2Q1RG5ZZmlUK1dwOThqRWtxZ1R4MlVNYjlxdWdjR05WNmcmIzEzOwozNS9D
+clFiL0YvbXozQzRzZkxOdURwU3FLOVFGOCtwYVRINmhRbXJPcHFWK1VUdmRqOVNNZ0tHeUZpelM4
+OENEV014NHczaTRGQUtlJiMxMzsKNk5Sc0pSR1RBdEtEdU1IY0E0c2owOEdqZTNsUFdjZ0Z2Y1FO
+RFZlRUJUdU9IQkcrUmhqN1YxSmlOR1AvNGVwVFhURlhnUEZEZ2V6MyYjMTM7CllBZnhxcGJ1TzRU
+WDZiYllkazJudk1MRnZMRU5rQ0ZZdWxuWVB6Z25FQkdTTUtJYUFJbGIrc2NIQ3ZXZ1dqMlRMZ3do
+MkdKTmN6Vk0mIzEzOwoxTFBNcUdTK1VraTlNaDc5ODIyL3hvYXI0OTh4RHgyWXgvOHN3Z0VOTFNn
+Q3NRQVc4bk1nd1duNkFiWWwyUkFCWHVyYXlGc240UDFSJiMxMzsKdVFObVVwL3FyUktSdlNKcjFP
+TGtIWmZGVGNTWVFhVml1TVlQWHpHejh0bU1MbG1JL0I2QUNINEF3Uk1kbll2Rk8zS0kxUkJuUEtJ
+ZCYjMTM7Cnd3ZlVwWjVJVElwYkE3Q0dnVHgxcXh0TTF3SVVyN3BIZUtQNmpWZTNrZERMZysvQloy
+eE1FdEJrNWE4WTdCNHYzeHdIWEdUdlY4bU4mIzEzOwowQWcvU3lUL1FVeUVSaFhVeUFOMitFd1or
+U1FDVXlOZnppb1dRODc4ZUd5a1UrNDYrQmJnSTNJSXIzNlhLUHdtenQwU1orS0kzdG5GJiMxMzsK
+VGxuOW1YMEtDMGlkb2o1eWt6UG9DL01JZWQwc3A0VGlneEViV054N0VGODBQdlIvRERFd1ZQRUVr
+a2p5NjNYRnVseGlDUUlEQVFBQiYjMTM7Cm80SUJnakNDQVg0d0RBWURWUjBUQVFIL0JBSXdBREFP
+QmdOVkhROEJBZjhFQkFNQ0I0QXdIUVlEVlIwT0JCWUVGSG45czBERWEya3YmIzEzOwpnRS9lSU9U
+c3FvVzg1TVhGTUlHNkJnTlZIU01FZ2JJd2dhK0FGRWQ3VDY1NlVaRzEwYitkTnVtR2Z6WVdCS2xG
+b1lHQXBINHdmREVMJiMxMzsKTUFrR0ExVUVCaE1DVlZNeFBEQTZCZ05WQkFvTU0wbHVkR1Z5Ym1W
+MElFTnZjbkJ2Y21GMGFXOXVJR1p2Y2lCQmMzTnBaMjVsWkNCTyYjMTM7CllXMWxjeUJoYm1RZ1Ru
+VnRZbVZ5Y3pFdk1DMEdBMVVFQXd3bVNVTkJUazRnVkhKaFpHVnRZWEpySUVOc1pXRnlhVzVuYUc5
+MWMyVWcmIzEzOwpVR2xzYjNRZ1EwR0NGSHBxYlRGZUpjUHRVQzlYdXVQS1BzTHdEUitNTURRR0Ex
+VWRId1F0TUNzd0thQW5vQ1dHSTJoMGRIQTZMeTlqJiMxMzsKY213dWFXTmhibTR1YjNKbkwzUnRZ
+MmhmY0dsc2IzUXVZM0pzTUV3R0ExVWRJQVJGTUVNd0VBWU9Ld1lCQkFHQ3lSc0JCWU03REFvdyYj
+MTM7Ckx3WUlLd1lCQlFVSEFnRXdJekFoQmdnckJnRUZCUWNDQVJZVmFIUjBjSE02THk5amNITXVh
+V05oYm00dWIzSm5NQTBHQ1NxR1NJYjMmIzEzOwpEUUVCRFFVQUE0SUNBUUJkU2F0NTZ1ZWpMbkFq
+RklGOTVkallXSTZzLy9ONllYeHNyck1rR0JQOEVlelB5aExoNmF3UDR6N1E5UUFJJiMxMzsKUVpr
+WW94cmwvMXkwK2J5VjJxblRVVUNMUnBLL0JEcC9oY2Z3UGZLQ0EvMlJRQ0hKcmI2K3owZW5EUEZS
+SzBOS213T2NkbEd0VWswbSYjMTM7ClBnV0dTS3R1d1ZzUEFoVERKdWhvc1pPaGtOZituU09PSHJR
+T24xRTJyek9yZC9rUWxxaUN3Ukg5Nzk2TnBUQStIU01mT29iSkVFUHEmIzEzOwp0cEY3UDVxYnd0
+bDk1VWE1T3A0QWhhNzBISGZVRlM0Qk9RS0xCVmZNWmRPUitpUG9oNU93QUsraHRZa0ZDRzlQMldI
+dTd3ZjhFQytXJiMxMzsKN2s5Nmd2VGQ4eEU3b3VvYWJUMng2WWZZcUVsUEhpVS9JTTlnVnpXV0wv
+c3ZZRHlTVnVvRndCakROTjFjZHEwcU9ZUjF5dVMxYy85RCYjMTM7CkZSN2VvN0dGRUN5K1RCZDdJ
+aUtSZkJWZVlHT09QTW5vRmZ4UkxXcnBzV05ud0Q3bGtQa0xDZ0ZDays4eUVjT1JnNjI1bW82NXo0
+eTYmIzEzOwpKNEs4Zm9kYTdxd21YTlAzUlMxOG9uNkJIdDhsUStiWGdPSG14SUhrMGFPMHFORHFn
+dkxyMkZseUxHSkdpRU1ScURNTVI2L2EwNmJ0JiMxMzsKa25VTUhsN0NxTWZqSWtqUDRWTk55R1Bk
+Smd3Vmsya2ViOXVORnZKQ3hUK00yZkdYUTFOYkpOZnR2NU1nU3NwOU4xeSt4NmdBM0VodyYjMTM7
+CnlIbG1KQjRZTXRvOHRUVjFpODR4UFh4aTJDQWVEYUdEdXdvc3Q4WVVDU2pxN1JDSzh0R2NhQVly
+a1hRWTJ5UWZYM2N3RHNFeFJxVlcmIzEzOwp5cmp5UnQrTjZtSzk5UT09PC9kczpYNTA5Q2VydGlm
+aWNhdGU+PC9kczpYNTA5RGF0YT48L2RzOktleUluZm8+PC9kczpTaWduYXR1cmU+PC9zbWQ6c2ln
+bmVkTWFyaz4K
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Agent-Russian/Court-Agent-Russian-Revoked.smd b/core/src/test/resources/google/registry/tmch/idn/Agent-Russian/Court-Agent-Russian-Revoked.smd
new file mode 100644
index 000000000..913c6ce65
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Agent-Russian/Court-Agent-Russian-Revoked.smd
@@ -0,0 +1,125 @@
+Marks: Марк & записи
+smdID: 000000731669083181132-65535
+U-labels: xn------5cdd5bials4bfv, xn-----6kcc8ahakq0bft, xn---and--3vef9ckanw2cfz, xn---and-43de2cjamu8bfx, xn----7sbb1agajo6afr, xn--and--43de2cjamu8bfx, xn--and-5cdd5bials4bfv, xn--80aaufaim2afp
+notBefore: 2022-11-22T02:13:01.132Z
+notAfter: 2027-10-18T14:16:55.554Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il8wMzQx
+YzZkZi0zM2UwLTQ3NzgtOTAxZi1iMzA1YTQwZjU1NzEiPjxzbWQ6aWQ+MDAwMDAwNzMxNjY5MDgz
+MTgxMTMyLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMjoxMzowMS4xMzJaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0xOFQxNDoxNjo1NS41NTRaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazpj
+b3VydD48bWFyazppZD4wMDAxNDExNTAzMDY1MzU1MTUwMzA2NTM1NS0xPC9tYXJrOmlkPjxtYXJr
+Om1hcmtOYW1lPtCc0LDRgNC6ICZhbXA7INC30LDQv9C40YHQuDwvbWFyazptYXJrTmFtZT48bWFy
+azpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpvcmc+0JDQs9C10L3RgtGB0YLQstC+
+PC9tYXJrOm9yZz48bWFyazphZGRyPjxtYXJrOnN0cmVldD7Qn9GA0L7RgdC/0LXQutGCINCS0LXR
+gNC90LDQtNGB0LrQvtCz0L4gMTU8L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+0JzQvtGB0LrQstCw
+PC9tYXJrOmNpdHk+PG1hcms6cGM+MTE3NDg1PC9tYXJrOnBjPjxtYXJrOmNjPlJVPC9tYXJrOmNj
+PjwvbWFyazphZGRyPjwvbWFyazpob2xkZXI+PG1hcms6Y29udGFjdCB0eXBlPSJhZ2VudCI+PG1h
+cms6bmFtZT7QndCw0YLQsNC70YzRjyDQkNC90YLQvtC90L7QstCwPC9tYXJrOm5hbWU+PG1hcms6
+b3JnPtCQ0LPQtdC90YLRgdGC0LLQvjwvbWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpzdHJlZXQ+
+0J/RgNC+0YHQv9C10LrRgiDQktC10YDQvdCw0LTRgdC60L7Qs9C+IDE1PC9tYXJrOnN0cmVldD48
+bWFyazpjaXR5PtCc0L7RgdC60LLQsDwvbWFyazpjaXR5PjxtYXJrOnBjPjExNzQ4NTwvbWFyazpw
+Yz48bWFyazpjYz5SVTwvbWFyazpjYz48L21hcms6YWRkcj48bWFyazp2b2ljZT4rNy45MTg4MjIx
+Njc0PC9tYXJrOnZvaWNlPjxtYXJrOmZheD4rNy45MTg4MjIxNjczPC9tYXJrOmZheD48bWFyazpl
+bWFpbD5pbmZvQGFnZW5jeS5ydTwvbWFyazplbWFpbD48L21hcms6Y29udGFjdD48bWFyazpsYWJl
+bD54bi0tLS0tLTVjZGQ1YmlhbHM0YmZ2PC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS0tLS02
+a2NjOGFoYWtxMGJmdDwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tLWFuZC0tM3ZlZjlja2Fu
+dzJjZno8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLS1hbmQtNDNkZTJjamFtdThiZng8L21h
+cms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLS0tN3NiYjFhZ2FqbzZhZnI8L21hcms6bGFiZWw+PG1h
+cms6bGFiZWw+eG4tLWFuZC0tNDNkZTJjamFtdThiZng8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+
+eG4tLWFuZC01Y2RkNWJpYWxzNGJmdjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tODBhYXVm
+YWltMmFmcDwvbWFyazpsYWJlbD48bWFyazpnb29kc0FuZFNlcnZpY2VzPtCz0LjRgtCw0YDQsCA8
+L21hcms6Z29vZHNBbmRTZXJ2aWNlcz48bWFyazpyZWZOdW0+MTIzNDwvbWFyazpyZWZOdW0+PG1h
+cms6cHJvRGF0ZT4yMDEzLTAxLTAxVDAwOjAwOjAwLjAwMFo8L21hcms6cHJvRGF0ZT48bWFyazpj
+Yz5VUzwvbWFyazpjYz48bWFyazpjb3VydE5hbWU+SG92ZTwvbWFyazpjb3VydE5hbWU+PC9tYXJr
+OmNvdXJ0PjwvbWFyazptYXJrPjxkczpTaWduYXR1cmUgeG1sbnM6ZHM9Imh0dHA6Ly93d3cudzMu
+b3JnLzIwMDAvMDkveG1sZHNpZyMiIElkPSJfMWY3ODRiYzItMWRmZi00NjU1LTg3MjgtMWU3ZjQw
+NDAzYmI1Ij48ZHM6U2lnbmVkSW5mbz48ZHM6Q2Fub25pY2FsaXphdGlvbk1ldGhvZCBBbGdvcml0
+aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjxkczpTaWduYXR1
+cmVNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGRzaWctbW9y
+ZSNyc2Etc2hhMjU2Ii8+PGRzOlJlZmVyZW5jZSBVUkk9IiNfMDM0MWM2ZGYtMzNlMC00Nzc4LTkw
+MWYtYjMwNWE0MGY1NTcxIj48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0i
+aHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48
+ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhj
+LWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRw
+Oi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+c1hD
+WTdTbmx2ODhPZldGNUUzTU9iWmt0U2ZhR29TZEwzYTJGMWtySzczRT08L2RzOkRpZ2VzdFZhbHVl
+PjwvZHM6UmVmZXJlbmNlPjxkczpSZWZlcmVuY2UgVVJJPSIjXzI0OTY0MGZmLTdkNGQtNDAyNS1h
+ZDlhLWEwZjVmZjBjNjUzMiI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09
+Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jt
+cz48ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94
+bWxlbmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPmpjbTJVWGkxY3l5djF6Z3VobVN0N1VDTHpo
+MXRLemgzdmoxYXBUNDhuUVk9PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48L2RzOlNp
+Z25lZEluZm8+PGRzOlNpZ25hdHVyZVZhbHVlIElkPSJfNjAzZDBkMTMtMzM3MS00OTBhLWFmODYt
+NjliNWMxMjdjMTk4Ij5STEJGSzBrRHJCSjNQTGplYUZYbGNIbUdGRjVJd0p0TTBZQjYwODhzOTB0
+bEo1MnBKc1VpQWR4cE0ybzg4MFl2d1NzKzh1VmlaTjVhJiMxMzsKT05LUUJPZFl3QUFwTkhydG94
+a1lzVHpkOTNWYVZ3SW04OG9WaGcva2JWaDhJS2Q1OUlnemVBOHdHQlFOQWdHK2sweWpUQWJMdTJ3
+diYjMTM7CjU1bndmditFUDQ4K2V0a1lhb0U3dkJyT2JwQXByd3AyUUdSQTVWQldXT29LamVQRjBv
+MEZ2R3hoUlpUa1pwTEQ1dGRSSEdOYU5ENEkmIzEzOwpSanU3QW9nRG1KbnYyRUtqeGNkdXZoYjRk
+dlI1dzU5ZkJWaFpYVTV1MWNuR3JqZ0prVUVOYitTNmtzSFRScEliMy83enBlVHhDZ3hvJiMxMzsK
+b2J1OERtcngyOUJ1S2NmdzFBbEQ0UG5wU005bUE4ZThLNGpza25hY0owd3VJMk5MY0haOUdNUkc0
+UTFhajVVcUM3aDRVRlpnSU1mbSYjMTM7CmtsVjF1YWRaajNsYWhKMGQ3SFFxeDNCd21ZYWlLMFRl
+K043RlFXYUo1SDgzN1RoWmIwNll6Tm5uZG5DTkNJZ2ZqWEdmTXE0UC84dVAmIzEzOwo1cEQyRjkr
+emFualhwWWtrUUo3eVVPcFRqKzczWG5uYmZjd0FqUTFqN0RjVFNOZHhXcjQ0cXc1SUpNZkR3bG56
+S3pLSVZQWjBJbXVPJiMxMzsKTG5jbzlqdzZLdFpIc1NaSmVKN3Bad0swbGRFSzVpd0R2Vm04Y3oz
+ZzZYQU14SUJiUUxkcmRJR3IyMVlhc2VpS242dFlJQXI4M2s1KyYjMTM7CkFDa2ZIMVNzZDlYb2I4
+OW9aK1ZpNGM3T0VDR0JER0pnUGg2MWdWQTNITFNmUnZhTUJadGxmUGsrTHNFWXBoa21LNGhwT2VC
+Szk4TT08L2RzOlNpZ25hdHVyZVZhbHVlPjxkczpLZXlJbmZvIElkPSJfMjQ5NjQwZmYtN2Q0ZC00
+MDI1LWFkOWEtYTBmNWZmMGM2NTMyIj48ZHM6WDUwOURhdGE+PGRzOlg1MDlDZXJ0aWZpY2F0ZT5N
+SUlIWHpDQ0JVZWdBd0lCQWdJVVhxSS92ZDE4Q2FnOThvTnBkelY3Qml5LzZFQXdEUVlKS29aSWh2
+Y05BUUVOQlFBd2ZERUxNQWtHJiMxMzsKQTFVRUJoTUNWVk14UERBNkJnTlZCQW9NTTBsdWRHVnli
+bVYwSUVOdmNuQnZjbUYwYVc5dUlHWnZjaUJCYzNOcFoyNWxaQ0JPWVcxbCYjMTM7CmN5QmhibVFn
+VG5WdFltVnljekV2TUMwR0ExVUVBd3dtU1VOQlRrNGdWSEpoWkdWdFlYSnJJRU5zWldGeWFXNW5h
+RzkxYzJVZ1VHbHMmIzEzOwpiM1FnUTBFd0hoY05Nakl4TVRFMk1UTXlPRFU1V2hjTk1qY3hNVEUx
+TVRNeU9EVTVXakNCMERFTE1Ba0dBMVVFQmhNQ1FrVXhFVEFQJiMxMzsKQmdOVkJBZ1RDRUp5ZFhO
+elpXeHpNUkl3RUFZRFZRUUhFd2xXYVd4MmIyOXlaR1V4TXpBeEJnTlZCQW9US2tSbGJHOXBkSFJs
+SUVOdiYjMTM7CmJuTjFiSFJwYm1jZ1lXNWtJRUZrZG1semIzSjVJRU5XUWtFdlUwTlNUREUrTUR3
+R0ExVUVBeE0xU1VOQlRrNGdWRTFEU0NCQmRYUm8mIzEzOwpiM0pwZW1Wa0lGUnlZV1JsYldGeWF5
+QlFhV3h2ZENCV1lXeHBaR0YwYjNJZ1ZtRnNhV1F4SlRBakJna3Foa2lHOXcwQkNRRVdGbUpsJiMx
+MzsKZEcxamFITnRaRUJrWld4dmFYUjBaUzVqYjIwd2dnSWlNQTBHQ1NxR1NJYjNEUUVCQVFVQUE0
+SUNEd0F3Z2dJS0FvSUNBUUM2Rkp3eiYjMTM7CktxUVZYNmZHMy9FTFJTR1dWOUdyS2FGTUttaFdJ
+eGVwd1JaTjZNeE1xa2Q1RG5ZZmlUK1dwOThqRWtxZ1R4MlVNYjlxdWdjR05WNmcmIzEzOwozNS9D
+clFiL0YvbXozQzRzZkxOdURwU3FLOVFGOCtwYVRINmhRbXJPcHFWK1VUdmRqOVNNZ0tHeUZpelM4
+OENEV014NHczaTRGQUtlJiMxMzsKNk5Sc0pSR1RBdEtEdU1IY0E0c2owOEdqZTNsUFdjZ0Z2Y1FO
+RFZlRUJUdU9IQkcrUmhqN1YxSmlOR1AvNGVwVFhURlhnUEZEZ2V6MyYjMTM7CllBZnhxcGJ1TzRU
+WDZiYllkazJudk1MRnZMRU5rQ0ZZdWxuWVB6Z25FQkdTTUtJYUFJbGIrc2NIQ3ZXZ1dqMlRMZ3do
+MkdKTmN6Vk0mIzEzOwoxTFBNcUdTK1VraTlNaDc5ODIyL3hvYXI0OTh4RHgyWXgvOHN3Z0VOTFNn
+Q3NRQVc4bk1nd1duNkFiWWwyUkFCWHVyYXlGc240UDFSJiMxMzsKdVFObVVwL3FyUktSdlNKcjFP
+TGtIWmZGVGNTWVFhVml1TVlQWHpHejh0bU1MbG1JL0I2QUNINEF3Uk1kbll2Rk8zS0kxUkJuUEtJ
+ZCYjMTM7Cnd3ZlVwWjVJVElwYkE3Q0dnVHgxcXh0TTF3SVVyN3BIZUtQNmpWZTNrZERMZysvQloy
+eE1FdEJrNWE4WTdCNHYzeHdIWEdUdlY4bU4mIzEzOwowQWcvU3lUL1FVeUVSaFhVeUFOMitFd1or
+U1FDVXlOZnppb1dRODc4ZUd5a1UrNDYrQmJnSTNJSXIzNlhLUHdtenQwU1orS0kzdG5GJiMxMzsK
+VGxuOW1YMEtDMGlkb2o1eWt6UG9DL01JZWQwc3A0VGlneEViV054N0VGODBQdlIvRERFd1ZQRUVr
+a2p5NjNYRnVseGlDUUlEQVFBQiYjMTM7Cm80SUJnakNDQVg0d0RBWURWUjBUQVFIL0JBSXdBREFP
+QmdOVkhROEJBZjhFQkFNQ0I0QXdIUVlEVlIwT0JCWUVGSG45czBERWEya3YmIzEzOwpnRS9lSU9U
+c3FvVzg1TVhGTUlHNkJnTlZIU01FZ2JJd2dhK0FGRWQ3VDY1NlVaRzEwYitkTnVtR2Z6WVdCS2xG
+b1lHQXBINHdmREVMJiMxMzsKTUFrR0ExVUVCaE1DVlZNeFBEQTZCZ05WQkFvTU0wbHVkR1Z5Ym1W
+MElFTnZjbkJ2Y21GMGFXOXVJR1p2Y2lCQmMzTnBaMjVsWkNCTyYjMTM7CllXMWxjeUJoYm1RZ1Ru
+VnRZbVZ5Y3pFdk1DMEdBMVVFQXd3bVNVTkJUazRnVkhKaFpHVnRZWEpySUVOc1pXRnlhVzVuYUc5
+MWMyVWcmIzEzOwpVR2xzYjNRZ1EwR0NGSHBxYlRGZUpjUHRVQzlYdXVQS1BzTHdEUitNTURRR0Ex
+VWRId1F0TUNzd0thQW5vQ1dHSTJoMGRIQTZMeTlqJiMxMzsKY213dWFXTmhibTR1YjNKbkwzUnRZ
+MmhmY0dsc2IzUXVZM0pzTUV3R0ExVWRJQVJGTUVNd0VBWU9Ld1lCQkFHQ3lSc0JCWU03REFvdyYj
+MTM7Ckx3WUlLd1lCQlFVSEFnRXdJekFoQmdnckJnRUZCUWNDQVJZVmFIUjBjSE02THk5amNITXVh
+V05oYm00dWIzSm5NQTBHQ1NxR1NJYjMmIzEzOwpEUUVCRFFVQUE0SUNBUUJkU2F0NTZ1ZWpMbkFq
+RklGOTVkallXSTZzLy9ONllYeHNyck1rR0JQOEVlelB5aExoNmF3UDR6N1E5UUFJJiMxMzsKUVpr
+WW94cmwvMXkwK2J5VjJxblRVVUNMUnBLL0JEcC9oY2Z3UGZLQ0EvMlJRQ0hKcmI2K3owZW5EUEZS
+SzBOS213T2NkbEd0VWswbSYjMTM7ClBnV0dTS3R1d1ZzUEFoVERKdWhvc1pPaGtOZituU09PSHJR
+T24xRTJyek9yZC9rUWxxaUN3Ukg5Nzk2TnBUQStIU01mT29iSkVFUHEmIzEzOwp0cEY3UDVxYnd0
+bDk1VWE1T3A0QWhhNzBISGZVRlM0Qk9RS0xCVmZNWmRPUitpUG9oNU93QUsraHRZa0ZDRzlQMldI
+dTd3ZjhFQytXJiMxMzsKN2s5Nmd2VGQ4eEU3b3VvYWJUMng2WWZZcUVsUEhpVS9JTTlnVnpXV0wv
+c3ZZRHlTVnVvRndCakROTjFjZHEwcU9ZUjF5dVMxYy85RCYjMTM7CkZSN2VvN0dGRUN5K1RCZDdJ
+aUtSZkJWZVlHT09QTW5vRmZ4UkxXcnBzV05ud0Q3bGtQa0xDZ0ZDays4eUVjT1JnNjI1bW82NXo0
+eTYmIzEzOwpKNEs4Zm9kYTdxd21YTlAzUlMxOG9uNkJIdDhsUStiWGdPSG14SUhrMGFPMHFORHFn
+dkxyMkZseUxHSkdpRU1ScURNTVI2L2EwNmJ0JiMxMzsKa25VTUhsN0NxTWZqSWtqUDRWTk55R1Bk
+Smd3Vmsya2ViOXVORnZKQ3hUK00yZkdYUTFOYkpOZnR2NU1nU3NwOU4xeSt4NmdBM0VodyYjMTM7
+CnlIbG1KQjRZTXRvOHRUVjFpODR4UFh4aTJDQWVEYUdEdXdvc3Q4WVVDU2pxN1JDSzh0R2NhQVly
+a1hRWTJ5UWZYM2N3RHNFeFJxVlcmIzEzOwp5cmp5UnQrTjZtSzk5UT09PC9kczpYNTA5Q2VydGlm
+aWNhdGU+PC9kczpYNTA5RGF0YT48L2RzOktleUluZm8+PC9kczpTaWduYXR1cmU+PC9zbWQ6c2ln
+bmVkTWFyaz4K
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Agent-Russian/Trademark-Agent-Russian-Active.smd b/core/src/test/resources/google/registry/tmch/idn/Agent-Russian/Trademark-Agent-Russian-Active.smd
new file mode 100644
index 000000000..f1b3c8503
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Agent-Russian/Trademark-Agent-Russian-Active.smd
@@ -0,0 +1,127 @@
+Marks: суда & ошибки
+smdID: 000000741669083249178-65535
+U-labels: xn------5cdin6abr1b1ay5e, xn-----6kcgl1abp7azaw9d, xn---and--3vemr6bbv9b5a2a7f, xn---and-43dkp1bbt5b3a0a1f, xn----7sbejwbn3axu3d, xn--and--43dkp1bbt5b3a0a1f, xn--and-5cdin6abr1b1ay5e, xn--et--5cdin6abr1b1ay5e, xn--et-6kcgl1abp7azaw9d, xn--80achrblzvs7c
+notBefore: 2022-11-22T02:14:09.178Z
+notAfter: 2027-10-18T14:16:55.554Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il8wMzg4
+YWJjNy01NmQ4LTRmYTQtOTg1My0xYzJkZTg3MDU3YTEiPjxzbWQ6aWQ+MDAwMDAwNzQxNjY5MDgz
+MjQ5MTc4LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMjoxNDowOS4xNzhaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0xOFQxNDoxNjo1NS41NTRaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
+cmFkZW1hcms+PG1hcms6aWQ+MDAwMTQxMTUwMzA2NTU1MDE1MDMwNjU1NTAtMTwvbWFyazppZD48
+bWFyazptYXJrTmFtZT7RgdGD0LTQsCAmYW1wOyDQvtGI0LjQsdC60Lg8L21hcms6bWFya05hbWU+
+PG1hcms6aG9sZGVyIGVudGl0bGVtZW50PSJvd25lciI+PG1hcms6b3JnPtCQ0LPQtdC90YLRgdGC
+0LLQvjwvbWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpzdHJlZXQ+0J/RgNC+0YHQv9C10LrRgiDQ
+ktC10YDQvdCw0LTRgdC60L7Qs9C+IDE1PC9tYXJrOnN0cmVldD48bWFyazpjaXR5PtCc0L7RgdC6
+0LLQsDwvbWFyazpjaXR5PjxtYXJrOnBjPjExNzQ4NTwvbWFyazpwYz48bWFyazpjYz5SVTwvbWFy
+azpjYz48L21hcms6YWRkcj48L21hcms6aG9sZGVyPjxtYXJrOmNvbnRhY3QgdHlwZT0iYWdlbnQi
+PjxtYXJrOm5hbWU+0J3QsNGC0LDQu9GM0Y8g0JDQvdGC0L7QvdC+0LLQsDwvbWFyazpuYW1lPjxt
+YXJrOm9yZz7QkNCz0LXQvdGC0YHRgtCy0L48L21hcms6b3JnPjxtYXJrOmFkZHI+PG1hcms6c3Ry
+ZWV0PtCf0YDQvtGB0L/QtdC60YIg0JLQtdGA0L3QsNC00YHQutC+0LPQviAxNTwvbWFyazpzdHJl
+ZXQ+PG1hcms6Y2l0eT7QnNC+0YHQutCy0LA8L21hcms6Y2l0eT48bWFyazpwYz4xMTc0ODU8L21h
+cms6cGM+PG1hcms6Y2M+UlU8L21hcms6Y2M+PC9tYXJrOmFkZHI+PG1hcms6dm9pY2U+KzcuOTE4
+ODIyMTY3NDwvbWFyazp2b2ljZT48bWFyazpmYXg+KzcuOTE4ODIyMTY3MzwvbWFyazpmYXg+PG1h
+cms6ZW1haWw+aW5mb0BhZ2VuY3kucnU8L21hcms6ZW1haWw+PC9tYXJrOmNvbnRhY3Q+PG1hcms6
+anVyaXNkaWN0aW9uPlVTPC9tYXJrOmp1cmlzZGljdGlvbj48bWFyazpjbGFzcz4xNTwvbWFyazpj
+bGFzcz48bWFyazpsYWJlbD54bi0tLS0tLTVjZGluNmFicjFiMWF5NWU8L21hcms6bGFiZWw+PG1h
+cms6bGFiZWw+eG4tLS0tLTZrY2dsMWFicDdhemF3OWQ8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+
+eG4tLS1hbmQtLTN2ZW1yNmJidjliNWEyYTdmPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS0t
+YW5kLTQzZGtwMWJidDViM2EwYTFmPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS0tLTdzYmVq
+d2JuM2F4dTNkPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1hbmQtLTQzZGtwMWJidDViM2Ew
+YTFmPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1hbmQtNWNkaW42YWJyMWIxYXk1ZTwvbWFy
+azpsYWJlbD48bWFyazpsYWJlbD54bi0tZXQtLTVjZGluNmFicjFiMWF5NWU8L21hcms6bGFiZWw+
+PG1hcms6bGFiZWw+eG4tLWV0LTZrY2dsMWFicDdhemF3OWQ8L21hcms6bGFiZWw+PG1hcms6bGFi
+ZWw+eG4tLTgwYWNocmJsenZzN2M8L21hcms6bGFiZWw+PG1hcms6Z29vZHNBbmRTZXJ2aWNlcz7Q
+s9C40YLQsNGA0LAgPC9tYXJrOmdvb2RzQW5kU2VydmljZXM+PG1hcms6cmVnTnVtPjEyMzQ8L21h
+cms6cmVnTnVtPjxtYXJrOnJlZ0RhdGU+MjAxMy0wMS0wMVQwMDowMDowMC4wMDBaPC9tYXJrOnJl
+Z0RhdGU+PC9tYXJrOnRyYWRlbWFyaz48L21hcms6bWFyaz48ZHM6U2lnbmF0dXJlIHhtbG5zOmRz
+PSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjIiBJZD0iXzhkN2ZmNjcyLWNmODct
+NDc5Yy1iYzlmLTk0MDBjMWQ0MDNjYyI+PGRzOlNpZ25lZEluZm8+PGRzOkNhbm9uaWNhbGl6YXRp
+b25NZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0
+biMiLz48ZHM6U2lnbmF0dXJlTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAw
+MS8wNC94bWxkc2lnLW1vcmUjcnNhLXNoYTI1NiIvPjxkczpSZWZlcmVuY2UgVVJJPSIjXzAzODhh
+YmM3LTU2ZDgtNGZhNC05ODUzLTFjMmRlODcwNTdhMSI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5z
+Zm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1sZHNpZyNlbnZlbG9w
+ZWQtc2lnbmF0dXJlIi8+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3Jn
+LzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6RGlnZXN0TWV0aG9k
+IEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxlbmMjc2hhMjU2Ii8+PGRz
+OkRpZ2VzdFZhbHVlPkNhVlR2RzkxM3BBMm5kem1ycStVaWptTlFBUUtoZEwva082bDgyS3J6YTQ9
+PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48ZHM6UmVmZXJlbmNlIFVSST0iI183ZWY4
+NDBmZi1mN2E5LTRlNjctYWU2Yi00Nzc5YTA3MmM4YmIiPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFu
+c2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMi
+Lz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cu
+dzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1ZT5pRG52M3I3ZXg4
+b0svMC90MzN4NXM1Y3c5VlA5TklTaDJqTThDdlZvb0tBPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpS
+ZWZlcmVuY2U+PC9kczpTaWduZWRJbmZvPjxkczpTaWduYXR1cmVWYWx1ZSBJZD0iXzA0MzRhNDU4
+LTVmYzYtNGEzNy05MWI1LWFmM2I4MDVlODMxYiI+R2g3OFR5alJOT2xtU2IwL2JYK1p1c0pJNGJQ
+TW9zTGxnOUs3UGdHb3U4OWVMU0tXVk9NMVhKU1FZWWlCbDg4Y1RVdmt4cG9ZTmdCdSYjMTM7CkxF
+NlJ3enE4MW5hbG5EMktSYWRqeHBmVkFCZlhqQ1A5VStMUHRNSklOVDZZeVpac0NUZ3R4WU5ZWWRy
+TzFaSHEzaWYzbTVtNi9pT3ImIzEzOwpnaTErc09kVytWMlpFbU9GdFNnTDdra3RrVVdKS1paMWZw
+TkUxaG1nVWJLR1dYZlBibDU1QXhudzMrY1B0RFpVUjIxbTJ5SHBOemgxJiMxMzsKT0Z1eHU0MGdR
+cEx2a0RzTFJyenpWK3N2VlhtdWwrUElsUDZsSk1HSldjUVE3Q0haZVpCUk5ucThtbWJvZnFnT2ow
+MFNrVkF4NnNNMiYjMTM7CmVpV3JIUHNZREZqMmI3NGViUCtkbnUyZXhQaFJoSE5IV0ZsMklLRnEz
+ZzhYQ3VUSU5TOVBvL2xpbVQ2aVZJb0J2Y2FRZFl6Vk5iZk0mIzEzOworUUFGZHZvZ0wydGF5Tk5B
+R1VoQVRFcFBkY1FXWUZQaWFucVpFV28yenZ5SGowTkxjcFBvY1NuZFc1YXBhd04rTGRwRVpBTWdt
+aktCJiMxMzsKSW9FeHlobWJ4WXFYN3BJZmg3ZzZIUUZ6ZFFMZlAzNWhVNEpvQndqZEZQSTJtTk5k
+aU1BbmRGVXdLL04zRGo3SEFyQnJJR00zV2VORSYjMTM7Ck4yOGhOZzVnemdQRUIrdXFBZDFOcEhk
+NTF2azhOZGdpbDhCQW53MURqZkUvaU40eWMwZTRzNnF2dmRZSVljdVJxWFV4RkZ2WEhJdzAmIzEz
+OwpTaVNpY2s2OTIyWmZPdWJ5Q0M2TE9wNStVVXk0bXp2VldRYngySHNhUjZWS0N4eVpva3ZnOE1P
+cFJpTGxJUkdENlBReXJhTjdzQ2s9PC9kczpTaWduYXR1cmVWYWx1ZT48ZHM6S2V5SW5mbyBJZD0i
+XzdlZjg0MGZmLWY3YTktNGU2Ny1hZTZiLTQ3NzlhMDcyYzhiYiI+PGRzOlg1MDlEYXRhPjxkczpY
+NTA5Q2VydGlmaWNhdGU+TUlJSFh6Q0NCVWVnQXdJQkFnSVVYcUkvdmQxOENhZzk4b05wZHpWN0Jp
+eS82RUF3RFFZSktvWklodmNOQVFFTkJRQXdmREVMTUFrRyYjMTM7CkExVUVCaE1DVlZNeFBEQTZC
+Z05WQkFvTU0wbHVkR1Z5Ym1WMElFTnZjbkJ2Y21GMGFXOXVJR1p2Y2lCQmMzTnBaMjVsWkNCT1lX
+MWwmIzEzOwpjeUJoYm1RZ1RuVnRZbVZ5Y3pFdk1DMEdBMVVFQXd3bVNVTkJUazRnVkhKaFpHVnRZ
+WEpySUVOc1pXRnlhVzVuYUc5MWMyVWdVR2xzJiMxMzsKYjNRZ1EwRXdIaGNOTWpJeE1URTJNVE15
+T0RVNVdoY05NamN4TVRFMU1UTXlPRFU1V2pDQjBERUxNQWtHQTFVRUJoTUNRa1V4RVRBUCYjMTM7
+CkJnTlZCQWdUQ0VKeWRYTnpaV3h6TVJJd0VBWURWUVFIRXdsV2FXeDJiMjl5WkdVeE16QXhCZ05W
+QkFvVEtrUmxiRzlwZEhSbElFTnYmIzEzOwpibk4xYkhScGJtY2dZVzVrSUVGa2RtbHpiM0o1SUVO
+V1FrRXZVME5TVERFK01Ed0dBMVVFQXhNMVNVTkJUazRnVkUxRFNDQkJkWFJvJiMxMzsKYjNKcGVt
+VmtJRlJ5WVdSbGJXRnlheUJRYVd4dmRDQldZV3hwWkdGMGIzSWdWbUZzYVdReEpUQWpCZ2txaGtp
+Rzl3MEJDUUVXRm1KbCYjMTM7CmRHMWphSE50WkVCa1pXeHZhWFIwWlM1amIyMHdnZ0lpTUEwR0NT
+cUdTSWIzRFFFQkFRVUFBNElDRHdBd2dnSUtBb0lDQVFDNkZKd3omIzEzOwpLcVFWWDZmRzMvRUxS
+U0dXVjlHckthRk1LbWhXSXhlcHdSWk42TXhNcWtkNURuWWZpVCtXcDk4akVrcWdUeDJVTWI5cXVn
+Y0dOVjZnJiMxMzsKMzUvQ3JRYi9GL216M0M0c2ZMTnVEcFNxSzlRRjgrcGFUSDZoUW1yT3BxVitV
+VHZkajlTTWdLR3lGaXpTODhDRFdNeDR3M2k0RkFLZSYjMTM7CjZOUnNKUkdUQXRLRHVNSGNBNHNq
+MDhHamUzbFBXY2dGdmNRTkRWZUVCVHVPSEJHK1JoajdWMUppTkdQLzRlcFRYVEZYZ1BGRGdlejMm
+IzEzOwpZQWZ4cXBidU80VFg2YmJZZGsybnZNTEZ2TEVOa0NGWXVsbllQemduRUJHU01LSWFBSWxi
+K3NjSEN2V2dXajJUTGd3aDJHSk5jelZNJiMxMzsKMUxQTXFHUytVa2k5TWg3OTgyMi94b2FyNDk4
+eER4Mll4Lzhzd2dFTkxTZ0NzUUFXOG5NZ3dXbjZBYllsMlJBQlh1cmF5RnNuNFAxUiYjMTM7CnVR
+Tm1VcC9xclJLUnZTSnIxT0xrSFpmRlRjU1lRYVZpdU1ZUFh6R3o4dG1NTGxtSS9CNkFDSDRBd1JN
+ZG5ZdkZPM0tJMVJCblBLSWQmIzEzOwp3d2ZVcFo1SVRJcGJBN0NHZ1R4MXF4dE0xd0lVcjdwSGVL
+UDZqVmUza2RETGcrL0JaMnhNRXRCazVhOFk3QjR2M3h3SFhHVHZWOG1OJiMxMzsKMEFnL1N5VC9R
+VXlFUmhYVXlBTjIrRXdaK1NRQ1V5TmZ6aW9XUTg3OGVHeWtVKzQ2K0JiZ0kzSUlyMzZYS1B3bXp0
+MFNaK0tJM3RuRiYjMTM7ClRsbjltWDBLQzBpZG9qNXlrelBvQy9NSWVkMHNwNFRpZ3hFYldOeDdF
+RjgwUHZSL0RERXdWUEVFa2tqeTYzWEZ1bHhpQ1FJREFRQUImIzEzOwpvNElCZ2pDQ0FYNHdEQVlE
+VlIwVEFRSC9CQUl3QURBT0JnTlZIUThCQWY4RUJBTUNCNEF3SFFZRFZSME9CQllFRkhuOXMwREVh
+Mmt2JiMxMzsKZ0UvZUlPVHNxb1c4NU1YRk1JRzZCZ05WSFNNRWdiSXdnYStBRkVkN1Q2NTZVWkcx
+MGIrZE51bUdmellXQktsRm9ZR0FwSDR3ZkRFTCYjMTM7Ck1Ba0dBMVVFQmhNQ1ZWTXhQREE2QmdO
+VkJBb01NMGx1ZEdWeWJtVjBJRU52Y25CdmNtRjBhVzl1SUdadmNpQkJjM05wWjI1bFpDQk8mIzEz
+OwpZVzFsY3lCaGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF3d21TVU5CVGs0Z1ZISmhaR1Z0WVhK
+cklFTnNaV0Z5YVc1bmFHOTFjMlVnJiMxMzsKVUdsc2IzUWdRMEdDRkhwcWJURmVKY1B0VUM5WHV1
+UEtQc0x3RFIrTU1EUUdBMVVkSHdRdE1Dc3dLYUFub0NXR0kyaDBkSEE2THk5aiYjMTM7CmNtd3Vh
+V05oYm00dWIzSm5MM1J0WTJoZmNHbHNiM1F1WTNKc01Fd0dBMVVkSUFSRk1FTXdFQVlPS3dZQkJB
+R0N5UnNCQllNN0RBb3cmIzEzOwpMd1lJS3dZQkJRVUhBZ0V3SXpBaEJnZ3JCZ0VGQlFjQ0FSWVZh
+SFIwY0hNNkx5OWpjSE11YVdOaGJtNHViM0puTUEwR0NTcUdTSWIzJiMxMzsKRFFFQkRRVUFBNElD
+QVFCZFNhdDU2dWVqTG5BakZJRjk1ZGpZV0k2cy8vTjZZWHhzcnJNa0dCUDhFZXpQeWhMaDZhd1A0
+ejdROVFBSSYjMTM7ClFaa1lveHJsLzF5MCtieVYycW5UVVVDTFJwSy9CRHAvaGNmd1BmS0NBLzJS
+UUNISnJiNit6MGVuRFBGUkswTkttd09jZGxHdFVrMG0mIzEzOwpQZ1dHU0t0dXdWc1BBaFRESnVo
+b3NaT2hrTmYrblNPT0hyUU9uMUUycnpPcmQva1FscWlDd1JIOTc5Nk5wVEErSFNNZk9vYkpFRVBx
+JiMxMzsKdHBGN1A1cWJ3dGw5NVVhNU9wNEFoYTcwSEhmVUZTNEJPUUtMQlZmTVpkT1IraVBvaDVP
+d0FLK2h0WWtGQ0c5UDJXSHU3d2Y4RUMrVyYjMTM7CjdrOTZndlRkOHhFN291b2FiVDJ4NllmWXFF
+bFBIaVUvSU05Z1Z6V1dML3N2WUR5U1Z1b0Z3QmpETk4xY2RxMHFPWVIxeXVTMWMvOUQmIzEzOwpG
+UjdlbzdHRkVDeStUQmQ3SWlLUmZCVmVZR09PUE1ub0ZmeFJMV3Jwc1dObndEN2xrUGtMQ2dGQ2sr
+OHlFY09SZzYyNW1vNjV6NHk2JiMxMzsKSjRLOGZvZGE3cXdtWE5QM1JTMThvbjZCSHQ4bFErYlhn
+T0hteElIazBhTzBxTkRxZ3ZMcjJGbHlMR0pHaUVNUnFETU1SNi9hMDZidCYjMTM7CmtuVU1IbDdD
+cU1maklralA0Vk5OeUdQZEpnd1ZrMmtlYjl1TkZ2SkN4VCtNMmZHWFExTmJKTmZ0djVNZ1NzcDlO
+MXkreDZnQTNFaHcmIzEzOwp5SGxtSkI0WU10bzh0VFYxaTg0eFBYeGkyQ0FlRGFHRHV3b3N0OFlV
+Q1NqcTdSQ0s4dEdjYUFZcmtYUVkyeVFmWDNjd0RzRXhScVZXJiMxMzsKeXJqeVJ0K042bUs5OVE9
+PTwvZHM6WDUwOUNlcnRpZmljYXRlPjwvZHM6WDUwOURhdGE+PC9kczpLZXlJbmZvPjwvZHM6U2ln
+bmF0dXJlPjwvc21kOnNpZ25lZE1hcms+Cg==
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Agent-Russian/Trademark-Agent-Russian-Revoked.smd b/core/src/test/resources/google/registry/tmch/idn/Agent-Russian/Trademark-Agent-Russian-Revoked.smd
new file mode 100644
index 000000000..c9db23c26
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Agent-Russian/Trademark-Agent-Russian-Revoked.smd
@@ -0,0 +1,127 @@
+Marks: суда & ошибки
+smdID: 000000741669083185092-65535
+U-labels: xn------5cdin6abr1b1ay5e, xn-----6kcgl1abp7azaw9d, xn---and--3vemr6bbv9b5a2a7f, xn---and-43dkp1bbt5b3a0a1f, xn----7sbejwbn3axu3d, xn--and--43dkp1bbt5b3a0a1f, xn--and-5cdin6abr1b1ay5e, xn--et--5cdin6abr1b1ay5e, xn--et-6kcgl1abp7azaw9d, xn--80achrblzvs7c
+notBefore: 2022-11-22T02:13:05.092Z
+notAfter: 2027-10-18T14:16:55.554Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il8xZjUy
+OGY2OC05YzgxLTRkZGMtOWI3OC0xYzhiOTkyYzA2YzkiPjxzbWQ6aWQ+MDAwMDAwNzQxNjY5MDgz
+MTg1MDkyLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMjoxMzowNS4wOTJaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0xOFQxNDoxNjo1NS41NTRaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
+cmFkZW1hcms+PG1hcms6aWQ+MDAwMTQxMTUwMzA2NTU1MDE1MDMwNjU1NTAtMTwvbWFyazppZD48
+bWFyazptYXJrTmFtZT7RgdGD0LTQsCAmYW1wOyDQvtGI0LjQsdC60Lg8L21hcms6bWFya05hbWU+
+PG1hcms6aG9sZGVyIGVudGl0bGVtZW50PSJvd25lciI+PG1hcms6b3JnPtCQ0LPQtdC90YLRgdGC
+0LLQvjwvbWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpzdHJlZXQ+0J/RgNC+0YHQv9C10LrRgiDQ
+ktC10YDQvdCw0LTRgdC60L7Qs9C+IDE1PC9tYXJrOnN0cmVldD48bWFyazpjaXR5PtCc0L7RgdC6
+0LLQsDwvbWFyazpjaXR5PjxtYXJrOnBjPjExNzQ4NTwvbWFyazpwYz48bWFyazpjYz5SVTwvbWFy
+azpjYz48L21hcms6YWRkcj48L21hcms6aG9sZGVyPjxtYXJrOmNvbnRhY3QgdHlwZT0iYWdlbnQi
+PjxtYXJrOm5hbWU+0J3QsNGC0LDQu9GM0Y8g0JDQvdGC0L7QvdC+0LLQsDwvbWFyazpuYW1lPjxt
+YXJrOm9yZz7QkNCz0LXQvdGC0YHRgtCy0L48L21hcms6b3JnPjxtYXJrOmFkZHI+PG1hcms6c3Ry
+ZWV0PtCf0YDQvtGB0L/QtdC60YIg0JLQtdGA0L3QsNC00YHQutC+0LPQviAxNTwvbWFyazpzdHJl
+ZXQ+PG1hcms6Y2l0eT7QnNC+0YHQutCy0LA8L21hcms6Y2l0eT48bWFyazpwYz4xMTc0ODU8L21h
+cms6cGM+PG1hcms6Y2M+UlU8L21hcms6Y2M+PC9tYXJrOmFkZHI+PG1hcms6dm9pY2U+KzcuOTE4
+ODIyMTY3NDwvbWFyazp2b2ljZT48bWFyazpmYXg+KzcuOTE4ODIyMTY3MzwvbWFyazpmYXg+PG1h
+cms6ZW1haWw+aW5mb0BhZ2VuY3kucnU8L21hcms6ZW1haWw+PC9tYXJrOmNvbnRhY3Q+PG1hcms6
+anVyaXNkaWN0aW9uPlVTPC9tYXJrOmp1cmlzZGljdGlvbj48bWFyazpjbGFzcz4xNTwvbWFyazpj
+bGFzcz48bWFyazpsYWJlbD54bi0tLS0tLTVjZGluNmFicjFiMWF5NWU8L21hcms6bGFiZWw+PG1h
+cms6bGFiZWw+eG4tLS0tLTZrY2dsMWFicDdhemF3OWQ8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+
+eG4tLS1hbmQtLTN2ZW1yNmJidjliNWEyYTdmPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS0t
+YW5kLTQzZGtwMWJidDViM2EwYTFmPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS0tLTdzYmVq
+d2JuM2F4dTNkPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1hbmQtLTQzZGtwMWJidDViM2Ew
+YTFmPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1hbmQtNWNkaW42YWJyMWIxYXk1ZTwvbWFy
+azpsYWJlbD48bWFyazpsYWJlbD54bi0tZXQtLTVjZGluNmFicjFiMWF5NWU8L21hcms6bGFiZWw+
+PG1hcms6bGFiZWw+eG4tLWV0LTZrY2dsMWFicDdhemF3OWQ8L21hcms6bGFiZWw+PG1hcms6bGFi
+ZWw+eG4tLTgwYWNocmJsenZzN2M8L21hcms6bGFiZWw+PG1hcms6Z29vZHNBbmRTZXJ2aWNlcz7Q
+s9C40YLQsNGA0LAgPC9tYXJrOmdvb2RzQW5kU2VydmljZXM+PG1hcms6cmVnTnVtPjEyMzQ8L21h
+cms6cmVnTnVtPjxtYXJrOnJlZ0RhdGU+MjAxMy0wMS0wMVQwMDowMDowMC4wMDBaPC9tYXJrOnJl
+Z0RhdGU+PC9tYXJrOnRyYWRlbWFyaz48L21hcms6bWFyaz48ZHM6U2lnbmF0dXJlIHhtbG5zOmRz
+PSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjIiBJZD0iXzFmMTEwMzQyLTg5ZWIt
+NDNiOC05ZDc4LWFjNTI4ZjllYmI0YyI+PGRzOlNpZ25lZEluZm8+PGRzOkNhbm9uaWNhbGl6YXRp
+b25NZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0
+biMiLz48ZHM6U2lnbmF0dXJlTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAw
+MS8wNC94bWxkc2lnLW1vcmUjcnNhLXNoYTI1NiIvPjxkczpSZWZlcmVuY2UgVVJJPSIjXzFmNTI4
+ZjY4LTljODEtNGRkYy05Yjc4LTFjOGI5OTJjMDZjOSI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5z
+Zm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1sZHNpZyNlbnZlbG9w
+ZWQtc2lnbmF0dXJlIi8+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3Jn
+LzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6RGlnZXN0TWV0aG9k
+IEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxlbmMjc2hhMjU2Ii8+PGRz
+OkRpZ2VzdFZhbHVlPlRjUmQxNGhjMzZHbzhiZnhCaTMzVnR5WWd2VmhoSFd4SEdTV3FjM1RrelU9
+PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48ZHM6UmVmZXJlbmNlIFVSST0iI18yOWFj
+NjZmYS05M2UzLTQ1OTEtOWRlOS1iZGQzZjJjZThiZGMiPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFu
+c2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMi
+Lz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cu
+dzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1ZT5Eb0pUY3NweHJM
+Y01jSHF6OUlxVElYdVQrUzJ6UkR5UEl3U2lSK0RsM0pRPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpS
+ZWZlcmVuY2U+PC9kczpTaWduZWRJbmZvPjxkczpTaWduYXR1cmVWYWx1ZSBJZD0iXzg5N2VmYzM1
+LWQzMjEtNDFmZC1hN2E1LTI0MDBjZThkNDMzZiI+U21BOVBvTGtIMEI1QytCajZMMlFBd3FPMGJh
+TjBwd1o2Mkh5cEY2N3Nnb0FtR01McFlpcTFSWWNjeHcxODV0SGJCdTNFZUdQdG96NiYjMTM7Ckxj
+bkgvcDRXQ080QjR0dkV5eDl3U243VE9kOVpKYmxlbkk4SzRIeDFCOFdtYU93MEQ2UXRuY1FuNHIr
+QzA5ZHpGZDVleTZUMVNFNHEmIzEzOwp3N2sySXQ3bUI1WnJXWk5odnBiRzNuVGxwbWx5dDhiMWFl
+ajRiYWovbWkwSjVKY1g4NjljKytZT0RwbnJWY1JiaDA2dE44dzhOM1huJiMxMzsKS25TZGUzZTlJ
+TWFlTkFZamhkaHBEa3RpZUVwbzNmZW9KRit4dUZIVjhVejBXbEFzaGZpaFd0cUhWSWZtbThwTjdX
+RzhhYmMxYWYraSYjMTM7CnBVbldDa0FTKytKUHRQT1lXTUltMlBtMGpFdzdRQXIyUURCT0lzeDIr
+SnFNc05nNE5reGhDNEc1Vjg1TVVTRWJveWd2cW5DSk5ZUVomIzEzOwphbkRxQVNFdGl2T2tXZjNi
+SE1JVEtneUQ4VHpRY2R4cFlKZTVFMDdQTit0aDJQcVNsZFIxQzFoVjhQQ05pMmtqSW9IcWdkSGNX
+clZkJiMxMzsKZmtvelBtLy9ibm1HcjA4ZFN1enYrT0JXVHczRFl2TVFkQ2NGZ3dMRmsxcVBaYkRZ
+eGxFaXlDOFRmMThZZEJaeFZtdUk5aThadXJKcSYjMTM7CktjUVNJWFZxWGpiL05ES1VkYzAwZUZq
+aGdwQVdUbEh0YlFuZnJROVdWN0ZrcWJhdkFCUElYUVhSUUI2ZWc4V0phRVV1dE1xQlprWmcmIzEz
+OwpPOWFzZWRwUDZiMUNlTzZqSXJWMnJVTGFBdG1reVo4UzRRSFREaFYwYURTQmFZdXp2YzBtZUZS
+NXluTWQ5NFFaTEI5YXdNRDJBRnc9PC9kczpTaWduYXR1cmVWYWx1ZT48ZHM6S2V5SW5mbyBJZD0i
+XzI5YWM2NmZhLTkzZTMtNDU5MS05ZGU5LWJkZDNmMmNlOGJkYyI+PGRzOlg1MDlEYXRhPjxkczpY
+NTA5Q2VydGlmaWNhdGU+TUlJSFh6Q0NCVWVnQXdJQkFnSVVYcUkvdmQxOENhZzk4b05wZHpWN0Jp
+eS82RUF3RFFZSktvWklodmNOQVFFTkJRQXdmREVMTUFrRyYjMTM7CkExVUVCaE1DVlZNeFBEQTZC
+Z05WQkFvTU0wbHVkR1Z5Ym1WMElFTnZjbkJ2Y21GMGFXOXVJR1p2Y2lCQmMzTnBaMjVsWkNCT1lX
+MWwmIzEzOwpjeUJoYm1RZ1RuVnRZbVZ5Y3pFdk1DMEdBMVVFQXd3bVNVTkJUazRnVkhKaFpHVnRZ
+WEpySUVOc1pXRnlhVzVuYUc5MWMyVWdVR2xzJiMxMzsKYjNRZ1EwRXdIaGNOTWpJeE1URTJNVE15
+T0RVNVdoY05NamN4TVRFMU1UTXlPRFU1V2pDQjBERUxNQWtHQTFVRUJoTUNRa1V4RVRBUCYjMTM7
+CkJnTlZCQWdUQ0VKeWRYTnpaV3h6TVJJd0VBWURWUVFIRXdsV2FXeDJiMjl5WkdVeE16QXhCZ05W
+QkFvVEtrUmxiRzlwZEhSbElFTnYmIzEzOwpibk4xYkhScGJtY2dZVzVrSUVGa2RtbHpiM0o1SUVO
+V1FrRXZVME5TVERFK01Ed0dBMVVFQXhNMVNVTkJUazRnVkUxRFNDQkJkWFJvJiMxMzsKYjNKcGVt
+VmtJRlJ5WVdSbGJXRnlheUJRYVd4dmRDQldZV3hwWkdGMGIzSWdWbUZzYVdReEpUQWpCZ2txaGtp
+Rzl3MEJDUUVXRm1KbCYjMTM7CmRHMWphSE50WkVCa1pXeHZhWFIwWlM1amIyMHdnZ0lpTUEwR0NT
+cUdTSWIzRFFFQkFRVUFBNElDRHdBd2dnSUtBb0lDQVFDNkZKd3omIzEzOwpLcVFWWDZmRzMvRUxS
+U0dXVjlHckthRk1LbWhXSXhlcHdSWk42TXhNcWtkNURuWWZpVCtXcDk4akVrcWdUeDJVTWI5cXVn
+Y0dOVjZnJiMxMzsKMzUvQ3JRYi9GL216M0M0c2ZMTnVEcFNxSzlRRjgrcGFUSDZoUW1yT3BxVitV
+VHZkajlTTWdLR3lGaXpTODhDRFdNeDR3M2k0RkFLZSYjMTM7CjZOUnNKUkdUQXRLRHVNSGNBNHNq
+MDhHamUzbFBXY2dGdmNRTkRWZUVCVHVPSEJHK1JoajdWMUppTkdQLzRlcFRYVEZYZ1BGRGdlejMm
+IzEzOwpZQWZ4cXBidU80VFg2YmJZZGsybnZNTEZ2TEVOa0NGWXVsbllQemduRUJHU01LSWFBSWxi
+K3NjSEN2V2dXajJUTGd3aDJHSk5jelZNJiMxMzsKMUxQTXFHUytVa2k5TWg3OTgyMi94b2FyNDk4
+eER4Mll4Lzhzd2dFTkxTZ0NzUUFXOG5NZ3dXbjZBYllsMlJBQlh1cmF5RnNuNFAxUiYjMTM7CnVR
+Tm1VcC9xclJLUnZTSnIxT0xrSFpmRlRjU1lRYVZpdU1ZUFh6R3o4dG1NTGxtSS9CNkFDSDRBd1JN
+ZG5ZdkZPM0tJMVJCblBLSWQmIzEzOwp3d2ZVcFo1SVRJcGJBN0NHZ1R4MXF4dE0xd0lVcjdwSGVL
+UDZqVmUza2RETGcrL0JaMnhNRXRCazVhOFk3QjR2M3h3SFhHVHZWOG1OJiMxMzsKMEFnL1N5VC9R
+VXlFUmhYVXlBTjIrRXdaK1NRQ1V5TmZ6aW9XUTg3OGVHeWtVKzQ2K0JiZ0kzSUlyMzZYS1B3bXp0
+MFNaK0tJM3RuRiYjMTM7ClRsbjltWDBLQzBpZG9qNXlrelBvQy9NSWVkMHNwNFRpZ3hFYldOeDdF
+RjgwUHZSL0RERXdWUEVFa2tqeTYzWEZ1bHhpQ1FJREFRQUImIzEzOwpvNElCZ2pDQ0FYNHdEQVlE
+VlIwVEFRSC9CQUl3QURBT0JnTlZIUThCQWY4RUJBTUNCNEF3SFFZRFZSME9CQllFRkhuOXMwREVh
+Mmt2JiMxMzsKZ0UvZUlPVHNxb1c4NU1YRk1JRzZCZ05WSFNNRWdiSXdnYStBRkVkN1Q2NTZVWkcx
+MGIrZE51bUdmellXQktsRm9ZR0FwSDR3ZkRFTCYjMTM7Ck1Ba0dBMVVFQmhNQ1ZWTXhQREE2QmdO
+VkJBb01NMGx1ZEdWeWJtVjBJRU52Y25CdmNtRjBhVzl1SUdadmNpQkJjM05wWjI1bFpDQk8mIzEz
+OwpZVzFsY3lCaGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF3d21TVU5CVGs0Z1ZISmhaR1Z0WVhK
+cklFTnNaV0Z5YVc1bmFHOTFjMlVnJiMxMzsKVUdsc2IzUWdRMEdDRkhwcWJURmVKY1B0VUM5WHV1
+UEtQc0x3RFIrTU1EUUdBMVVkSHdRdE1Dc3dLYUFub0NXR0kyaDBkSEE2THk5aiYjMTM7CmNtd3Vh
+V05oYm00dWIzSm5MM1J0WTJoZmNHbHNiM1F1WTNKc01Fd0dBMVVkSUFSRk1FTXdFQVlPS3dZQkJB
+R0N5UnNCQllNN0RBb3cmIzEzOwpMd1lJS3dZQkJRVUhBZ0V3SXpBaEJnZ3JCZ0VGQlFjQ0FSWVZh
+SFIwY0hNNkx5OWpjSE11YVdOaGJtNHViM0puTUEwR0NTcUdTSWIzJiMxMzsKRFFFQkRRVUFBNElD
+QVFCZFNhdDU2dWVqTG5BakZJRjk1ZGpZV0k2cy8vTjZZWHhzcnJNa0dCUDhFZXpQeWhMaDZhd1A0
+ejdROVFBSSYjMTM7ClFaa1lveHJsLzF5MCtieVYycW5UVVVDTFJwSy9CRHAvaGNmd1BmS0NBLzJS
+UUNISnJiNit6MGVuRFBGUkswTkttd09jZGxHdFVrMG0mIzEzOwpQZ1dHU0t0dXdWc1BBaFRESnVo
+b3NaT2hrTmYrblNPT0hyUU9uMUUycnpPcmQva1FscWlDd1JIOTc5Nk5wVEErSFNNZk9vYkpFRVBx
+JiMxMzsKdHBGN1A1cWJ3dGw5NVVhNU9wNEFoYTcwSEhmVUZTNEJPUUtMQlZmTVpkT1IraVBvaDVP
+d0FLK2h0WWtGQ0c5UDJXSHU3d2Y4RUMrVyYjMTM7CjdrOTZndlRkOHhFN291b2FiVDJ4NllmWXFF
+bFBIaVUvSU05Z1Z6V1dML3N2WUR5U1Z1b0Z3QmpETk4xY2RxMHFPWVIxeXVTMWMvOUQmIzEzOwpG
+UjdlbzdHRkVDeStUQmQ3SWlLUmZCVmVZR09PUE1ub0ZmeFJMV3Jwc1dObndEN2xrUGtMQ2dGQ2sr
+OHlFY09SZzYyNW1vNjV6NHk2JiMxMzsKSjRLOGZvZGE3cXdtWE5QM1JTMThvbjZCSHQ4bFErYlhn
+T0hteElIazBhTzBxTkRxZ3ZMcjJGbHlMR0pHaUVNUnFETU1SNi9hMDZidCYjMTM7CmtuVU1IbDdD
+cU1maklralA0Vk5OeUdQZEpnd1ZrMmtlYjl1TkZ2SkN4VCtNMmZHWFExTmJKTmZ0djVNZ1NzcDlO
+MXkreDZnQTNFaHcmIzEzOwp5SGxtSkI0WU10bzh0VFYxaTg0eFBYeGkyQ0FlRGFHRHV3b3N0OFlV
+Q1NqcTdSQ0s4dEdjYUFZcmtYUVkyeVFmWDNjd0RzRXhScVZXJiMxMzsKeXJqeVJ0K042bUs5OVE9
+PTwvZHM6WDUwOUNlcnRpZmljYXRlPjwvZHM6WDUwOURhdGE+PC9kczpLZXlJbmZvPjwvZHM6U2ln
+bmF0dXJlPjwvc21kOnNpZ25lZE1hcms+Cg==
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Agent-Russian/TreatyStatute-Agent-Russian-Active.smd b/core/src/test/resources/google/registry/tmch/idn/Agent-Russian/TreatyStatute-Agent-Russian-Active.smd
new file mode 100644
index 000000000..41ddb9d9c
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Agent-Russian/TreatyStatute-Agent-Russian-Active.smd
@@ -0,0 +1,128 @@
+Marks: Проверьте & запросы
+smdID: 000000751669083252695-65535
+U-labels: xn------8cdgsat0dibjddhrh6oh, xn-----8kcfpaq4chbiddgqh6nh, xn---and--8veiyaz2ekblddjth6qh, xn---and-83dhvaw6djbkddish6ph, xn----8sbeman8bgbhddfph6mh, xn--and--83dhvaw6djbkddish6ph, xn--and-8cdgsat0dibjddhrh6oh, xn--80adjak2bfbgddeoh6lh
+notBefore: 2022-11-22T02:14:12.695Z
+notAfter: 2027-10-18T14:16:55.554Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il81ZWNm
+YzcyMS04YzEwLTQwZjAtODVhZi03OGI2NWUyZTc0NmYiPjxzbWQ6aWQ+MDAwMDAwNzUxNjY5MDgz
+MjUyNjk1LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMjoxNDoxMi42OTVaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0xOFQxNDoxNjo1NS41NTRaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
+cmVhdHlPclN0YXR1dGU+PG1hcms6aWQ+MDAwMTQxMTUwMzA2NTc3NDE1MDMwNjU3NzQtMTwvbWFy
+azppZD48bWFyazptYXJrTmFtZT7Qn9GA0L7QstC10YDRjNGC0LUgJmFtcDsg0LfQsNC/0YDQvtGB
+0Ys8L21hcms6bWFya05hbWU+PG1hcms6aG9sZGVyIGVudGl0bGVtZW50PSJvd25lciI+PG1hcms6
+b3JnPtCQ0LPQtdC90YLRgdGC0LLQvjwvbWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpzdHJlZXQ+
+0J/RgNC+0YHQv9C10LrRgiDQktC10YDQvdCw0LTRgdC60L7Qs9C+IDE1PC9tYXJrOnN0cmVldD48
+bWFyazpjaXR5PtCc0L7RgdC60LLQsDwvbWFyazpjaXR5PjxtYXJrOnBjPjExNzQ4NTwvbWFyazpw
+Yz48bWFyazpjYz5SVTwvbWFyazpjYz48L21hcms6YWRkcj48L21hcms6aG9sZGVyPjxtYXJrOmNv
+bnRhY3QgdHlwZT0iYWdlbnQiPjxtYXJrOm5hbWU+0J3QsNGC0LDQu9GM0Y8g0JDQvdGC0L7QvdC+
+0LLQsDwvbWFyazpuYW1lPjxtYXJrOm9yZz7QkNCz0LXQvdGC0YHRgtCy0L48L21hcms6b3JnPjxt
+YXJrOmFkZHI+PG1hcms6c3RyZWV0PtCf0YDQvtGB0L/QtdC60YIg0JLQtdGA0L3QsNC00YHQutC+
+0LPQviAxNTwvbWFyazpzdHJlZXQ+PG1hcms6Y2l0eT7QnNC+0YHQutCy0LA8L21hcms6Y2l0eT48
+bWFyazpwYz4xMTc0ODU8L21hcms6cGM+PG1hcms6Y2M+UlU8L21hcms6Y2M+PC9tYXJrOmFkZHI+
+PG1hcms6dm9pY2U+KzcuOTE4ODIyMTY3NDwvbWFyazp2b2ljZT48bWFyazpmYXg+KzcuOTE4ODIy
+MTY3MzwvbWFyazpmYXg+PG1hcms6ZW1haWw+aW5mb0BhZ2VuY3kucnU8L21hcms6ZW1haWw+PC9t
+YXJrOmNvbnRhY3Q+PG1hcms6cHJvdGVjdGlvbj48bWFyazpjYz5VUzwvbWFyazpjYz48bWFyazpy
+dWxpbmc+UlU8L21hcms6cnVsaW5nPjwvbWFyazpwcm90ZWN0aW9uPjxtYXJrOmxhYmVsPnhuLS0t
+LS0tOGNkZ3NhdDBkaWJqZGRocmg2b2g8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLS0tLThr
+Y2ZwYXE0Y2hiaWRkZ3FoNm5oPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS0tYW5kLS04dmVp
+eWF6MmVrYmxkZGp0aDZxaDwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tLWFuZC04M2RodmF3
+NmRqYmtkZGlzaDZwaDwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tLS04c2JlbWFuOGJnYmhk
+ZGZwaDZtaDwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tYW5kLS04M2RodmF3NmRqYmtkZGlz
+aDZwaDwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tYW5kLThjZGdzYXQwZGliamRkaHJoNm9o
+PC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS04MGFkamFrMmJmYmdkZGVvaDZsaDwvbWFyazps
+YWJlbD48bWFyazpnb29kc0FuZFNlcnZpY2VzPtCz0LjRgtCw0YDQsDwvbWFyazpnb29kc0FuZFNl
+cnZpY2VzPjxtYXJrOnJlZk51bT4xMjM0PC9tYXJrOnJlZk51bT48bWFyazpwcm9EYXRlPjIwMDAt
+MDEtMDFUMDA6MDA6MDAuMDAwWjwvbWFyazpwcm9EYXRlPjxtYXJrOnRpdGxlPtCz0LjRgtCw0YDQ
+sDwvbWFyazp0aXRsZT48bWFyazpleGVjRGF0ZT4yMDEzLTAyLTAyVDAwOjAwOjAwLjAwMFo8L21h
+cms6ZXhlY0RhdGU+PC9tYXJrOnRyZWF0eU9yU3RhdHV0ZT48L21hcms6bWFyaz48ZHM6U2lnbmF0
+dXJlIHhtbG5zOmRzPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjIiBJZD0iXzAz
+OThmMDVmLTU4NDgtNDlmMy1iMTEyLTczODMwY2MwNTc1NCI+PGRzOlNpZ25lZEluZm8+PGRzOkNh
+bm9uaWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEw
+L3htbC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJlTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3
+dy53My5vcmcvMjAwMS8wNC94bWxkc2lnLW1vcmUjcnNhLXNoYTI1NiIvPjxkczpSZWZlcmVuY2Ug
+VVJJPSIjXzVlY2ZjNzIxLThjMTAtNDBmMC04NWFmLTc4YjY1ZTJlNzQ2ZiI+PGRzOlRyYW5zZm9y
+bXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1s
+ZHNpZyNlbnZlbG9wZWQtc2lnbmF0dXJlIi8+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6
+Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6
+RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxlbmMj
+c2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPjFyQUE4NWRBcUMySFdDZFg0RmI1aUhQQWNFTURFbWpa
+bThyc2xaWDJPaDg9PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48ZHM6UmVmZXJlbmNl
+IFVSST0iI18xYTZkYjU2Ny1hZDQ5LTRkNTYtOGQ0Ny05OGM0MGMzM2JkZWMiPjxkczpUcmFuc2Zv
+cm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3ht
+bC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09
+Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1
+ZT5BemJUYS9ud2VHK1p6Tm03UG41NkhWY1ZFcmltWE8rcU9IcTNDMXdIODVzPTwvZHM6RGlnZXN0
+VmFsdWU+PC9kczpSZWZlcmVuY2U+PC9kczpTaWduZWRJbmZvPjxkczpTaWduYXR1cmVWYWx1ZSBJ
+ZD0iX2M1NmNmZTFlLTU4ZTQtNDA2YS04NjBmLTc4ZjUwYjZlOTcwNCI+QkEyeHNiWW11NWhDbEYy
+OWFhR2dVRkxnUkUxM1hZTW5OL1RZcFdTdEdQVTVFeGlDSFRSZ1kva2FUcHpzQlVSUEdSQ21yV1Iv
+YW9LbSYjMTM7CkZMK1k3ZGUxd21LZlBQdmc3a2Q4OThYbU9qRmpraUdmK2k0UFpnYlUrMms3dHM0
+NUw4YU1TcjVNM0J5NGRIRUhUellTT3E4ZU0xOEImIzEzOwpiRkdGWU9aVVFZODIweE10c2RBSGQv
+Rnk2cGZNcWx0TjJoNU5mL3FUbWFUVnc4RVo0RUs2Y0EyZC9uTWRjUFhzajBGZVI3WjhGbmYrJiMx
+MzsKemhXMHBJTkFnOVFPUTBGVkIrQWhTVGpMZkNDNjZMSDRyeDkrd1FheTJrVVZhNytnc3VLZ0dD
+bmQ1RmJwMzFzWUcyeURBa243TU9oVyYjMTM7CjU1OVByMzVMbG5YZHFISkFhdFAza2ppWjRScVBD
+MVF3dkVCSUxLZWZJMlV2YW8zWXVwWWxrL0RzMHMxcC9GbDVXNDFGYW1ENFVtMjgmIzEzOwprdzly
+R3kzNTBaZEx4cnlmV080TXFNWktlZC9MdG1xbzljd3M2SW4rQms0cVBlRG8xTHcveEpwbVR3UmN5
+RUJaRmpJU3dHR0dSaTd5JiMxMzsKUzBQeFdaM2E4YUV1ODZ5QmE1ZG9GRHZFZ0lFdnlvTDAzL2sw
+MUp5a0k4VmhZaCtjNjJzMFZEU3hCem05TnRHYmZBY012eUFmeXdsVCYjMTM7ClkwU1J5YVBzT1FP
+dFhDRHZDYXRzK0xueUVpSUIyTFdnM2ptQkJiUjFhZWszSWdlSUdOWXVMbGlOa01ON3V2TXdjL01X
+cVRsOWFjQk0mIzEzOwpoRk4yb0ZSekVTdzZhVWtBZUdPLzlJTjV1cXB4L3ZidDBGOWtpZFNFdjE5
+cElQWUo3YjFlQVZDek9UWnRhcksxL1VEUWxqTm0vTk09PC9kczpTaWduYXR1cmVWYWx1ZT48ZHM6
+S2V5SW5mbyBJZD0iXzFhNmRiNTY3LWFkNDktNGQ1Ni04ZDQ3LTk4YzQwYzMzYmRlYyI+PGRzOlg1
+MDlEYXRhPjxkczpYNTA5Q2VydGlmaWNhdGU+TUlJSFh6Q0NCVWVnQXdJQkFnSVVYcUkvdmQxOENh
+Zzk4b05wZHpWN0JpeS82RUF3RFFZSktvWklodmNOQVFFTkJRQXdmREVMTUFrRyYjMTM7CkExVUVC
+aE1DVlZNeFBEQTZCZ05WQkFvTU0wbHVkR1Z5Ym1WMElFTnZjbkJ2Y21GMGFXOXVJR1p2Y2lCQmMz
+TnBaMjVsWkNCT1lXMWwmIzEzOwpjeUJoYm1RZ1RuVnRZbVZ5Y3pFdk1DMEdBMVVFQXd3bVNVTkJU
+azRnVkhKaFpHVnRZWEpySUVOc1pXRnlhVzVuYUc5MWMyVWdVR2xzJiMxMzsKYjNRZ1EwRXdIaGNO
+TWpJeE1URTJNVE15T0RVNVdoY05NamN4TVRFMU1UTXlPRFU1V2pDQjBERUxNQWtHQTFVRUJoTUNR
+a1V4RVRBUCYjMTM7CkJnTlZCQWdUQ0VKeWRYTnpaV3h6TVJJd0VBWURWUVFIRXdsV2FXeDJiMjl5
+WkdVeE16QXhCZ05WQkFvVEtrUmxiRzlwZEhSbElFTnYmIzEzOwpibk4xYkhScGJtY2dZVzVrSUVG
+a2RtbHpiM0o1SUVOV1FrRXZVME5TVERFK01Ed0dBMVVFQXhNMVNVTkJUazRnVkUxRFNDQkJkWFJv
+JiMxMzsKYjNKcGVtVmtJRlJ5WVdSbGJXRnlheUJRYVd4dmRDQldZV3hwWkdGMGIzSWdWbUZzYVdR
+eEpUQWpCZ2txaGtpRzl3MEJDUUVXRm1KbCYjMTM7CmRHMWphSE50WkVCa1pXeHZhWFIwWlM1amIy
+MHdnZ0lpTUEwR0NTcUdTSWIzRFFFQkFRVUFBNElDRHdBd2dnSUtBb0lDQVFDNkZKd3omIzEzOwpL
+cVFWWDZmRzMvRUxSU0dXVjlHckthRk1LbWhXSXhlcHdSWk42TXhNcWtkNURuWWZpVCtXcDk4akVr
+cWdUeDJVTWI5cXVnY0dOVjZnJiMxMzsKMzUvQ3JRYi9GL216M0M0c2ZMTnVEcFNxSzlRRjgrcGFU
+SDZoUW1yT3BxVitVVHZkajlTTWdLR3lGaXpTODhDRFdNeDR3M2k0RkFLZSYjMTM7CjZOUnNKUkdU
+QXRLRHVNSGNBNHNqMDhHamUzbFBXY2dGdmNRTkRWZUVCVHVPSEJHK1JoajdWMUppTkdQLzRlcFRY
+VEZYZ1BGRGdlejMmIzEzOwpZQWZ4cXBidU80VFg2YmJZZGsybnZNTEZ2TEVOa0NGWXVsbllQemdu
+RUJHU01LSWFBSWxiK3NjSEN2V2dXajJUTGd3aDJHSk5jelZNJiMxMzsKMUxQTXFHUytVa2k5TWg3
+OTgyMi94b2FyNDk4eER4Mll4Lzhzd2dFTkxTZ0NzUUFXOG5NZ3dXbjZBYllsMlJBQlh1cmF5RnNu
+NFAxUiYjMTM7CnVRTm1VcC9xclJLUnZTSnIxT0xrSFpmRlRjU1lRYVZpdU1ZUFh6R3o4dG1NTGxt
+SS9CNkFDSDRBd1JNZG5ZdkZPM0tJMVJCblBLSWQmIzEzOwp3d2ZVcFo1SVRJcGJBN0NHZ1R4MXF4
+dE0xd0lVcjdwSGVLUDZqVmUza2RETGcrL0JaMnhNRXRCazVhOFk3QjR2M3h3SFhHVHZWOG1OJiMx
+MzsKMEFnL1N5VC9RVXlFUmhYVXlBTjIrRXdaK1NRQ1V5TmZ6aW9XUTg3OGVHeWtVKzQ2K0JiZ0kz
+SUlyMzZYS1B3bXp0MFNaK0tJM3RuRiYjMTM7ClRsbjltWDBLQzBpZG9qNXlrelBvQy9NSWVkMHNw
+NFRpZ3hFYldOeDdFRjgwUHZSL0RERXdWUEVFa2tqeTYzWEZ1bHhpQ1FJREFRQUImIzEzOwpvNElC
+Z2pDQ0FYNHdEQVlEVlIwVEFRSC9CQUl3QURBT0JnTlZIUThCQWY4RUJBTUNCNEF3SFFZRFZSME9C
+QllFRkhuOXMwREVhMmt2JiMxMzsKZ0UvZUlPVHNxb1c4NU1YRk1JRzZCZ05WSFNNRWdiSXdnYStB
+RkVkN1Q2NTZVWkcxMGIrZE51bUdmellXQktsRm9ZR0FwSDR3ZkRFTCYjMTM7Ck1Ba0dBMVVFQmhN
+Q1ZWTXhQREE2QmdOVkJBb01NMGx1ZEdWeWJtVjBJRU52Y25CdmNtRjBhVzl1SUdadmNpQkJjM05w
+WjI1bFpDQk8mIzEzOwpZVzFsY3lCaGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF3d21TVU5CVGs0
+Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5YVc1bmFHOTFjMlVnJiMxMzsKVUdsc2IzUWdRMEdDRkhwcWJU
+RmVKY1B0VUM5WHV1UEtQc0x3RFIrTU1EUUdBMVVkSHdRdE1Dc3dLYUFub0NXR0kyaDBkSEE2THk5
+aiYjMTM7CmNtd3VhV05oYm00dWIzSm5MM1J0WTJoZmNHbHNiM1F1WTNKc01Fd0dBMVVkSUFSRk1F
+TXdFQVlPS3dZQkJBR0N5UnNCQllNN0RBb3cmIzEzOwpMd1lJS3dZQkJRVUhBZ0V3SXpBaEJnZ3JC
+Z0VGQlFjQ0FSWVZhSFIwY0hNNkx5OWpjSE11YVdOaGJtNHViM0puTUEwR0NTcUdTSWIzJiMxMzsK
+RFFFQkRRVUFBNElDQVFCZFNhdDU2dWVqTG5BakZJRjk1ZGpZV0k2cy8vTjZZWHhzcnJNa0dCUDhF
+ZXpQeWhMaDZhd1A0ejdROVFBSSYjMTM7ClFaa1lveHJsLzF5MCtieVYycW5UVVVDTFJwSy9CRHAv
+aGNmd1BmS0NBLzJSUUNISnJiNit6MGVuRFBGUkswTkttd09jZGxHdFVrMG0mIzEzOwpQZ1dHU0t0
+dXdWc1BBaFRESnVob3NaT2hrTmYrblNPT0hyUU9uMUUycnpPcmQva1FscWlDd1JIOTc5Nk5wVEEr
+SFNNZk9vYkpFRVBxJiMxMzsKdHBGN1A1cWJ3dGw5NVVhNU9wNEFoYTcwSEhmVUZTNEJPUUtMQlZm
+TVpkT1IraVBvaDVPd0FLK2h0WWtGQ0c5UDJXSHU3d2Y4RUMrVyYjMTM7CjdrOTZndlRkOHhFN291
+b2FiVDJ4NllmWXFFbFBIaVUvSU05Z1Z6V1dML3N2WUR5U1Z1b0Z3QmpETk4xY2RxMHFPWVIxeXVT
+MWMvOUQmIzEzOwpGUjdlbzdHRkVDeStUQmQ3SWlLUmZCVmVZR09PUE1ub0ZmeFJMV3Jwc1dObndE
+N2xrUGtMQ2dGQ2srOHlFY09SZzYyNW1vNjV6NHk2JiMxMzsKSjRLOGZvZGE3cXdtWE5QM1JTMThv
+bjZCSHQ4bFErYlhnT0hteElIazBhTzBxTkRxZ3ZMcjJGbHlMR0pHaUVNUnFETU1SNi9hMDZidCYj
+MTM7CmtuVU1IbDdDcU1maklralA0Vk5OeUdQZEpnd1ZrMmtlYjl1TkZ2SkN4VCtNMmZHWFExTmJK
+TmZ0djVNZ1NzcDlOMXkreDZnQTNFaHcmIzEzOwp5SGxtSkI0WU10bzh0VFYxaTg0eFBYeGkyQ0Fl
+RGFHRHV3b3N0OFlVQ1NqcTdSQ0s4dEdjYUFZcmtYUVkyeVFmWDNjd0RzRXhScVZXJiMxMzsKeXJq
+eVJ0K042bUs5OVE9PTwvZHM6WDUwOUNlcnRpZmljYXRlPjwvZHM6WDUwOURhdGE+PC9kczpLZXlJ
+bmZvPjwvZHM6U2lnbmF0dXJlPjwvc21kOnNpZ25lZE1hcms+Cg==
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Agent-Russian/TreatyStatute-Agent-Russian-Revoked.smd b/core/src/test/resources/google/registry/tmch/idn/Agent-Russian/TreatyStatute-Agent-Russian-Revoked.smd
new file mode 100644
index 000000000..8d172122c
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Agent-Russian/TreatyStatute-Agent-Russian-Revoked.smd
@@ -0,0 +1,128 @@
+Marks: Проверьте & запросы
+smdID: 000000751669083188600-65535
+U-labels: xn------8cdgsat0dibjddhrh6oh, xn-----8kcfpaq4chbiddgqh6nh, xn---and--8veiyaz2ekblddjth6qh, xn---and-83dhvaw6djbkddish6ph, xn----8sbeman8bgbhddfph6mh, xn--and--83dhvaw6djbkddish6ph, xn--and-8cdgsat0dibjddhrh6oh, xn--80adjak2bfbgddeoh6lh
+notBefore: 2022-11-22T02:13:08.600Z
+notAfter: 2027-10-18T14:16:55.554Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il81NWE4
+MjJlYi03MDJhLTRmODYtODM1Zi1hNWJmNTE2ZjQxZTgiPjxzbWQ6aWQ+MDAwMDAwNzUxNjY5MDgz
+MTg4NjAwLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMjoxMzowOC42MDBaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0xOFQxNDoxNjo1NS41NTRaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
+cmVhdHlPclN0YXR1dGU+PG1hcms6aWQ+MDAwMTQxMTUwMzA2NTc3NDE1MDMwNjU3NzQtMTwvbWFy
+azppZD48bWFyazptYXJrTmFtZT7Qn9GA0L7QstC10YDRjNGC0LUgJmFtcDsg0LfQsNC/0YDQvtGB
+0Ys8L21hcms6bWFya05hbWU+PG1hcms6aG9sZGVyIGVudGl0bGVtZW50PSJvd25lciI+PG1hcms6
+b3JnPtCQ0LPQtdC90YLRgdGC0LLQvjwvbWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpzdHJlZXQ+
+0J/RgNC+0YHQv9C10LrRgiDQktC10YDQvdCw0LTRgdC60L7Qs9C+IDE1PC9tYXJrOnN0cmVldD48
+bWFyazpjaXR5PtCc0L7RgdC60LLQsDwvbWFyazpjaXR5PjxtYXJrOnBjPjExNzQ4NTwvbWFyazpw
+Yz48bWFyazpjYz5SVTwvbWFyazpjYz48L21hcms6YWRkcj48L21hcms6aG9sZGVyPjxtYXJrOmNv
+bnRhY3QgdHlwZT0iYWdlbnQiPjxtYXJrOm5hbWU+0J3QsNGC0LDQu9GM0Y8g0JDQvdGC0L7QvdC+
+0LLQsDwvbWFyazpuYW1lPjxtYXJrOm9yZz7QkNCz0LXQvdGC0YHRgtCy0L48L21hcms6b3JnPjxt
+YXJrOmFkZHI+PG1hcms6c3RyZWV0PtCf0YDQvtGB0L/QtdC60YIg0JLQtdGA0L3QsNC00YHQutC+
+0LPQviAxNTwvbWFyazpzdHJlZXQ+PG1hcms6Y2l0eT7QnNC+0YHQutCy0LA8L21hcms6Y2l0eT48
+bWFyazpwYz4xMTc0ODU8L21hcms6cGM+PG1hcms6Y2M+UlU8L21hcms6Y2M+PC9tYXJrOmFkZHI+
+PG1hcms6dm9pY2U+KzcuOTE4ODIyMTY3NDwvbWFyazp2b2ljZT48bWFyazpmYXg+KzcuOTE4ODIy
+MTY3MzwvbWFyazpmYXg+PG1hcms6ZW1haWw+aW5mb0BhZ2VuY3kucnU8L21hcms6ZW1haWw+PC9t
+YXJrOmNvbnRhY3Q+PG1hcms6cHJvdGVjdGlvbj48bWFyazpjYz5VUzwvbWFyazpjYz48bWFyazpy
+dWxpbmc+UlU8L21hcms6cnVsaW5nPjwvbWFyazpwcm90ZWN0aW9uPjxtYXJrOmxhYmVsPnhuLS0t
+LS0tOGNkZ3NhdDBkaWJqZGRocmg2b2g8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLS0tLThr
+Y2ZwYXE0Y2hiaWRkZ3FoNm5oPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS0tYW5kLS04dmVp
+eWF6MmVrYmxkZGp0aDZxaDwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tLWFuZC04M2RodmF3
+NmRqYmtkZGlzaDZwaDwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tLS04c2JlbWFuOGJnYmhk
+ZGZwaDZtaDwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tYW5kLS04M2RodmF3NmRqYmtkZGlz
+aDZwaDwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tYW5kLThjZGdzYXQwZGliamRkaHJoNm9o
+PC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS04MGFkamFrMmJmYmdkZGVvaDZsaDwvbWFyazps
+YWJlbD48bWFyazpnb29kc0FuZFNlcnZpY2VzPtCz0LjRgtCw0YDQsDwvbWFyazpnb29kc0FuZFNl
+cnZpY2VzPjxtYXJrOnJlZk51bT4xMjM0PC9tYXJrOnJlZk51bT48bWFyazpwcm9EYXRlPjIwMDAt
+MDEtMDFUMDA6MDA6MDAuMDAwWjwvbWFyazpwcm9EYXRlPjxtYXJrOnRpdGxlPtCz0LjRgtCw0YDQ
+sDwvbWFyazp0aXRsZT48bWFyazpleGVjRGF0ZT4yMDEzLTAyLTAyVDAwOjAwOjAwLjAwMFo8L21h
+cms6ZXhlY0RhdGU+PC9tYXJrOnRyZWF0eU9yU3RhdHV0ZT48L21hcms6bWFyaz48ZHM6U2lnbmF0
+dXJlIHhtbG5zOmRzPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjIiBJZD0iX2Mw
+ZGU1ZDY1LWE1MzAtNDllYy1hNWRiLTY4MzQ3OWY1ZDkyNSI+PGRzOlNpZ25lZEluZm8+PGRzOkNh
+bm9uaWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEw
+L3htbC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJlTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3
+dy53My5vcmcvMjAwMS8wNC94bWxkc2lnLW1vcmUjcnNhLXNoYTI1NiIvPjxkczpSZWZlcmVuY2Ug
+VVJJPSIjXzU1YTgyMmViLTcwMmEtNGY4Ni04MzVmLWE1YmY1MTZmNDFlOCI+PGRzOlRyYW5zZm9y
+bXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1s
+ZHNpZyNlbnZlbG9wZWQtc2lnbmF0dXJlIi8+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6
+Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6
+RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxlbmMj
+c2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPjBoakVxWlBqQXlnYkFoY09Pc3ZhVFpVK2QwTEZrOGdX
+V0NzM0wvUmllWGs9PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48ZHM6UmVmZXJlbmNl
+IFVSST0iI182OTAzOGI0OC01YzcwLTRlNmEtOGRlMC05NTRjMTQ0YTUyZmEiPjxkczpUcmFuc2Zv
+cm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3ht
+bC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09
+Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1
+ZT5DaVRabjRaK1ppTUg2N3hITWVYZEsyZWxrSTd2cEFkMDRRNXBVZTYrOFVrPTwvZHM6RGlnZXN0
+VmFsdWU+PC9kczpSZWZlcmVuY2U+PC9kczpTaWduZWRJbmZvPjxkczpTaWduYXR1cmVWYWx1ZSBJ
+ZD0iX2YxYjk1ZTg0LTQ1ZDUtNDExNi1iMDY3LTQwZDVlMmFiZWUzYyI+b1BoR3NscHBjT2NzM3dM
+aWtaTncveXNJY3FFK0puZjFnVHhsMVl5WHZCL0pCZHJLZVc3MlZTckRzNFJ5anVzU2lOM0dQTThG
+S0c3ayYjMTM7ClZMYW91L0ozTm1FUGdyeEgvNHR6T29VelRieUpyMmR0RE5ZZW80ZXdzRnpiUFlr
+QTlTUnhQSmJFNWdwc2dKYkcwckpJUVg5eGN3T2cmIzEzOwpnN1I3cm9GNWpIcEsxa2JSVDZ6Q2l1
+QnFFSXlESU5ITy85Y0dqQTB5b043a0ovR21KUk5ob0lDUXR2VkJ2eE96WkJVbC8xWStkUWRWJiMx
+MzsKQVZYS1hjOUR6NytBellpRGVjS3lzNVBET3lGSXFPMDdDOHNqYktWY0lkNnFNWkJUblZNcWVz
+VHZRTzUxV1BqSGdFZlFFdlU3QzBBWCYjMTM7CmE5VzZDTVN0NEg3a1cvSWVmc0RNSkZNdWFHZExJ
+OEdTK2wxRjJMckdXY0xkNnVIUFNFWkpiMWY2MHJ0eGxna09YaXFzWTJDUW5taUwmIzEzOwpMSU13
+aFZ6SVAzSkpIN2cvMVlBcmlzNjBnMEdyQ0lxNVpKQy82NnVxOW14SzVXdThGS0d3MHV5bU1zeXhS
+Mnltc3BFcG1nMzFPS05kJiMxMzsKYUZKY0ZvRzN6YUVyMmduUXlNOHFCQU5FYlkzaHozcXFLQk5i
+VEtpQ2V4NXlEbmNKOUw1dGx4aDJLaitsRGRMclN2TnJIT2gyUElFcyYjMTM7ClU3K2xITXBvcEhV
+bnMxYjRVMnRkVWFKYUx0eGpOUHY3RUpjU2RSa2doMEJXOHNwVUo0Z1BKamZDNjVtcFdDMkhGK25h
+YnVQNm1nWVcmIzEzOwp2S0JCWTdyQXYxZzVxOEZPcHhuNUZsMVMwc2E5elpENVFtclVXRXRiUDlN
+WGVGcjhCR3pQREZmSXd5WmQycHEvMXBqVGM3OWw3TGM9PC9kczpTaWduYXR1cmVWYWx1ZT48ZHM6
+S2V5SW5mbyBJZD0iXzY5MDM4YjQ4LTVjNzAtNGU2YS04ZGUwLTk1NGMxNDRhNTJmYSI+PGRzOlg1
+MDlEYXRhPjxkczpYNTA5Q2VydGlmaWNhdGU+TUlJSFh6Q0NCVWVnQXdJQkFnSVVYcUkvdmQxOENh
+Zzk4b05wZHpWN0JpeS82RUF3RFFZSktvWklodmNOQVFFTkJRQXdmREVMTUFrRyYjMTM7CkExVUVC
+aE1DVlZNeFBEQTZCZ05WQkFvTU0wbHVkR1Z5Ym1WMElFTnZjbkJ2Y21GMGFXOXVJR1p2Y2lCQmMz
+TnBaMjVsWkNCT1lXMWwmIzEzOwpjeUJoYm1RZ1RuVnRZbVZ5Y3pFdk1DMEdBMVVFQXd3bVNVTkJU
+azRnVkhKaFpHVnRZWEpySUVOc1pXRnlhVzVuYUc5MWMyVWdVR2xzJiMxMzsKYjNRZ1EwRXdIaGNO
+TWpJeE1URTJNVE15T0RVNVdoY05NamN4TVRFMU1UTXlPRFU1V2pDQjBERUxNQWtHQTFVRUJoTUNR
+a1V4RVRBUCYjMTM7CkJnTlZCQWdUQ0VKeWRYTnpaV3h6TVJJd0VBWURWUVFIRXdsV2FXeDJiMjl5
+WkdVeE16QXhCZ05WQkFvVEtrUmxiRzlwZEhSbElFTnYmIzEzOwpibk4xYkhScGJtY2dZVzVrSUVG
+a2RtbHpiM0o1SUVOV1FrRXZVME5TVERFK01Ed0dBMVVFQXhNMVNVTkJUazRnVkUxRFNDQkJkWFJv
+JiMxMzsKYjNKcGVtVmtJRlJ5WVdSbGJXRnlheUJRYVd4dmRDQldZV3hwWkdGMGIzSWdWbUZzYVdR
+eEpUQWpCZ2txaGtpRzl3MEJDUUVXRm1KbCYjMTM7CmRHMWphSE50WkVCa1pXeHZhWFIwWlM1amIy
+MHdnZ0lpTUEwR0NTcUdTSWIzRFFFQkFRVUFBNElDRHdBd2dnSUtBb0lDQVFDNkZKd3omIzEzOwpL
+cVFWWDZmRzMvRUxSU0dXVjlHckthRk1LbWhXSXhlcHdSWk42TXhNcWtkNURuWWZpVCtXcDk4akVr
+cWdUeDJVTWI5cXVnY0dOVjZnJiMxMzsKMzUvQ3JRYi9GL216M0M0c2ZMTnVEcFNxSzlRRjgrcGFU
+SDZoUW1yT3BxVitVVHZkajlTTWdLR3lGaXpTODhDRFdNeDR3M2k0RkFLZSYjMTM7CjZOUnNKUkdU
+QXRLRHVNSGNBNHNqMDhHamUzbFBXY2dGdmNRTkRWZUVCVHVPSEJHK1JoajdWMUppTkdQLzRlcFRY
+VEZYZ1BGRGdlejMmIzEzOwpZQWZ4cXBidU80VFg2YmJZZGsybnZNTEZ2TEVOa0NGWXVsbllQemdu
+RUJHU01LSWFBSWxiK3NjSEN2V2dXajJUTGd3aDJHSk5jelZNJiMxMzsKMUxQTXFHUytVa2k5TWg3
+OTgyMi94b2FyNDk4eER4Mll4Lzhzd2dFTkxTZ0NzUUFXOG5NZ3dXbjZBYllsMlJBQlh1cmF5RnNu
+NFAxUiYjMTM7CnVRTm1VcC9xclJLUnZTSnIxT0xrSFpmRlRjU1lRYVZpdU1ZUFh6R3o4dG1NTGxt
+SS9CNkFDSDRBd1JNZG5ZdkZPM0tJMVJCblBLSWQmIzEzOwp3d2ZVcFo1SVRJcGJBN0NHZ1R4MXF4
+dE0xd0lVcjdwSGVLUDZqVmUza2RETGcrL0JaMnhNRXRCazVhOFk3QjR2M3h3SFhHVHZWOG1OJiMx
+MzsKMEFnL1N5VC9RVXlFUmhYVXlBTjIrRXdaK1NRQ1V5TmZ6aW9XUTg3OGVHeWtVKzQ2K0JiZ0kz
+SUlyMzZYS1B3bXp0MFNaK0tJM3RuRiYjMTM7ClRsbjltWDBLQzBpZG9qNXlrelBvQy9NSWVkMHNw
+NFRpZ3hFYldOeDdFRjgwUHZSL0RERXdWUEVFa2tqeTYzWEZ1bHhpQ1FJREFRQUImIzEzOwpvNElC
+Z2pDQ0FYNHdEQVlEVlIwVEFRSC9CQUl3QURBT0JnTlZIUThCQWY4RUJBTUNCNEF3SFFZRFZSME9C
+QllFRkhuOXMwREVhMmt2JiMxMzsKZ0UvZUlPVHNxb1c4NU1YRk1JRzZCZ05WSFNNRWdiSXdnYStB
+RkVkN1Q2NTZVWkcxMGIrZE51bUdmellXQktsRm9ZR0FwSDR3ZkRFTCYjMTM7Ck1Ba0dBMVVFQmhN
+Q1ZWTXhQREE2QmdOVkJBb01NMGx1ZEdWeWJtVjBJRU52Y25CdmNtRjBhVzl1SUdadmNpQkJjM05w
+WjI1bFpDQk8mIzEzOwpZVzFsY3lCaGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF3d21TVU5CVGs0
+Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5YVc1bmFHOTFjMlVnJiMxMzsKVUdsc2IzUWdRMEdDRkhwcWJU
+RmVKY1B0VUM5WHV1UEtQc0x3RFIrTU1EUUdBMVVkSHdRdE1Dc3dLYUFub0NXR0kyaDBkSEE2THk5
+aiYjMTM7CmNtd3VhV05oYm00dWIzSm5MM1J0WTJoZmNHbHNiM1F1WTNKc01Fd0dBMVVkSUFSRk1F
+TXdFQVlPS3dZQkJBR0N5UnNCQllNN0RBb3cmIzEzOwpMd1lJS3dZQkJRVUhBZ0V3SXpBaEJnZ3JC
+Z0VGQlFjQ0FSWVZhSFIwY0hNNkx5OWpjSE11YVdOaGJtNHViM0puTUEwR0NTcUdTSWIzJiMxMzsK
+RFFFQkRRVUFBNElDQVFCZFNhdDU2dWVqTG5BakZJRjk1ZGpZV0k2cy8vTjZZWHhzcnJNa0dCUDhF
+ZXpQeWhMaDZhd1A0ejdROVFBSSYjMTM7ClFaa1lveHJsLzF5MCtieVYycW5UVVVDTFJwSy9CRHAv
+aGNmd1BmS0NBLzJSUUNISnJiNit6MGVuRFBGUkswTkttd09jZGxHdFVrMG0mIzEzOwpQZ1dHU0t0
+dXdWc1BBaFRESnVob3NaT2hrTmYrblNPT0hyUU9uMUUycnpPcmQva1FscWlDd1JIOTc5Nk5wVEEr
+SFNNZk9vYkpFRVBxJiMxMzsKdHBGN1A1cWJ3dGw5NVVhNU9wNEFoYTcwSEhmVUZTNEJPUUtMQlZm
+TVpkT1IraVBvaDVPd0FLK2h0WWtGQ0c5UDJXSHU3d2Y4RUMrVyYjMTM7CjdrOTZndlRkOHhFN291
+b2FiVDJ4NllmWXFFbFBIaVUvSU05Z1Z6V1dML3N2WUR5U1Z1b0Z3QmpETk4xY2RxMHFPWVIxeXVT
+MWMvOUQmIzEzOwpGUjdlbzdHRkVDeStUQmQ3SWlLUmZCVmVZR09PUE1ub0ZmeFJMV3Jwc1dObndE
+N2xrUGtMQ2dGQ2srOHlFY09SZzYyNW1vNjV6NHk2JiMxMzsKSjRLOGZvZGE3cXdtWE5QM1JTMThv
+bjZCSHQ4bFErYlhnT0hteElIazBhTzBxTkRxZ3ZMcjJGbHlMR0pHaUVNUnFETU1SNi9hMDZidCYj
+MTM7CmtuVU1IbDdDcU1maklralA0Vk5OeUdQZEpnd1ZrMmtlYjl1TkZ2SkN4VCtNMmZHWFExTmJK
+TmZ0djVNZ1NzcDlOMXkreDZnQTNFaHcmIzEzOwp5SGxtSkI0WU10bzh0VFYxaTg0eFBYeGkyQ0Fl
+RGFHRHV3b3N0OFlVQ1NqcTdSQ0s4dEdjYUFZcmtYUVkyeVFmWDNjd0RzRXhScVZXJiMxMzsKeXJq
+eVJ0K042bUs5OVE9PTwvZHM6WDUwOUNlcnRpZmljYXRlPjwvZHM6WDUwOURhdGE+PC9kczpLZXlJ
+bmZvPjwvZHM6U2lnbmF0dXJlPjwvc21kOnNpZ25lZE1hcms+Cg==
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Holder-Arab/Court-Holder-Arab-Active.smd b/core/src/test/resources/google/registry/tmch/idn/Holder-Arab/Court-Holder-Arab-Active.smd
new file mode 100644
index 000000000..2a1419404
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Holder-Arab/Court-Holder-Arab-Active.smd
@@ -0,0 +1,118 @@
+Marks: الاختبار & لتقييم
+smdID: 000000911669082408667-65535
+U-labels: xn------nzeaagpf7azb2ppajr3fa, xn-----btdaafne4a7azpoaiq8ea, xn----ymcaaeld1a4a6onahp3ea, xn--mgbaadjcy1a8mmago8da
+notBefore: 2022-11-22T02:00:08.667Z
+notAfter: 2027-10-21T08:59:34.305Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il8wNDFk
+MDkwNi0wMzI2LTQ0NTktOTQ2NC00OGQ0MTZhOTZmMTUiPjxzbWQ6aWQ+MDAwMDAwOTExNjY5MDgy
+NDA4NjY3LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMjowMDowOC42NjdaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0yMVQwODo1OTozNC4zMDVaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazpj
+b3VydD48bWFyazppZD4wMDAxNDIxNTAzMzA1NTg0MTUwMzMwNTU4NC0xPC9tYXJrOmlkPjxtYXJr
+Om1hcmtOYW1lPtin2YTYp9iu2KrYqNin2LEgJmFtcDsg2YTYqtmC2YrZitmFPC9tYXJrOm1hcmtO
+YW1lPjxtYXJrOmhvbGRlciBlbnRpdGxlbWVudD0ib3duZXIiPjxtYXJrOm5hbWU+2YXZh9mG2K/Y
+syDYp9mE2YXYudmE2YjZhdin2KrZitipPC9tYXJrOm5hbWU+PG1hcms6b3JnPtin2K7Yqtio2KfY
+sTwvbWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpzdHJlZXQ+2KzYudmB2LEg2KfYqNmGINiz2YrZ
+htin2KEgNzU8L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+2YXZg9mG2KfYszwvbWFyazpjaXR5Pjxt
+YXJrOnBjPjI5MDA8L21hcms6cGM+PG1hcms6Y2M+TUE8L21hcms6Y2M+PC9tYXJrOmFkZHI+PG1h
+cms6dm9pY2U+KzIxMi41MjI1MzkwNDA8L21hcms6dm9pY2U+PG1hcms6ZmF4PisyMTIuNTIyNTM5
+MDQxPC9tYXJrOmZheD48bWFyazplbWFpbD5pbmZvQGV4YW1wbGUuZXhhbXBsZTwvbWFyazplbWFp
+bD48L21hcms6aG9sZGVyPjxtYXJrOmxhYmVsPnhuLS0tLS0tbnplYWFncGY3YXpiMnBwYWpyM2Zh
+PC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS0tLS1idGRhYWZuZTRhN2F6cG9haXE4ZWE8L21h
+cms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLS0teW1jYWFlbGQxYTRhNm9uYWhwM2VhPC9tYXJrOmxh
+YmVsPjxtYXJrOmxhYmVsPnhuLS1tZ2JhYWRqY3kxYThtbWFnbzhkYTwvbWFyazpsYWJlbD48bWFy
+azpnb29kc0FuZFNlcnZpY2VzPti62YrYqtin2LE8L21hcms6Z29vZHNBbmRTZXJ2aWNlcz48bWFy
+azpyZWZOdW0+MTk4PC9tYXJrOnJlZk51bT48bWFyazpwcm9EYXRlPjIwMTUtMDktMTVUMDA6MDA6
+MDAuMDAwWjwvbWFyazpwcm9EYXRlPjxtYXJrOmNjPk1BPC9tYXJrOmNjPjxtYXJrOmNvdXJ0TmFt
+ZT7Yp9mE2K/Yp9ixINin2YTYqNmK2LbYp9ihPC9tYXJrOmNvdXJ0TmFtZT48L21hcms6Y291cnQ+
+PC9tYXJrOm1hcms+PGRzOlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAw
+MC8wOS94bWxkc2lnIyIgSWQ9Il83ZjU2ZmM2MS01M2JmLTQ2YzItODg4Ni1kZjk1Yjk0ZjUzNjQi
+PjxkczpTaWduZWRJbmZvPjxkczpDYW5vbmljYWxpemF0aW9uTWV0aG9kIEFsZ29yaXRobT0iaHR0
+cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PGRzOlNpZ25hdHVyZU1ldGhv
+ZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZHNpZy1tb3JlI3JzYS1z
+aGEyNTYiLz48ZHM6UmVmZXJlbmNlIFVSST0iI18wNDFkMDkwNi0wMzI2LTQ0NTktOTQ2NC00OGQ0
+MTZhOTZmMTUiPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8v
+d3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjZW52ZWxvcGVkLXNpZ25hdHVyZSIvPjxkczpUcmFu
+c2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMi
+Lz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cu
+dzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1ZT5Zd0dhd0I4K0VF
+VmtjVTJGbkNTaGpGUFBkL3ZvTTNuVXBTenpza3Rtdm9nPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpS
+ZWZlcmVuY2U+PGRzOlJlZmVyZW5jZSBVUkk9IiNfZDllYjEwY2EtODIwMy00NWNjLTlmN2EtNDEz
+NGQ3MjE0ODI2Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDov
+L3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpE
+aWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNz
+aGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+cVhXU1JvNUdzL3lCU01NQkRXeWwyTGphMG4yOHp1elcy
+Y0h3cjJjM1BDbz08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNlPjwvZHM6U2lnbmVkSW5m
+bz48ZHM6U2lnbmF0dXJlVmFsdWUgSWQ9Il84ZDgzODRmOC01MWI3LTQ2ZjktOWNmNC03ZjkzNmRl
+OTIwMTgiPksyMForaUFWT2RMdE82NzVrRnAxdEtPTnpwWnV3ZS9UcVpTWEx1V0J4QzVmYUQ4dG9y
+eXNGVjN2ZndBL0hDcjZocHFGb1dVMkl5U0ImIzEzOwp5TFh5bzRUaGM1RnU3T0NHOWJmNkJSeW5Z
+VjdhSHpGL2dzZXc4ZFJJL2hGWXZFR0JzQXNDVzRtM0s0RWlwS3g1Z3hUNDVvb3ljUXhYJiMxMzsK
+SWcreW1teDdpMDlCV0t3OHZUVlhDQk9jZFlSZ0RQTjQ2MWpuK0hQYW5yTGNuQW5hY0xDeGRCRlpy
+eG1NT3hYSzVvNDFDcHdoUjV1eiYjMTM7CkN1bXd4VGFCNDNUck1hUlA3bkxFdmpvVlV5b1FxTWFK
+SG03bWdPQnNZbVEvQzFzaFlYSnNWNVg5VG9JTDNBSzFHaTE3RTN5eWcwOGQmIzEzOwpLWUhsQUhP
+U3Y0eEk3TlpHbUtid212UlZRM0JEMEUreDNWZFNxVGpYTlZyVXZZOGRtbWVLbWg3Mlk1UGdzSU1T
+YXZIc0cxS1ljWktvJiMxMzsKcjNteVR3Q3M4bEZmLzBZdXlZUDRNaVZJcFZ2VGVhYmNsWGk1VDk4
+RVpxMExmODlGRjN4d3FEdlU5MjBoaDdUNnIrc2tubVBoU1RkNiYjMTM7CnR3QldmUk1JcEVERUpw
+TCsyeUM5ZTh4NXhaSFFVV2d0MWJpeEtDdXZ6K0NMNUdDdXhpRUozbjdLZWxnbmF2dG9qdGFxYjhR
+TzFGdTgmIzEzOwpDNU1abHoreC9Pc1Fvb2x2UmgreTBRRE01THU0OUFOdmgzUnNJcVdzeWFRb3V2
+YmZHUjlLSk55MGNzZXdmNDNLa0NtRTFEc0ZESjNjJiMxMzsKeTI2ZERMMTJCelJBVmNoMWNiOGZu
+R1FZNDBCM0YvUDJrQnhENzBzSHR2TUNFYm96WEFiUjRCN1c2Sis5ZDlFVmo0VXU3RVMyMGVFPTwv
+ZHM6U2lnbmF0dXJlVmFsdWU+PGRzOktleUluZm8gSWQ9Il9kOWViMTBjYS04MjAzLTQ1Y2MtOWY3
+YS00MTM0ZDcyMTQ4MjYiPjxkczpYNTA5RGF0YT48ZHM6WDUwOUNlcnRpZmljYXRlPk1JSUhYekND
+QlVlZ0F3SUJBZ0lVWHFJL3ZkMThDYWc5OG9OcGR6VjdCaXkvNkVBd0RRWUpLb1pJaHZjTkFRRU5C
+UUF3ZkRFTE1Ba0cmIzEzOwpBMVVFQmhNQ1ZWTXhQREE2QmdOVkJBb01NMGx1ZEdWeWJtVjBJRU52
+Y25CdmNtRjBhVzl1SUdadmNpQkJjM05wWjI1bFpDQk9ZVzFsJiMxMzsKY3lCaGJtUWdUblZ0WW1W
+eWN6RXZNQzBHQTFVRUF3d21TVU5CVGs0Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5YVc1bmFHOTFjMlVn
+VUdscyYjMTM7CmIzUWdRMEV3SGhjTk1qSXhNVEUyTVRNeU9EVTVXaGNOTWpjeE1URTFNVE15T0RV
+NVdqQ0IwREVMTUFrR0ExVUVCaE1DUWtVeEVUQVAmIzEzOwpCZ05WQkFnVENFSnlkWE56Wld4ek1S
+SXdFQVlEVlFRSEV3bFdhV3gyYjI5eVpHVXhNekF4QmdOVkJBb1RLa1JsYkc5cGRIUmxJRU52JiMx
+MzsKYm5OMWJIUnBibWNnWVc1a0lFRmtkbWx6YjNKNUlFTldRa0V2VTBOU1RERStNRHdHQTFVRUF4
+TTFTVU5CVGs0Z1ZFMURTQ0JCZFhSbyYjMTM7CmIzSnBlbVZrSUZSeVlXUmxiV0Z5YXlCUWFXeHZk
+Q0JXWVd4cFpHRjBiM0lnVm1Gc2FXUXhKVEFqQmdrcWhraUc5dzBCQ1FFV0ZtSmwmIzEzOwpkRzFq
+YUhOdFpFQmtaV3h2YVhSMFpTNWpiMjB3Z2dJaU1BMEdDU3FHU0liM0RRRUJBUVVBQTRJQ0R3QXdn
+Z0lLQW9JQ0FRQzZGSnd6JiMxMzsKS3FRVlg2ZkczL0VMUlNHV1Y5R3JLYUZNS21oV0l4ZXB3UlpO
+Nk14TXFrZDVEbllmaVQrV3A5OGpFa3FnVHgyVU1iOXF1Z2NHTlY2ZyYjMTM7CjM1L0NyUWIvRi9t
+ejNDNHNmTE51RHBTcUs5UUY4K3BhVEg2aFFtck9wcVYrVVR2ZGo5U01nS0d5Rml6Uzg4Q0RXTXg0
+dzNpNEZBS2UmIzEzOwo2TlJzSlJHVEF0S0R1TUhjQTRzajA4R2plM2xQV2NnRnZjUU5EVmVFQlR1
+T0hCRytSaGo3VjFKaU5HUC80ZXBUWFRGWGdQRkRnZXozJiMxMzsKWUFmeHFwYnVPNFRYNmJiWWRr
+Mm52TUxGdkxFTmtDRll1bG5ZUHpnbkVCR1NNS0lhQUlsYitzY0hDdldnV2oyVExnd2gyR0pOY3pW
+TSYjMTM7CjFMUE1xR1MrVWtpOU1oNzk4MjIveG9hcjQ5OHhEeDJZeC84c3dnRU5MU2dDc1FBVzhu
+TWd3V242QWJZbDJSQUJYdXJheUZzbjRQMVImIzEzOwp1UU5tVXAvcXJSS1J2U0pyMU9Ma0haZkZU
+Y1NZUWFWaXVNWVBYekd6OHRtTUxsbUkvQjZBQ0g0QXdSTWRuWXZGTzNLSTFSQm5QS0lkJiMxMzsK
+d3dmVXBaNUlUSXBiQTdDR2dUeDFxeHRNMXdJVXI3cEhlS1A2alZlM2tkRExnKy9CWjJ4TUV0Qms1
+YThZN0I0djN4d0hYR1R2VjhtTiYjMTM7CjBBZy9TeVQvUVV5RVJoWFV5QU4yK0V3WitTUUNVeU5m
+emlvV1E4NzhlR3lrVSs0NitCYmdJM0lJcjM2WEtQd216dDBTWitLSTN0bkYmIzEzOwpUbG45bVgw
+S0MwaWRvajV5a3pQb0MvTUllZDBzcDRUaWd4RWJXTng3RUY4MFB2Ui9EREV3VlBFRWtrank2M1hG
+dWx4aUNRSURBUUFCJiMxMzsKbzRJQmdqQ0NBWDR3REFZRFZSMFRBUUgvQkFJd0FEQU9CZ05WSFE4
+QkFmOEVCQU1DQjRBd0hRWURWUjBPQkJZRUZIbjlzMERFYTJrdiYjMTM7CmdFL2VJT1RzcW9XODVN
+WEZNSUc2QmdOVkhTTUVnYkl3Z2ErQUZFZDdUNjU2VVpHMTBiK2ROdW1HZnpZV0JLbEZvWUdBcEg0
+d2ZERUwmIzEzOwpNQWtHQTFVRUJoTUNWVk14UERBNkJnTlZCQW9NTTBsdWRHVnlibVYwSUVOdmNu
+QnZjbUYwYVc5dUlHWnZjaUJCYzNOcFoyNWxaQ0JPJiMxMzsKWVcxbGN5QmhibVFnVG5WdFltVnlj
+ekV2TUMwR0ExVUVBd3dtU1VOQlRrNGdWSEpoWkdWdFlYSnJJRU5zWldGeWFXNW5hRzkxYzJVZyYj
+MTM7ClVHbHNiM1FnUTBHQ0ZIcHFiVEZlSmNQdFVDOVh1dVBLUHNMd0RSK01NRFFHQTFVZEh3UXRN
+Q3N3S2FBbm9DV0dJMmgwZEhBNkx5OWomIzEzOwpjbXd1YVdOaGJtNHViM0puTDNSdFkyaGZjR2xz
+YjNRdVkzSnNNRXdHQTFVZElBUkZNRU13RUFZT0t3WUJCQUdDeVJzQkJZTTdEQW93JiMxMzsKTHdZ
+SUt3WUJCUVVIQWdFd0l6QWhCZ2dyQmdFRkJRY0NBUllWYUhSMGNITTZMeTlqY0hNdWFXTmhibTR1
+YjNKbk1BMEdDU3FHU0liMyYjMTM7CkRRRUJEUVVBQTRJQ0FRQmRTYXQ1NnVlakxuQWpGSUY5NWRq
+WVdJNnMvL042WVh4c3JyTWtHQlA4RWV6UHloTGg2YXdQNHo3UTlRQUkmIzEzOwpRWmtZb3hybC8x
+eTArYnlWMnFuVFVVQ0xScEsvQkRwL2hjZndQZktDQS8yUlFDSEpyYjYrejBlbkRQRlJLME5LbXdP
+Y2RsR3RVazBtJiMxMzsKUGdXR1NLdHV3VnNQQWhUREp1aG9zWk9oa05mK25TT09IclFPbjFFMnJ6
+T3JkL2tRbHFpQ3dSSDk3OTZOcFRBK0hTTWZPb2JKRUVQcSYjMTM7CnRwRjdQNXFid3RsOTVVYTVP
+cDRBaGE3MEhIZlVGUzRCT1FLTEJWZk1aZE9SK2lQb2g1T3dBSytodFlrRkNHOVAyV0h1N3dmOEVD
+K1cmIzEzOwo3azk2Z3ZUZDh4RTdvdW9hYlQyeDZZZllxRWxQSGlVL0lNOWdWeldXTC9zdllEeVNW
+dW9Gd0JqRE5OMWNkcTBxT1lSMXl1UzFjLzlEJiMxMzsKRlI3ZW83R0ZFQ3krVEJkN0lpS1JmQlZl
+WUdPT1BNbm9GZnhSTFdycHNXTm53RDdsa1BrTENnRkNrKzh5RWNPUmc2MjVtbzY1ejR5NiYjMTM7
+Cko0Szhmb2RhN3F3bVhOUDNSUzE4b242Qkh0OGxRK2JYZ09IbXhJSGswYU8wcU5EcWd2THIyRmx5
+TEdKR2lFTVJxRE1NUjYvYTA2YnQmIzEzOwprblVNSGw3Q3FNZmpJa2pQNFZOTnlHUGRKZ3dWazJr
+ZWI5dU5GdkpDeFQrTTJmR1hRMU5iSk5mdHY1TWdTc3A5TjF5K3g2Z0EzRWh3JiMxMzsKeUhsbUpC
+NFlNdG84dFRWMWk4NHhQWHhpMkNBZURhR0R1d29zdDhZVUNTanE3UkNLOHRHY2FBWXJrWFFZMnlR
+ZlgzY3dEc0V4UnFWVyYjMTM7CnlyanlSdCtONm1LOTlRPT08L2RzOlg1MDlDZXJ0aWZpY2F0ZT48
+L2RzOlg1MDlEYXRhPjwvZHM6S2V5SW5mbz48L2RzOlNpZ25hdHVyZT48L3NtZDpzaWduZWRNYXJr
+Pgo=
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Holder-Arab/Court-Holder-Arab-Revoked.smd b/core/src/test/resources/google/registry/tmch/idn/Holder-Arab/Court-Holder-Arab-Revoked.smd
new file mode 100644
index 000000000..9808b11fb
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Holder-Arab/Court-Holder-Arab-Revoked.smd
@@ -0,0 +1,118 @@
+Marks: الاختبار & لتقييم
+smdID: 000000911669082362045-65535
+U-labels: xn------nzeaagpf7azb2ppajr3fa, xn-----btdaafne4a7azpoaiq8ea, xn----ymcaaeld1a4a6onahp3ea, xn--mgbaadjcy1a8mmago8da
+notBefore: 2022-11-22T01:59:22.045Z
+notAfter: 2027-10-21T08:59:34.305Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il84MGJl
+MGFhOC0wOTIzLTRhNTEtYmJkZS02NTJiZWUxMDE2ZWEiPjxzbWQ6aWQ+MDAwMDAwOTExNjY5MDgy
+MzYyMDQ1LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMTo1OToyMi4wNDVaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0yMVQwODo1OTozNC4zMDVaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazpj
+b3VydD48bWFyazppZD4wMDAxNDIxNTAzMzA1NTg0MTUwMzMwNTU4NC0xPC9tYXJrOmlkPjxtYXJr
+Om1hcmtOYW1lPtin2YTYp9iu2KrYqNin2LEgJmFtcDsg2YTYqtmC2YrZitmFPC9tYXJrOm1hcmtO
+YW1lPjxtYXJrOmhvbGRlciBlbnRpdGxlbWVudD0ib3duZXIiPjxtYXJrOm5hbWU+2YXZh9mG2K/Y
+syDYp9mE2YXYudmE2YjZhdin2KrZitipPC9tYXJrOm5hbWU+PG1hcms6b3JnPtin2K7Yqtio2KfY
+sTwvbWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpzdHJlZXQ+2KzYudmB2LEg2KfYqNmGINiz2YrZ
+htin2KEgNzU8L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+2YXZg9mG2KfYszwvbWFyazpjaXR5Pjxt
+YXJrOnBjPjI5MDA8L21hcms6cGM+PG1hcms6Y2M+TUE8L21hcms6Y2M+PC9tYXJrOmFkZHI+PG1h
+cms6dm9pY2U+KzIxMi41MjI1MzkwNDA8L21hcms6dm9pY2U+PG1hcms6ZmF4PisyMTIuNTIyNTM5
+MDQxPC9tYXJrOmZheD48bWFyazplbWFpbD5pbmZvQGV4YW1wbGUuZXhhbXBsZTwvbWFyazplbWFp
+bD48L21hcms6aG9sZGVyPjxtYXJrOmxhYmVsPnhuLS0tLS0tbnplYWFncGY3YXpiMnBwYWpyM2Zh
+PC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS0tLS1idGRhYWZuZTRhN2F6cG9haXE4ZWE8L21h
+cms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLS0teW1jYWFlbGQxYTRhNm9uYWhwM2VhPC9tYXJrOmxh
+YmVsPjxtYXJrOmxhYmVsPnhuLS1tZ2JhYWRqY3kxYThtbWFnbzhkYTwvbWFyazpsYWJlbD48bWFy
+azpnb29kc0FuZFNlcnZpY2VzPti62YrYqtin2LE8L21hcms6Z29vZHNBbmRTZXJ2aWNlcz48bWFy
+azpyZWZOdW0+MTk4PC9tYXJrOnJlZk51bT48bWFyazpwcm9EYXRlPjIwMTUtMDktMTVUMDA6MDA6
+MDAuMDAwWjwvbWFyazpwcm9EYXRlPjxtYXJrOmNjPk1BPC9tYXJrOmNjPjxtYXJrOmNvdXJ0TmFt
+ZT7Yp9mE2K/Yp9ixINin2YTYqNmK2LbYp9ihPC9tYXJrOmNvdXJ0TmFtZT48L21hcms6Y291cnQ+
+PC9tYXJrOm1hcms+PGRzOlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAw
+MC8wOS94bWxkc2lnIyIgSWQ9Il83ZjI4ZTVjOC1jOGY2LTRjMjEtOWQzZC01MTRkMTk1M2E4YWYi
+PjxkczpTaWduZWRJbmZvPjxkczpDYW5vbmljYWxpemF0aW9uTWV0aG9kIEFsZ29yaXRobT0iaHR0
+cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PGRzOlNpZ25hdHVyZU1ldGhv
+ZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZHNpZy1tb3JlI3JzYS1z
+aGEyNTYiLz48ZHM6UmVmZXJlbmNlIFVSST0iI184MGJlMGFhOC0wOTIzLTRhNTEtYmJkZS02NTJi
+ZWUxMDE2ZWEiPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8v
+d3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjZW52ZWxvcGVkLXNpZ25hdHVyZSIvPjxkczpUcmFu
+c2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMi
+Lz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cu
+dzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1ZT4xMHV0enExVGln
+ZGJmc1k1M0lTL3JkTmpkRWdEQ01hdlBRNlBudU9ZWXRFPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpS
+ZWZlcmVuY2U+PGRzOlJlZmVyZW5jZSBVUkk9IiNfNTBmMDJhOGQtNjM3OS00YzA3LTlhODItNmMx
+M2RmNzc2NGRlIj48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDov
+L3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpE
+aWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNz
+aGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+RnZlY1FZRFptajR2Nm5zcm9QaTF2R1VpbDBmeGpXY1hP
+ejRNbklaZmx5TT08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNlPjwvZHM6U2lnbmVkSW5m
+bz48ZHM6U2lnbmF0dXJlVmFsdWUgSWQ9Il82ZDFiMDBkNS1jYzA1LTQ5NTUtOWYxNS0zNDE0YTBj
+ZWQ5YzkiPkEyWEp2NWhEejZDVDNSbE1OekNNYnZIUGEzQmRIL0FMMjVYVEJjaUZzL3JoNW9ZbHRM
+MUxpN1ZwSXdhZWI3R3hXc1A1VVdZK3JRWWkmIzEzOwo2NFdqR001bktERjIrdzZUK1MySVIzanVp
+dmU2bTc5cXhFTEgxcnBtQVhFNDA0TFh6Vjh0bFFsd1JNSXdzNnB0YU1acTdjc1RQU0tkJiMxMzsK
+UW5qYlNTVXFDRWxMNm4xZjlLVTBUcWVoYzEvUlk3MFN4YU1oNVZRc3ZYcXV0VEZiQTlhSitlNHhG
+WStWZXlSdmxqTU90YTlGMGc1VCYjMTM7CnQ2M0poL2krYUpMVUVQNVJXWjZYR3prOENGak1CUkJq
+WUE4cXdHTUM2eEI5MkFIVVpkaXB4SDM4Y21RZ2J1WWRGTXJvN0lYOGRQV3AmIzEzOwpGTjdFSzRn
+S0k3bWJXclZtM296OGlyNnA1MzNiMmNBbDdWYTRlT2luYnpJOFlhQmRxRXpvTlAvRTJZT3ZzYyt5
+eWlFdGxMbTRPdS90JiMxMzsKdEhXS3E1RE9IdGNDV3d5MzQ3NDdqSVI1c2VXTU4rWVh3bGkraml5
+NWNEeHVzcWFFQXhwd1ByL3RiakF6ekRPSjl2aEw2c0E3QTFiQyYjMTM7CldySERBTC9NQ2RyOXFX
+bWlFRjZjb2h6M0hGZFg3azhwcUI4aFZOZnpGTkUvOWtzNW5YcXM2MzkzTm1lRVZoRGNXQnFoenhw
+NjhRSkQmIzEzOwpRMzg5SlYwOGlhRWF1MnQ5MUNueXdlTk1pMFFLM0VYQ3l4VTVRbWFDc1RPWExB
+ejlmM0l0Mm5BS2V2TUVkMzFZekNrc001RWZhYVp1JiMxMzsKNGUwemlVWWo2L2doRnRUeW5tc0Ez
+cGNDYjFtYzRTTkJ1c3poVXF3bEEyNEh0aDFqYkFXQTh5TEFjdUJPQWVPMWI1aWVVSmltTmZNPTwv
+ZHM6U2lnbmF0dXJlVmFsdWU+PGRzOktleUluZm8gSWQ9Il81MGYwMmE4ZC02Mzc5LTRjMDctOWE4
+Mi02YzEzZGY3NzY0ZGUiPjxkczpYNTA5RGF0YT48ZHM6WDUwOUNlcnRpZmljYXRlPk1JSUhYekND
+QlVlZ0F3SUJBZ0lVWHFJL3ZkMThDYWc5OG9OcGR6VjdCaXkvNkVBd0RRWUpLb1pJaHZjTkFRRU5C
+UUF3ZkRFTE1Ba0cmIzEzOwpBMVVFQmhNQ1ZWTXhQREE2QmdOVkJBb01NMGx1ZEdWeWJtVjBJRU52
+Y25CdmNtRjBhVzl1SUdadmNpQkJjM05wWjI1bFpDQk9ZVzFsJiMxMzsKY3lCaGJtUWdUblZ0WW1W
+eWN6RXZNQzBHQTFVRUF3d21TVU5CVGs0Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5YVc1bmFHOTFjMlVn
+VUdscyYjMTM7CmIzUWdRMEV3SGhjTk1qSXhNVEUyTVRNeU9EVTVXaGNOTWpjeE1URTFNVE15T0RV
+NVdqQ0IwREVMTUFrR0ExVUVCaE1DUWtVeEVUQVAmIzEzOwpCZ05WQkFnVENFSnlkWE56Wld4ek1S
+SXdFQVlEVlFRSEV3bFdhV3gyYjI5eVpHVXhNekF4QmdOVkJBb1RLa1JsYkc5cGRIUmxJRU52JiMx
+MzsKYm5OMWJIUnBibWNnWVc1a0lFRmtkbWx6YjNKNUlFTldRa0V2VTBOU1RERStNRHdHQTFVRUF4
+TTFTVU5CVGs0Z1ZFMURTQ0JCZFhSbyYjMTM7CmIzSnBlbVZrSUZSeVlXUmxiV0Z5YXlCUWFXeHZk
+Q0JXWVd4cFpHRjBiM0lnVm1Gc2FXUXhKVEFqQmdrcWhraUc5dzBCQ1FFV0ZtSmwmIzEzOwpkRzFq
+YUhOdFpFQmtaV3h2YVhSMFpTNWpiMjB3Z2dJaU1BMEdDU3FHU0liM0RRRUJBUVVBQTRJQ0R3QXdn
+Z0lLQW9JQ0FRQzZGSnd6JiMxMzsKS3FRVlg2ZkczL0VMUlNHV1Y5R3JLYUZNS21oV0l4ZXB3UlpO
+Nk14TXFrZDVEbllmaVQrV3A5OGpFa3FnVHgyVU1iOXF1Z2NHTlY2ZyYjMTM7CjM1L0NyUWIvRi9t
+ejNDNHNmTE51RHBTcUs5UUY4K3BhVEg2aFFtck9wcVYrVVR2ZGo5U01nS0d5Rml6Uzg4Q0RXTXg0
+dzNpNEZBS2UmIzEzOwo2TlJzSlJHVEF0S0R1TUhjQTRzajA4R2plM2xQV2NnRnZjUU5EVmVFQlR1
+T0hCRytSaGo3VjFKaU5HUC80ZXBUWFRGWGdQRkRnZXozJiMxMzsKWUFmeHFwYnVPNFRYNmJiWWRr
+Mm52TUxGdkxFTmtDRll1bG5ZUHpnbkVCR1NNS0lhQUlsYitzY0hDdldnV2oyVExnd2gyR0pOY3pW
+TSYjMTM7CjFMUE1xR1MrVWtpOU1oNzk4MjIveG9hcjQ5OHhEeDJZeC84c3dnRU5MU2dDc1FBVzhu
+TWd3V242QWJZbDJSQUJYdXJheUZzbjRQMVImIzEzOwp1UU5tVXAvcXJSS1J2U0pyMU9Ma0haZkZU
+Y1NZUWFWaXVNWVBYekd6OHRtTUxsbUkvQjZBQ0g0QXdSTWRuWXZGTzNLSTFSQm5QS0lkJiMxMzsK
+d3dmVXBaNUlUSXBiQTdDR2dUeDFxeHRNMXdJVXI3cEhlS1A2alZlM2tkRExnKy9CWjJ4TUV0Qms1
+YThZN0I0djN4d0hYR1R2VjhtTiYjMTM7CjBBZy9TeVQvUVV5RVJoWFV5QU4yK0V3WitTUUNVeU5m
+emlvV1E4NzhlR3lrVSs0NitCYmdJM0lJcjM2WEtQd216dDBTWitLSTN0bkYmIzEzOwpUbG45bVgw
+S0MwaWRvajV5a3pQb0MvTUllZDBzcDRUaWd4RWJXTng3RUY4MFB2Ui9EREV3VlBFRWtrank2M1hG
+dWx4aUNRSURBUUFCJiMxMzsKbzRJQmdqQ0NBWDR3REFZRFZSMFRBUUgvQkFJd0FEQU9CZ05WSFE4
+QkFmOEVCQU1DQjRBd0hRWURWUjBPQkJZRUZIbjlzMERFYTJrdiYjMTM7CmdFL2VJT1RzcW9XODVN
+WEZNSUc2QmdOVkhTTUVnYkl3Z2ErQUZFZDdUNjU2VVpHMTBiK2ROdW1HZnpZV0JLbEZvWUdBcEg0
+d2ZERUwmIzEzOwpNQWtHQTFVRUJoTUNWVk14UERBNkJnTlZCQW9NTTBsdWRHVnlibVYwSUVOdmNu
+QnZjbUYwYVc5dUlHWnZjaUJCYzNOcFoyNWxaQ0JPJiMxMzsKWVcxbGN5QmhibVFnVG5WdFltVnlj
+ekV2TUMwR0ExVUVBd3dtU1VOQlRrNGdWSEpoWkdWdFlYSnJJRU5zWldGeWFXNW5hRzkxYzJVZyYj
+MTM7ClVHbHNiM1FnUTBHQ0ZIcHFiVEZlSmNQdFVDOVh1dVBLUHNMd0RSK01NRFFHQTFVZEh3UXRN
+Q3N3S2FBbm9DV0dJMmgwZEhBNkx5OWomIzEzOwpjbXd1YVdOaGJtNHViM0puTDNSdFkyaGZjR2xz
+YjNRdVkzSnNNRXdHQTFVZElBUkZNRU13RUFZT0t3WUJCQUdDeVJzQkJZTTdEQW93JiMxMzsKTHdZ
+SUt3WUJCUVVIQWdFd0l6QWhCZ2dyQmdFRkJRY0NBUllWYUhSMGNITTZMeTlqY0hNdWFXTmhibTR1
+YjNKbk1BMEdDU3FHU0liMyYjMTM7CkRRRUJEUVVBQTRJQ0FRQmRTYXQ1NnVlakxuQWpGSUY5NWRq
+WVdJNnMvL042WVh4c3JyTWtHQlA4RWV6UHloTGg2YXdQNHo3UTlRQUkmIzEzOwpRWmtZb3hybC8x
+eTArYnlWMnFuVFVVQ0xScEsvQkRwL2hjZndQZktDQS8yUlFDSEpyYjYrejBlbkRQRlJLME5LbXdP
+Y2RsR3RVazBtJiMxMzsKUGdXR1NLdHV3VnNQQWhUREp1aG9zWk9oa05mK25TT09IclFPbjFFMnJ6
+T3JkL2tRbHFpQ3dSSDk3OTZOcFRBK0hTTWZPb2JKRUVQcSYjMTM7CnRwRjdQNXFid3RsOTVVYTVP
+cDRBaGE3MEhIZlVGUzRCT1FLTEJWZk1aZE9SK2lQb2g1T3dBSytodFlrRkNHOVAyV0h1N3dmOEVD
+K1cmIzEzOwo3azk2Z3ZUZDh4RTdvdW9hYlQyeDZZZllxRWxQSGlVL0lNOWdWeldXTC9zdllEeVNW
+dW9Gd0JqRE5OMWNkcTBxT1lSMXl1UzFjLzlEJiMxMzsKRlI3ZW83R0ZFQ3krVEJkN0lpS1JmQlZl
+WUdPT1BNbm9GZnhSTFdycHNXTm53RDdsa1BrTENnRkNrKzh5RWNPUmc2MjVtbzY1ejR5NiYjMTM7
+Cko0Szhmb2RhN3F3bVhOUDNSUzE4b242Qkh0OGxRK2JYZ09IbXhJSGswYU8wcU5EcWd2THIyRmx5
+TEdKR2lFTVJxRE1NUjYvYTA2YnQmIzEzOwprblVNSGw3Q3FNZmpJa2pQNFZOTnlHUGRKZ3dWazJr
+ZWI5dU5GdkpDeFQrTTJmR1hRMU5iSk5mdHY1TWdTc3A5TjF5K3g2Z0EzRWh3JiMxMzsKeUhsbUpC
+NFlNdG84dFRWMWk4NHhQWHhpMkNBZURhR0R1d29zdDhZVUNTanE3UkNLOHRHY2FBWXJrWFFZMnlR
+ZlgzY3dEc0V4UnFWVyYjMTM7CnlyanlSdCtONm1LOTlRPT08L2RzOlg1MDlDZXJ0aWZpY2F0ZT48
+L2RzOlg1MDlEYXRhPjwvZHM6S2V5SW5mbz48L2RzOlNpZ25hdHVyZT48L3NtZDpzaWduZWRNYXJr
+Pgo=
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Holder-Arab/Trademark-Holder-Arab-Active.smd b/core/src/test/resources/google/registry/tmch/idn/Holder-Arab/Trademark-Holder-Arab-Active.smd
new file mode 100644
index 000000000..c8ed061bf
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Holder-Arab/Trademark-Holder-Arab-Active.smd
@@ -0,0 +1,121 @@
+Marks: الاختبار & لتقييم
+smdID: 000000901669082404119-65535
+U-labels: xn------nzeaagpf7azb2ppajr3fa, xn-----btdaafne4a7azpoaiq8ea, xn----ymcaaeld1a4a6onahp3ea, xn-----btdaafne4a7azpoaiq4byba, xn----ymcaaeld1a4a6onahp2b7aa, xn--mgbaadjcy1a8mmago8da, xn----ymcaaeld1a4a6onahp1b8aa, xn--mgbaadjcy1a8mmago9a5aa
+notBefore: 2022-11-22T02:00:04.119Z
+notAfter: 2027-10-21T08:59:34.305Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il9iM2U5
+M2ZlMC1mMTNjLTQ1MmEtYjcwYS02ODI1YTNkNzdjNGUiPjxzbWQ6aWQ+MDAwMDAwOTAxNjY5MDgy
+NDA0MTE5LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMjowMDowNC4xMTlaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0yMVQwODo1OTozNC4zMDVaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
+cmFkZW1hcms+PG1hcms6aWQ+MDAwMTQyMTUwMzMwNTI5OTE1MDMzMDUyOTktMTwvbWFyazppZD48
+bWFyazptYXJrTmFtZT7Yp9mE2KfYrtiq2KjYp9ixICZhbXA7INmE2KrZgtmK2YrZhTwvbWFyazpt
+YXJrTmFtZT48bWFyazpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpuYW1lPtmF2YfZ
+htiv2LMg2KfZhNmF2LnZhNmI2YXYp9iq2YrYqTwvbWFyazpuYW1lPjxtYXJrOm9yZz7Yp9iu2KrY
+qNin2LE8L21hcms6b3JnPjxtYXJrOmFkZHI+PG1hcms6c3RyZWV0Ptis2LnZgdixINin2KjZhiDY
+s9mK2YbYp9ihIDc1PC9tYXJrOnN0cmVldD48bWFyazpjaXR5PtmF2YPZhtin2LM8L21hcms6Y2l0
+eT48bWFyazpwYz4yOTAwPC9tYXJrOnBjPjxtYXJrOmNjPk1BPC9tYXJrOmNjPjwvbWFyazphZGRy
+PjxtYXJrOnZvaWNlPisyMTIuNTIyNTM5MDQwPC9tYXJrOnZvaWNlPjxtYXJrOmZheD4rMjEyLjUy
+MjUzOTA0MTwvbWFyazpmYXg+PG1hcms6ZW1haWw+aW5mb0BleGFtcGxlLmV4YW1wbGU8L21hcms6
+ZW1haWw+PC9tYXJrOmhvbGRlcj48bWFyazpqdXJpc2RpY3Rpb24+TUE8L21hcms6anVyaXNkaWN0
+aW9uPjxtYXJrOmNsYXNzPjE1PC9tYXJrOmNsYXNzPjxtYXJrOmxhYmVsPnhuLS0tLS0tbnplYWFn
+cGY3YXpiMnBwYWpyM2ZhPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS0tLS1idGRhYWZuZTRh
+N2F6cG9haXE4ZWE8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLS0teW1jYWFlbGQxYTRhNm9u
+YWhwM2VhPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS0tLS1idGRhYWZuZTRhN2F6cG9haXE0
+YnliYTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tLS15bWNhYWVsZDFhNGE2b25haHAyYjdh
+YTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tbWdiYWFkamN5MWE4bW1hZ284ZGE8L21hcms6
+bGFiZWw+PG1hcms6bGFiZWw+eG4tLS0teW1jYWFlbGQxYTRhNm9uYWhwMWI4YWE8L21hcms6bGFi
+ZWw+PG1hcms6bGFiZWw+eG4tLW1nYmFhZGpjeTFhOG1tYWdvOWE1YWE8L21hcms6bGFiZWw+PG1h
+cms6Z29vZHNBbmRTZXJ2aWNlcz7YutmK2KrYp9ixPC9tYXJrOmdvb2RzQW5kU2VydmljZXM+PG1h
+cms6cmVnTnVtPjEyMzQ8L21hcms6cmVnTnVtPjxtYXJrOnJlZ0RhdGU+MjAxMy0wMS0wMVQwMDow
+MDowMC4wMDBaPC9tYXJrOnJlZ0RhdGU+PC9tYXJrOnRyYWRlbWFyaz48L21hcms6bWFyaz48ZHM6
+U2lnbmF0dXJlIHhtbG5zOmRzPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjIiBJ
+ZD0iX2U0ZGQ0YjFiLTFjMDEtNDUyYy1hZDJlLTM2YzQxM2VlMDA3NiI+PGRzOlNpZ25lZEluZm8+
+PGRzOkNhbm9uaWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8y
+MDAxLzEwL3htbC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJlTWV0aG9kIEFsZ29yaXRobT0iaHR0
+cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxkc2lnLW1vcmUjcnNhLXNoYTI1NiIvPjxkczpSZWZl
+cmVuY2UgVVJJPSIjX2IzZTkzZmUwLWYxM2MtNDUyYS1iNzBhLTY4MjVhM2Q3N2M0ZSI+PGRzOlRy
+YW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDAv
+MDkveG1sZHNpZyNlbnZlbG9wZWQtc2lnbmF0dXJlIi8+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09
+Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jt
+cz48ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94
+bWxlbmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPnFGU2VJMkxFL0FOYUV6YlU5V0NlMGxSN2ht
+RDNtem1XVEdZelJtd1Nsc0E9PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48ZHM6UmVm
+ZXJlbmNlIFVSST0iI183NzliNzkxYy1mNWY5LTQ2MDYtODAwNi0yYjExZjQ5MjYwYzgiPjxkczpU
+cmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAx
+LzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdv
+cml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdl
+c3RWYWx1ZT54Vm1jOE5UVHl5elZqZGNVZEtqdFVzcUd1SWFud2JmOTdaWXZSU2xGWllJPTwvZHM6
+RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PC9kczpTaWduZWRJbmZvPjxkczpTaWduYXR1cmVW
+YWx1ZSBJZD0iXzI4MjEyMmUzLTQwN2MtNDJlMC05NjEwLTJlZmU2NGU4NGRmMyI+bW9vUWF1ZnNv
+TlpiL1ArdDQ4S1h3WFd0MW5xVTgwTkpLRldsMm9ESjJnbjk3WFQ0TlVxYUtpRE5QdzFlVHNKcGpR
+V1Z4TUNLWm92QSYjMTM7CnFoR2tON0ZoYktSMUl1L3R0TkhiTFRrVDVTYW1BalA1VFdIZ3hYSTRU
+N1R3QldJQUIvMS9TMGhXWUdJM1NmOUYwMnhPVHhvYWVDTTImIzEzOwpLS3RJMk5xZnMzVmF1YXJh
+cnNFdFY0SXlLTzdFK205NE95K1p2Q29URVVIZWNUYlMrb2JsdFdoQTdkVHZOWmw2bC9DN1c3Wk5R
+R3M4JiMxMzsKblY2Y0JQMGtrbEFxdUhRSFUxVVh0dGJPbEtEc1JwYnc0UWlWcjZFTVowWWRQUjF5
+Uk03bjVBUEVLQ0RvUktEd0VUL09HQjdBdzdJSiYjMTM7Ck5IaVZ4MDV4bURIa2F2b1RjME1aYmov
+Qjg5dDNpV3FQaStROXQ5dzlWaFFkRG45cEdxL0d4azZvU0FVTlRQWVNYTmo1SjRWcjJzV1YmIzEz
+Owo5eGRxYWw5ZlJoczJuS25yM05Kd3poT1pqWXJVUDNuMmF5a3JhWG52bENEVUJPcGJ4bmhGYjMv
+QkVNb3JLcVU3WUFFcFdQT29RY2ViJiMxMzsKZ0tHUkdydlFJaWZ5V3dnOTV6dDU0NTJpdnF0NDJG
+d2JXZFdkUzJ1cnJhd28xWGdXUW8vNzl2VVlwamdWWjZLQUtYbG5mTzYwalU5cSYjMTM7CnZXWTlw
+UjhDOTRjQjZ1VVQzYUY3ZlJoMjZqa2dOUjJnSURVbUVVV0RBRi9QTE1mMVB0MTNrVUhMNTF1RTBT
+M08rY05zdjFwYjVEZ3MmIzEzOwpqeCtzdklkSmE1S29DWGc4UEVvbDlvOWF3QjFOdk00QnBSbE5p
+QnUySjcvakVUYzdzY09VRElOYzA4a2hjRDRoL1I1MUpwQVpmY0k9PC9kczpTaWduYXR1cmVWYWx1
+ZT48ZHM6S2V5SW5mbyBJZD0iXzc3OWI3OTFjLWY1ZjktNDYwNi04MDA2LTJiMTFmNDkyNjBjOCI+
+PGRzOlg1MDlEYXRhPjxkczpYNTA5Q2VydGlmaWNhdGU+TUlJSFh6Q0NCVWVnQXdJQkFnSVVYcUkv
+dmQxOENhZzk4b05wZHpWN0JpeS82RUF3RFFZSktvWklodmNOQVFFTkJRQXdmREVMTUFrRyYjMTM7
+CkExVUVCaE1DVlZNeFBEQTZCZ05WQkFvTU0wbHVkR1Z5Ym1WMElFTnZjbkJ2Y21GMGFXOXVJR1p2
+Y2lCQmMzTnBaMjVsWkNCT1lXMWwmIzEzOwpjeUJoYm1RZ1RuVnRZbVZ5Y3pFdk1DMEdBMVVFQXd3
+bVNVTkJUazRnVkhKaFpHVnRZWEpySUVOc1pXRnlhVzVuYUc5MWMyVWdVR2xzJiMxMzsKYjNRZ1Ew
+RXdIaGNOTWpJeE1URTJNVE15T0RVNVdoY05NamN4TVRFMU1UTXlPRFU1V2pDQjBERUxNQWtHQTFV
+RUJoTUNRa1V4RVRBUCYjMTM7CkJnTlZCQWdUQ0VKeWRYTnpaV3h6TVJJd0VBWURWUVFIRXdsV2FX
+eDJiMjl5WkdVeE16QXhCZ05WQkFvVEtrUmxiRzlwZEhSbElFTnYmIzEzOwpibk4xYkhScGJtY2dZ
+VzVrSUVGa2RtbHpiM0o1SUVOV1FrRXZVME5TVERFK01Ed0dBMVVFQXhNMVNVTkJUazRnVkUxRFND
+QkJkWFJvJiMxMzsKYjNKcGVtVmtJRlJ5WVdSbGJXRnlheUJRYVd4dmRDQldZV3hwWkdGMGIzSWdW
+bUZzYVdReEpUQWpCZ2txaGtpRzl3MEJDUUVXRm1KbCYjMTM7CmRHMWphSE50WkVCa1pXeHZhWFIw
+WlM1amIyMHdnZ0lpTUEwR0NTcUdTSWIzRFFFQkFRVUFBNElDRHdBd2dnSUtBb0lDQVFDNkZKd3om
+IzEzOwpLcVFWWDZmRzMvRUxSU0dXVjlHckthRk1LbWhXSXhlcHdSWk42TXhNcWtkNURuWWZpVCtX
+cDk4akVrcWdUeDJVTWI5cXVnY0dOVjZnJiMxMzsKMzUvQ3JRYi9GL216M0M0c2ZMTnVEcFNxSzlR
+RjgrcGFUSDZoUW1yT3BxVitVVHZkajlTTWdLR3lGaXpTODhDRFdNeDR3M2k0RkFLZSYjMTM7CjZO
+UnNKUkdUQXRLRHVNSGNBNHNqMDhHamUzbFBXY2dGdmNRTkRWZUVCVHVPSEJHK1JoajdWMUppTkdQ
+LzRlcFRYVEZYZ1BGRGdlejMmIzEzOwpZQWZ4cXBidU80VFg2YmJZZGsybnZNTEZ2TEVOa0NGWXVs
+bllQemduRUJHU01LSWFBSWxiK3NjSEN2V2dXajJUTGd3aDJHSk5jelZNJiMxMzsKMUxQTXFHUytV
+a2k5TWg3OTgyMi94b2FyNDk4eER4Mll4Lzhzd2dFTkxTZ0NzUUFXOG5NZ3dXbjZBYllsMlJBQlh1
+cmF5RnNuNFAxUiYjMTM7CnVRTm1VcC9xclJLUnZTSnIxT0xrSFpmRlRjU1lRYVZpdU1ZUFh6R3o4
+dG1NTGxtSS9CNkFDSDRBd1JNZG5ZdkZPM0tJMVJCblBLSWQmIzEzOwp3d2ZVcFo1SVRJcGJBN0NH
+Z1R4MXF4dE0xd0lVcjdwSGVLUDZqVmUza2RETGcrL0JaMnhNRXRCazVhOFk3QjR2M3h3SFhHVHZW
+OG1OJiMxMzsKMEFnL1N5VC9RVXlFUmhYVXlBTjIrRXdaK1NRQ1V5TmZ6aW9XUTg3OGVHeWtVKzQ2
+K0JiZ0kzSUlyMzZYS1B3bXp0MFNaK0tJM3RuRiYjMTM7ClRsbjltWDBLQzBpZG9qNXlrelBvQy9N
+SWVkMHNwNFRpZ3hFYldOeDdFRjgwUHZSL0RERXdWUEVFa2tqeTYzWEZ1bHhpQ1FJREFRQUImIzEz
+OwpvNElCZ2pDQ0FYNHdEQVlEVlIwVEFRSC9CQUl3QURBT0JnTlZIUThCQWY4RUJBTUNCNEF3SFFZ
+RFZSME9CQllFRkhuOXMwREVhMmt2JiMxMzsKZ0UvZUlPVHNxb1c4NU1YRk1JRzZCZ05WSFNNRWdi
+SXdnYStBRkVkN1Q2NTZVWkcxMGIrZE51bUdmellXQktsRm9ZR0FwSDR3ZkRFTCYjMTM7Ck1Ba0dB
+MVVFQmhNQ1ZWTXhQREE2QmdOVkJBb01NMGx1ZEdWeWJtVjBJRU52Y25CdmNtRjBhVzl1SUdadmNp
+QkJjM05wWjI1bFpDQk8mIzEzOwpZVzFsY3lCaGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF3d21T
+VU5CVGs0Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5YVc1bmFHOTFjMlVnJiMxMzsKVUdsc2IzUWdRMEdD
+RkhwcWJURmVKY1B0VUM5WHV1UEtQc0x3RFIrTU1EUUdBMVVkSHdRdE1Dc3dLYUFub0NXR0kyaDBk
+SEE2THk5aiYjMTM7CmNtd3VhV05oYm00dWIzSm5MM1J0WTJoZmNHbHNiM1F1WTNKc01Fd0dBMVVk
+SUFSRk1FTXdFQVlPS3dZQkJBR0N5UnNCQllNN0RBb3cmIzEzOwpMd1lJS3dZQkJRVUhBZ0V3SXpB
+aEJnZ3JCZ0VGQlFjQ0FSWVZhSFIwY0hNNkx5OWpjSE11YVdOaGJtNHViM0puTUEwR0NTcUdTSWIz
+JiMxMzsKRFFFQkRRVUFBNElDQVFCZFNhdDU2dWVqTG5BakZJRjk1ZGpZV0k2cy8vTjZZWHhzcnJN
+a0dCUDhFZXpQeWhMaDZhd1A0ejdROVFBSSYjMTM7ClFaa1lveHJsLzF5MCtieVYycW5UVVVDTFJw
+Sy9CRHAvaGNmd1BmS0NBLzJSUUNISnJiNit6MGVuRFBGUkswTkttd09jZGxHdFVrMG0mIzEzOwpQ
+Z1dHU0t0dXdWc1BBaFRESnVob3NaT2hrTmYrblNPT0hyUU9uMUUycnpPcmQva1FscWlDd1JIOTc5
+Nk5wVEErSFNNZk9vYkpFRVBxJiMxMzsKdHBGN1A1cWJ3dGw5NVVhNU9wNEFoYTcwSEhmVUZTNEJP
+UUtMQlZmTVpkT1IraVBvaDVPd0FLK2h0WWtGQ0c5UDJXSHU3d2Y4RUMrVyYjMTM7CjdrOTZndlRk
+OHhFN291b2FiVDJ4NllmWXFFbFBIaVUvSU05Z1Z6V1dML3N2WUR5U1Z1b0Z3QmpETk4xY2RxMHFP
+WVIxeXVTMWMvOUQmIzEzOwpGUjdlbzdHRkVDeStUQmQ3SWlLUmZCVmVZR09PUE1ub0ZmeFJMV3Jw
+c1dObndEN2xrUGtMQ2dGQ2srOHlFY09SZzYyNW1vNjV6NHk2JiMxMzsKSjRLOGZvZGE3cXdtWE5Q
+M1JTMThvbjZCSHQ4bFErYlhnT0hteElIazBhTzBxTkRxZ3ZMcjJGbHlMR0pHaUVNUnFETU1SNi9h
+MDZidCYjMTM7CmtuVU1IbDdDcU1maklralA0Vk5OeUdQZEpnd1ZrMmtlYjl1TkZ2SkN4VCtNMmZH
+WFExTmJKTmZ0djVNZ1NzcDlOMXkreDZnQTNFaHcmIzEzOwp5SGxtSkI0WU10bzh0VFYxaTg0eFBY
+eGkyQ0FlRGFHRHV3b3N0OFlVQ1NqcTdSQ0s4dEdjYUFZcmtYUVkyeVFmWDNjd0RzRXhScVZXJiMx
+MzsKeXJqeVJ0K042bUs5OVE9PTwvZHM6WDUwOUNlcnRpZmljYXRlPjwvZHM6WDUwOURhdGE+PC9k
+czpLZXlJbmZvPjwvZHM6U2lnbmF0dXJlPjwvc21kOnNpZ25lZE1hcms+Cg==
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Holder-Arab/Trademark-Holder-Arab-Revoked.smd b/core/src/test/resources/google/registry/tmch/idn/Holder-Arab/Trademark-Holder-Arab-Revoked.smd
new file mode 100644
index 000000000..f2924c5ae
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Holder-Arab/Trademark-Holder-Arab-Revoked.smd
@@ -0,0 +1,121 @@
+Marks: الاختبار & لتقييم
+smdID: 000000901669082358255-65535
+U-labels: xn------nzeaagpf7azb2ppajr3fa, xn-----btdaafne4a7azpoaiq8ea, xn----ymcaaeld1a4a6onahp3ea, xn-----btdaafne4a7azpoaiq4byba, xn----ymcaaeld1a4a6onahp2b7aa, xn--mgbaadjcy1a8mmago8da, xn----ymcaaeld1a4a6onahp1b8aa, xn--mgbaadjcy1a8mmago9a5aa
+notBefore: 2022-11-22T01:59:18.255Z
+notAfter: 2027-10-21T08:59:34.305Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il85ZWI3
+YjcxZC1iMTg4LTQ2OTUtODU3Yy0xM2EwNDMyMTEyNGYiPjxzbWQ6aWQ+MDAwMDAwOTAxNjY5MDgy
+MzU4MjU1LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMTo1OToxOC4yNTVaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0yMVQwODo1OTozNC4zMDVaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
+cmFkZW1hcms+PG1hcms6aWQ+MDAwMTQyMTUwMzMwNTI5OTE1MDMzMDUyOTktMTwvbWFyazppZD48
+bWFyazptYXJrTmFtZT7Yp9mE2KfYrtiq2KjYp9ixICZhbXA7INmE2KrZgtmK2YrZhTwvbWFyazpt
+YXJrTmFtZT48bWFyazpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpuYW1lPtmF2YfZ
+htiv2LMg2KfZhNmF2LnZhNmI2YXYp9iq2YrYqTwvbWFyazpuYW1lPjxtYXJrOm9yZz7Yp9iu2KrY
+qNin2LE8L21hcms6b3JnPjxtYXJrOmFkZHI+PG1hcms6c3RyZWV0Ptis2LnZgdixINin2KjZhiDY
+s9mK2YbYp9ihIDc1PC9tYXJrOnN0cmVldD48bWFyazpjaXR5PtmF2YPZhtin2LM8L21hcms6Y2l0
+eT48bWFyazpwYz4yOTAwPC9tYXJrOnBjPjxtYXJrOmNjPk1BPC9tYXJrOmNjPjwvbWFyazphZGRy
+PjxtYXJrOnZvaWNlPisyMTIuNTIyNTM5MDQwPC9tYXJrOnZvaWNlPjxtYXJrOmZheD4rMjEyLjUy
+MjUzOTA0MTwvbWFyazpmYXg+PG1hcms6ZW1haWw+aW5mb0BleGFtcGxlLmV4YW1wbGU8L21hcms6
+ZW1haWw+PC9tYXJrOmhvbGRlcj48bWFyazpqdXJpc2RpY3Rpb24+TUE8L21hcms6anVyaXNkaWN0
+aW9uPjxtYXJrOmNsYXNzPjE1PC9tYXJrOmNsYXNzPjxtYXJrOmxhYmVsPnhuLS0tLS0tbnplYWFn
+cGY3YXpiMnBwYWpyM2ZhPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS0tLS1idGRhYWZuZTRh
+N2F6cG9haXE4ZWE8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLS0teW1jYWFlbGQxYTRhNm9u
+YWhwM2VhPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS0tLS1idGRhYWZuZTRhN2F6cG9haXE0
+YnliYTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tLS15bWNhYWVsZDFhNGE2b25haHAyYjdh
+YTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tbWdiYWFkamN5MWE4bW1hZ284ZGE8L21hcms6
+bGFiZWw+PG1hcms6bGFiZWw+eG4tLS0teW1jYWFlbGQxYTRhNm9uYWhwMWI4YWE8L21hcms6bGFi
+ZWw+PG1hcms6bGFiZWw+eG4tLW1nYmFhZGpjeTFhOG1tYWdvOWE1YWE8L21hcms6bGFiZWw+PG1h
+cms6Z29vZHNBbmRTZXJ2aWNlcz7YutmK2KrYp9ixPC9tYXJrOmdvb2RzQW5kU2VydmljZXM+PG1h
+cms6cmVnTnVtPjEyMzQ8L21hcms6cmVnTnVtPjxtYXJrOnJlZ0RhdGU+MjAxMy0wMS0wMVQwMDow
+MDowMC4wMDBaPC9tYXJrOnJlZ0RhdGU+PC9tYXJrOnRyYWRlbWFyaz48L21hcms6bWFyaz48ZHM6
+U2lnbmF0dXJlIHhtbG5zOmRzPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjIiBJ
+ZD0iX2RiNjQ3ZWIxLWI0NmQtNGY0Yy1iM2M4LTYxMzI0YzE0Y2U5NyI+PGRzOlNpZ25lZEluZm8+
+PGRzOkNhbm9uaWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8y
+MDAxLzEwL3htbC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJlTWV0aG9kIEFsZ29yaXRobT0iaHR0
+cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxkc2lnLW1vcmUjcnNhLXNoYTI1NiIvPjxkczpSZWZl
+cmVuY2UgVVJJPSIjXzllYjdiNzFkLWIxODgtNDY5NS04NTdjLTEzYTA0MzIxMTI0ZiI+PGRzOlRy
+YW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDAv
+MDkveG1sZHNpZyNlbnZlbG9wZWQtc2lnbmF0dXJlIi8+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09
+Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jt
+cz48ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94
+bWxlbmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPisvK01sa2JjRnZpZkVFNGtzdDJCNEJ6NXZq
+eHpKSEw5QlFwbWRoRkZnRmM9PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48ZHM6UmVm
+ZXJlbmNlIFVSST0iI182ZGJiOTM1Mi1mODUwLTRhMmQtYjZmYi0yMjk0ZjhjYzNhZjkiPjxkczpU
+cmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAx
+LzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdv
+cml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdl
+c3RWYWx1ZT5TTWxaOU9FdEZTNHpkWUt5cWJJczNmVFBIQnNXRzE4TzRTRmlYVFdaZFg0PTwvZHM6
+RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PC9kczpTaWduZWRJbmZvPjxkczpTaWduYXR1cmVW
+YWx1ZSBJZD0iXzM5MGEzMWZmLWI0MWEtNDg3ZS1hN2Q0LTUzM2Y3OGM2ZDQ3NyI+SzhPRDZRVWpp
+MzZNYWtudjFxYVpzMEVwVFdPcE5McmFqd1BSTzZocjVncTMvTTlRd2g0RGdOc0kzRlV3a2MzbUcw
+Y3BzL2lGUUs0ZSYjMTM7Cmh5Mzl4Y3pQcnNTSGpZTmNhczdBYU45UGNHaGVHdWNQcXNQdTQ0aWEv
+SUFCMTFuTWk4ckxwZ2w3TzFKVHRVLzRMZWJVck5pRTlxZHAmIzEzOwpyU2VYT1dOcXV6YkFBeUdj
+am1rVzJpOGpXd1hGMDV1OUNLWWhsV2NtdlU0VEt4a0tUdWZlUVZBdnJZZ0F6L0pPQUFNWVZ2V2U2
+NDR4JiMxMzsKaFFHamtzakx3YUJzeVVad3RMTVdmSXlLWXczSTI4c0xhdFM1ZDhPaGZtRzNrYzhv
+cS9SN0I3YlN3Q1ZIT0wvMm8zRkJ6U3U2OTYyLyYjMTM7ClZueEtjVlRvY0YzSjR5WGtGRmhMZkZ0
+MVdwQWxBdTlmV2ExT3hIMTVzL0V4K2xIN1ZYTU5MMkdoVFR1Wmxuc3JhK1JSZmpPMHFuci8mIzEz
+OwpETGlCR2c0QUhPV2tNby9EUytZSnlBSm1ZbndOdDhzaUxwNDkxVll4MWFYWEFidWYxUEhadnpM
+R1JiLzR5SkNENnQxRXBOTi9STzg1JiMxMzsKRE1RK0RoVUdobk5kem1TMGNPR09CZ3ZwMEZ0alc4
+NTB1QzIvWUNmdWtCRDRyMzJ5L3JZTkt5UXZXOG04dXJQTzZQdkhidVRWZlpvMSYjMTM7ClBsOFlB
+cnVwQkU4Mm5UeHdhUHdaZlRZUFE1SEZtTld4TC9LY1FqdkMyMTNtZXVwc0dOQ2FlNExnSjdmZ3NS
+Q29meEFqVVlnYUsyN1AmIzEzOwo2WEdmY2RzOXNzTFJNZjRsOEdSYitJZTlaa1ZXeE00a25HaFh2
+cGRxa0N2aHVMazJuM3RNZTlaTXBjV1VaMUtQMEt5YmZoQ3FWdHc9PC9kczpTaWduYXR1cmVWYWx1
+ZT48ZHM6S2V5SW5mbyBJZD0iXzZkYmI5MzUyLWY4NTAtNGEyZC1iNmZiLTIyOTRmOGNjM2FmOSI+
+PGRzOlg1MDlEYXRhPjxkczpYNTA5Q2VydGlmaWNhdGU+TUlJSFh6Q0NCVWVnQXdJQkFnSVVYcUkv
+dmQxOENhZzk4b05wZHpWN0JpeS82RUF3RFFZSktvWklodmNOQVFFTkJRQXdmREVMTUFrRyYjMTM7
+CkExVUVCaE1DVlZNeFBEQTZCZ05WQkFvTU0wbHVkR1Z5Ym1WMElFTnZjbkJ2Y21GMGFXOXVJR1p2
+Y2lCQmMzTnBaMjVsWkNCT1lXMWwmIzEzOwpjeUJoYm1RZ1RuVnRZbVZ5Y3pFdk1DMEdBMVVFQXd3
+bVNVTkJUazRnVkhKaFpHVnRZWEpySUVOc1pXRnlhVzVuYUc5MWMyVWdVR2xzJiMxMzsKYjNRZ1Ew
+RXdIaGNOTWpJeE1URTJNVE15T0RVNVdoY05NamN4TVRFMU1UTXlPRFU1V2pDQjBERUxNQWtHQTFV
+RUJoTUNRa1V4RVRBUCYjMTM7CkJnTlZCQWdUQ0VKeWRYTnpaV3h6TVJJd0VBWURWUVFIRXdsV2FX
+eDJiMjl5WkdVeE16QXhCZ05WQkFvVEtrUmxiRzlwZEhSbElFTnYmIzEzOwpibk4xYkhScGJtY2dZ
+VzVrSUVGa2RtbHpiM0o1SUVOV1FrRXZVME5TVERFK01Ed0dBMVVFQXhNMVNVTkJUazRnVkUxRFND
+QkJkWFJvJiMxMzsKYjNKcGVtVmtJRlJ5WVdSbGJXRnlheUJRYVd4dmRDQldZV3hwWkdGMGIzSWdW
+bUZzYVdReEpUQWpCZ2txaGtpRzl3MEJDUUVXRm1KbCYjMTM7CmRHMWphSE50WkVCa1pXeHZhWFIw
+WlM1amIyMHdnZ0lpTUEwR0NTcUdTSWIzRFFFQkFRVUFBNElDRHdBd2dnSUtBb0lDQVFDNkZKd3om
+IzEzOwpLcVFWWDZmRzMvRUxSU0dXVjlHckthRk1LbWhXSXhlcHdSWk42TXhNcWtkNURuWWZpVCtX
+cDk4akVrcWdUeDJVTWI5cXVnY0dOVjZnJiMxMzsKMzUvQ3JRYi9GL216M0M0c2ZMTnVEcFNxSzlR
+RjgrcGFUSDZoUW1yT3BxVitVVHZkajlTTWdLR3lGaXpTODhDRFdNeDR3M2k0RkFLZSYjMTM7CjZO
+UnNKUkdUQXRLRHVNSGNBNHNqMDhHamUzbFBXY2dGdmNRTkRWZUVCVHVPSEJHK1JoajdWMUppTkdQ
+LzRlcFRYVEZYZ1BGRGdlejMmIzEzOwpZQWZ4cXBidU80VFg2YmJZZGsybnZNTEZ2TEVOa0NGWXVs
+bllQemduRUJHU01LSWFBSWxiK3NjSEN2V2dXajJUTGd3aDJHSk5jelZNJiMxMzsKMUxQTXFHUytV
+a2k5TWg3OTgyMi94b2FyNDk4eER4Mll4Lzhzd2dFTkxTZ0NzUUFXOG5NZ3dXbjZBYllsMlJBQlh1
+cmF5RnNuNFAxUiYjMTM7CnVRTm1VcC9xclJLUnZTSnIxT0xrSFpmRlRjU1lRYVZpdU1ZUFh6R3o4
+dG1NTGxtSS9CNkFDSDRBd1JNZG5ZdkZPM0tJMVJCblBLSWQmIzEzOwp3d2ZVcFo1SVRJcGJBN0NH
+Z1R4MXF4dE0xd0lVcjdwSGVLUDZqVmUza2RETGcrL0JaMnhNRXRCazVhOFk3QjR2M3h3SFhHVHZW
+OG1OJiMxMzsKMEFnL1N5VC9RVXlFUmhYVXlBTjIrRXdaK1NRQ1V5TmZ6aW9XUTg3OGVHeWtVKzQ2
+K0JiZ0kzSUlyMzZYS1B3bXp0MFNaK0tJM3RuRiYjMTM7ClRsbjltWDBLQzBpZG9qNXlrelBvQy9N
+SWVkMHNwNFRpZ3hFYldOeDdFRjgwUHZSL0RERXdWUEVFa2tqeTYzWEZ1bHhpQ1FJREFRQUImIzEz
+OwpvNElCZ2pDQ0FYNHdEQVlEVlIwVEFRSC9CQUl3QURBT0JnTlZIUThCQWY4RUJBTUNCNEF3SFFZ
+RFZSME9CQllFRkhuOXMwREVhMmt2JiMxMzsKZ0UvZUlPVHNxb1c4NU1YRk1JRzZCZ05WSFNNRWdi
+SXdnYStBRkVkN1Q2NTZVWkcxMGIrZE51bUdmellXQktsRm9ZR0FwSDR3ZkRFTCYjMTM7Ck1Ba0dB
+MVVFQmhNQ1ZWTXhQREE2QmdOVkJBb01NMGx1ZEdWeWJtVjBJRU52Y25CdmNtRjBhVzl1SUdadmNp
+QkJjM05wWjI1bFpDQk8mIzEzOwpZVzFsY3lCaGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF3d21T
+VU5CVGs0Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5YVc1bmFHOTFjMlVnJiMxMzsKVUdsc2IzUWdRMEdD
+RkhwcWJURmVKY1B0VUM5WHV1UEtQc0x3RFIrTU1EUUdBMVVkSHdRdE1Dc3dLYUFub0NXR0kyaDBk
+SEE2THk5aiYjMTM7CmNtd3VhV05oYm00dWIzSm5MM1J0WTJoZmNHbHNiM1F1WTNKc01Fd0dBMVVk
+SUFSRk1FTXdFQVlPS3dZQkJBR0N5UnNCQllNN0RBb3cmIzEzOwpMd1lJS3dZQkJRVUhBZ0V3SXpB
+aEJnZ3JCZ0VGQlFjQ0FSWVZhSFIwY0hNNkx5OWpjSE11YVdOaGJtNHViM0puTUEwR0NTcUdTSWIz
+JiMxMzsKRFFFQkRRVUFBNElDQVFCZFNhdDU2dWVqTG5BakZJRjk1ZGpZV0k2cy8vTjZZWHhzcnJN
+a0dCUDhFZXpQeWhMaDZhd1A0ejdROVFBSSYjMTM7ClFaa1lveHJsLzF5MCtieVYycW5UVVVDTFJw
+Sy9CRHAvaGNmd1BmS0NBLzJSUUNISnJiNit6MGVuRFBGUkswTkttd09jZGxHdFVrMG0mIzEzOwpQ
+Z1dHU0t0dXdWc1BBaFRESnVob3NaT2hrTmYrblNPT0hyUU9uMUUycnpPcmQva1FscWlDd1JIOTc5
+Nk5wVEErSFNNZk9vYkpFRVBxJiMxMzsKdHBGN1A1cWJ3dGw5NVVhNU9wNEFoYTcwSEhmVUZTNEJP
+UUtMQlZmTVpkT1IraVBvaDVPd0FLK2h0WWtGQ0c5UDJXSHU3d2Y4RUMrVyYjMTM7CjdrOTZndlRk
+OHhFN291b2FiVDJ4NllmWXFFbFBIaVUvSU05Z1Z6V1dML3N2WUR5U1Z1b0Z3QmpETk4xY2RxMHFP
+WVIxeXVTMWMvOUQmIzEzOwpGUjdlbzdHRkVDeStUQmQ3SWlLUmZCVmVZR09PUE1ub0ZmeFJMV3Jw
+c1dObndEN2xrUGtMQ2dGQ2srOHlFY09SZzYyNW1vNjV6NHk2JiMxMzsKSjRLOGZvZGE3cXdtWE5Q
+M1JTMThvbjZCSHQ4bFErYlhnT0hteElIazBhTzBxTkRxZ3ZMcjJGbHlMR0pHaUVNUnFETU1SNi9h
+MDZidCYjMTM7CmtuVU1IbDdDcU1maklralA0Vk5OeUdQZEpnd1ZrMmtlYjl1TkZ2SkN4VCtNMmZH
+WFExTmJKTmZ0djVNZ1NzcDlOMXkreDZnQTNFaHcmIzEzOwp5SGxtSkI0WU10bzh0VFYxaTg0eFBY
+eGkyQ0FlRGFHRHV3b3N0OFlVQ1NqcTdSQ0s4dEdjYUFZcmtYUVkyeVFmWDNjd0RzRXhScVZXJiMx
+MzsKeXJqeVJ0K042bUs5OVE9PTwvZHM6WDUwOUNlcnRpZmljYXRlPjwvZHM6WDUwOURhdGE+PC9k
+czpLZXlJbmZvPjwvZHM6U2lnbmF0dXJlPjwvc21kOnNpZ25lZE1hcms+Cg==
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Holder-Arab/TreatyStatute-Holder-Arab-Active.smd b/core/src/test/resources/google/registry/tmch/idn/Holder-Arab/TreatyStatute-Holder-Arab-Active.smd
new file mode 100644
index 000000000..c12a83d91
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Holder-Arab/TreatyStatute-Holder-Arab-Active.smd
@@ -0,0 +1,120 @@
+Marks: الاختبار & لتقييم
+smdID: 000000921669082412181-65535
+U-labels: xn------nzeaagpf7azb2ppajr3fa, xn-----btdaafne4a7azpoaiq8ea, xn----ymcaaeld1a4a6onahp3ea, xn--mgbaadjcy1a8mmago8da
+notBefore: 2022-11-22T02:00:12.181Z
+notAfter: 2027-10-21T08:59:34.305Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il8zZmEz
+YzE5NS0yMjJmLTRjOTMtODBiNi1jNzg5Njc3ODZlZjEiPjxzbWQ6aWQ+MDAwMDAwOTIxNjY5MDgy
+NDEyMTgxLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMjowMDoxMi4xODFaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0yMVQwODo1OTozNC4zMDVaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
+cmVhdHlPclN0YXR1dGU+PG1hcms6aWQ+MDAwMTQyMTUwMzMwNTgwODE1MDMzMDU4MDgtMTwvbWFy
+azppZD48bWFyazptYXJrTmFtZT7Yp9mE2KfYrtiq2KjYp9ixICZhbXA7INmE2KrZgtmK2YrZhTwv
+bWFyazptYXJrTmFtZT48bWFyazpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpuYW1l
+PtmF2YfZhtiv2LMg2KfZhNmF2LnZhNmI2YXYp9iq2YrYqTwvbWFyazpuYW1lPjxtYXJrOm9yZz7Y
+p9iu2KrYqNin2LE8L21hcms6b3JnPjxtYXJrOmFkZHI+PG1hcms6c3RyZWV0Ptis2LnZgdixINin
+2KjZhiDYs9mK2YbYp9ihIDc1PC9tYXJrOnN0cmVldD48bWFyazpjaXR5PtmF2YPZhtin2LM8L21h
+cms6Y2l0eT48bWFyazpwYz4yOTAwPC9tYXJrOnBjPjxtYXJrOmNjPk1BPC9tYXJrOmNjPjwvbWFy
+azphZGRyPjxtYXJrOnZvaWNlPisyMTIuNTIyNTM5MDQwPC9tYXJrOnZvaWNlPjxtYXJrOmZheD4r
+MjEyLjUyMjUzOTA0MTwvbWFyazpmYXg+PG1hcms6ZW1haWw+aW5mb0BleGFtcGxlLmV4YW1wbGU8
+L21hcms6ZW1haWw+PC9tYXJrOmhvbGRlcj48bWFyazpwcm90ZWN0aW9uPjxtYXJrOmNjPk1BPC9t
+YXJrOmNjPjxtYXJrOnJ1bGluZz5NQTwvbWFyazpydWxpbmc+PC9tYXJrOnByb3RlY3Rpb24+PG1h
+cms6bGFiZWw+eG4tLS0tLS1uemVhYWdwZjdhemIycHBhanIzZmE8L21hcms6bGFiZWw+PG1hcms6
+bGFiZWw+eG4tLS0tLWJ0ZGFhZm5lNGE3YXpwb2FpcThlYTwvbWFyazpsYWJlbD48bWFyazpsYWJl
+bD54bi0tLS15bWNhYWVsZDFhNGE2b25haHAzZWE8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4t
+LW1nYmFhZGpjeTFhOG1tYWdvOGRhPC9tYXJrOmxhYmVsPjxtYXJrOmdvb2RzQW5kU2VydmljZXM+
+2LrZitiq2KfYsTwvbWFyazpnb29kc0FuZFNlcnZpY2VzPjxtYXJrOnJlZk51bT4xMjM0PC9tYXJr
+OnJlZk51bT48bWFyazpwcm9EYXRlPjIwMTMtMDItMDJUMDA6MDA6MDAuMDAwWjwvbWFyazpwcm9E
+YXRlPjxtYXJrOnRpdGxlPlRlc3QgVHJlYXR5PC9tYXJrOnRpdGxlPjxtYXJrOmV4ZWNEYXRlPjIw
+MTMtMDItMDJUMDA6MDA6MDAuMDAwWjwvbWFyazpleGVjRGF0ZT48L21hcms6dHJlYXR5T3JTdGF0
+dXRlPjwvbWFyazptYXJrPjxkczpTaWduYXR1cmUgeG1sbnM6ZHM9Imh0dHA6Ly93d3cudzMub3Jn
+LzIwMDAvMDkveG1sZHNpZyMiIElkPSJfZGMwNTE2M2YtNjViYi00YWI4LTlkNTEtZmU0ZDRhNDEy
+YjQwIj48ZHM6U2lnbmVkSW5mbz48ZHM6Q2Fub25pY2FsaXphdGlvbk1ldGhvZCBBbGdvcml0aG09
+Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjxkczpTaWduYXR1cmVN
+ZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGRzaWctbW9yZSNy
+c2Etc2hhMjU2Ii8+PGRzOlJlZmVyZW5jZSBVUkk9IiNfM2ZhM2MxOTUtMjIyZi00YzkzLTgwYjYt
+Yzc4OTY3Nzg2ZWYxIj48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0
+cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48ZHM6
+VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMx
+NG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8v
+d3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+UlU3Q2VX
+bk9tT3N0K05UUUcxWERxbVNFT3pjaFF0MlA2enU4d3hsaEduTT08L2RzOkRpZ2VzdFZhbHVlPjwv
+ZHM6UmVmZXJlbmNlPjxkczpSZWZlcmVuY2UgVVJJPSIjXzcwMGFhNDYzLTIxODgtNDY4NS1hN2M3
+LWIzZDRlMWIyYjcwZSI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0
+dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48
+ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxl
+bmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPlFGRTNGRml6WDViaUxkRkVoZTlUNWRwOW5tVVUy
+Tjl3S1RTZHN1NFZvblE9PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48L2RzOlNpZ25l
+ZEluZm8+PGRzOlNpZ25hdHVyZVZhbHVlIElkPSJfNmRlMmJmMmUtY2MwOC00YmUyLThiZGUtMTQ3
+NTAwYTFkOGNlIj5pcHBTQW9SbFMvbm9mZ1JnY1dJbmk5TkVpcmNJMGRQK09icExJZjJKaFhSZmtV
+L0o2VnpPTVJWSXdHMlFnazJrdUxWUVpqLzBuc2xoJiMxMzsKSVMraGRvUVdFcXZKNXJHL1RyWXNl
+MHcrUWdFMmJlMStib1hpcGEwYWkreGQrUmZMTXpONDBISkppbVY2TTlrdHVpTzdCdmg1ZHlGMSYj
+MTM7ClZhTEFpS2E1ejdtNys4REluTzkreDYrRXZ2dG9EQlk1dXRZZTF4dlprb0R5S1ErV0h1MDlD
+SWNtcUpVTkJkMTNvdDNxOXIzbkErVUsmIzEzOwpKdlp4cDhER0xSdTJkRGtFNUdEMFl0cHpVQXRt
+ejF1ZUZHM2d3bTJUei9kbXZDeWpvQXZBZmhMb20vNzRSTWxOSEI0TDBNd2VhNlVJJiMxMzsKbkc1
+R01MRklscnBHckZSZjFERzNUUENvMDNCV1RPL1V2aENkVEF6SVVLY0M2NDM1NHVyVU85UmxUU1l1
+elVXaFcxa0lWSFVwQmpFVSYjMTM7CkFjYkN1TGNSTW10d2Nhb2tYZDdCOHVSZjFLY3ExUVVlSmZ1
+emVtcEdadDNXRUtUL21xSkZwbDdFN2dnZ2lmZVVrM2N0UGE2VllFWTEmIzEzOwp6TFZaNXB3N2Jt
+bDdLVkc3Y2l4RjJkcy9DN2hMOG0vQVJSNWhUR1BoTnMzZy8vd3Bxc1dVUFBjeHZ6OVV6eTNVcHdB
+SnZPZXp3T1EzJiMxMzsKMGorUW8zNkw3M01DWUh2eVV0VHlJUXAvSmVrL1NZMStnV0ZodEhtaXRl
+TDIvWDBVY1NoTEJNOHIzZmRXWDZtRG83OTVLL2ZBVHlOLyYjMTM7CnNlTU5WbDNkTmJhOVBXSTVQ
+VHl0bSttd3B2aWtwR1VFUE1UMWFkZGFMSkJBaExrWGlYSXRERmh3Y1RJZmtnQ05RWitrbDdQeXo3
+cz08L2RzOlNpZ25hdHVyZVZhbHVlPjxkczpLZXlJbmZvIElkPSJfNzAwYWE0NjMtMjE4OC00Njg1
+LWE3YzctYjNkNGUxYjJiNzBlIj48ZHM6WDUwOURhdGE+PGRzOlg1MDlDZXJ0aWZpY2F0ZT5NSUlI
+WHpDQ0JVZWdBd0lCQWdJVVhxSS92ZDE4Q2FnOThvTnBkelY3Qml5LzZFQXdEUVlKS29aSWh2Y05B
+UUVOQlFBd2ZERUxNQWtHJiMxMzsKQTFVRUJoTUNWVk14UERBNkJnTlZCQW9NTTBsdWRHVnlibVYw
+SUVOdmNuQnZjbUYwYVc5dUlHWnZjaUJCYzNOcFoyNWxaQ0JPWVcxbCYjMTM7CmN5QmhibVFnVG5W
+dFltVnljekV2TUMwR0ExVUVBd3dtU1VOQlRrNGdWSEpoWkdWdFlYSnJJRU5zWldGeWFXNW5hRzkx
+YzJVZ1VHbHMmIzEzOwpiM1FnUTBFd0hoY05Nakl4TVRFMk1UTXlPRFU1V2hjTk1qY3hNVEUxTVRN
+eU9EVTVXakNCMERFTE1Ba0dBMVVFQmhNQ1FrVXhFVEFQJiMxMzsKQmdOVkJBZ1RDRUp5ZFhOelpX
+eHpNUkl3RUFZRFZRUUhFd2xXYVd4MmIyOXlaR1V4TXpBeEJnTlZCQW9US2tSbGJHOXBkSFJsSUVO
+diYjMTM7CmJuTjFiSFJwYm1jZ1lXNWtJRUZrZG1semIzSjVJRU5XUWtFdlUwTlNUREUrTUR3R0Ex
+VUVBeE0xU1VOQlRrNGdWRTFEU0NCQmRYUm8mIzEzOwpiM0pwZW1Wa0lGUnlZV1JsYldGeWF5QlFh
+V3h2ZENCV1lXeHBaR0YwYjNJZ1ZtRnNhV1F4SlRBakJna3Foa2lHOXcwQkNRRVdGbUpsJiMxMzsK
+ZEcxamFITnRaRUJrWld4dmFYUjBaUzVqYjIwd2dnSWlNQTBHQ1NxR1NJYjNEUUVCQVFVQUE0SUNE
+d0F3Z2dJS0FvSUNBUUM2Rkp3eiYjMTM7CktxUVZYNmZHMy9FTFJTR1dWOUdyS2FGTUttaFdJeGVw
+d1JaTjZNeE1xa2Q1RG5ZZmlUK1dwOThqRWtxZ1R4MlVNYjlxdWdjR05WNmcmIzEzOwozNS9DclFi
+L0YvbXozQzRzZkxOdURwU3FLOVFGOCtwYVRINmhRbXJPcHFWK1VUdmRqOVNNZ0tHeUZpelM4OENE
+V014NHczaTRGQUtlJiMxMzsKNk5Sc0pSR1RBdEtEdU1IY0E0c2owOEdqZTNsUFdjZ0Z2Y1FORFZl
+RUJUdU9IQkcrUmhqN1YxSmlOR1AvNGVwVFhURlhnUEZEZ2V6MyYjMTM7CllBZnhxcGJ1TzRUWDZi
+YllkazJudk1MRnZMRU5rQ0ZZdWxuWVB6Z25FQkdTTUtJYUFJbGIrc2NIQ3ZXZ1dqMlRMZ3doMkdK
+TmN6Vk0mIzEzOwoxTFBNcUdTK1VraTlNaDc5ODIyL3hvYXI0OTh4RHgyWXgvOHN3Z0VOTFNnQ3NR
+QVc4bk1nd1duNkFiWWwyUkFCWHVyYXlGc240UDFSJiMxMzsKdVFObVVwL3FyUktSdlNKcjFPTGtI
+WmZGVGNTWVFhVml1TVlQWHpHejh0bU1MbG1JL0I2QUNINEF3Uk1kbll2Rk8zS0kxUkJuUEtJZCYj
+MTM7Cnd3ZlVwWjVJVElwYkE3Q0dnVHgxcXh0TTF3SVVyN3BIZUtQNmpWZTNrZERMZysvQloyeE1F
+dEJrNWE4WTdCNHYzeHdIWEdUdlY4bU4mIzEzOwowQWcvU3lUL1FVeUVSaFhVeUFOMitFd1orU1FD
+VXlOZnppb1dRODc4ZUd5a1UrNDYrQmJnSTNJSXIzNlhLUHdtenQwU1orS0kzdG5GJiMxMzsKVGxu
+OW1YMEtDMGlkb2o1eWt6UG9DL01JZWQwc3A0VGlneEViV054N0VGODBQdlIvRERFd1ZQRUVra2p5
+NjNYRnVseGlDUUlEQVFBQiYjMTM7Cm80SUJnakNDQVg0d0RBWURWUjBUQVFIL0JBSXdBREFPQmdO
+VkhROEJBZjhFQkFNQ0I0QXdIUVlEVlIwT0JCWUVGSG45czBERWEya3YmIzEzOwpnRS9lSU9Uc3Fv
+Vzg1TVhGTUlHNkJnTlZIU01FZ2JJd2dhK0FGRWQ3VDY1NlVaRzEwYitkTnVtR2Z6WVdCS2xGb1lH
+QXBINHdmREVMJiMxMzsKTUFrR0ExVUVCaE1DVlZNeFBEQTZCZ05WQkFvTU0wbHVkR1Z5Ym1WMElF
+TnZjbkJ2Y21GMGFXOXVJR1p2Y2lCQmMzTnBaMjVsWkNCTyYjMTM7CllXMWxjeUJoYm1RZ1RuVnRZ
+bVZ5Y3pFdk1DMEdBMVVFQXd3bVNVTkJUazRnVkhKaFpHVnRZWEpySUVOc1pXRnlhVzVuYUc5MWMy
+VWcmIzEzOwpVR2xzYjNRZ1EwR0NGSHBxYlRGZUpjUHRVQzlYdXVQS1BzTHdEUitNTURRR0ExVWRI
+d1F0TUNzd0thQW5vQ1dHSTJoMGRIQTZMeTlqJiMxMzsKY213dWFXTmhibTR1YjNKbkwzUnRZMmhm
+Y0dsc2IzUXVZM0pzTUV3R0ExVWRJQVJGTUVNd0VBWU9Ld1lCQkFHQ3lSc0JCWU03REFvdyYjMTM7
+Ckx3WUlLd1lCQlFVSEFnRXdJekFoQmdnckJnRUZCUWNDQVJZVmFIUjBjSE02THk5amNITXVhV05o
+Ym00dWIzSm5NQTBHQ1NxR1NJYjMmIzEzOwpEUUVCRFFVQUE0SUNBUUJkU2F0NTZ1ZWpMbkFqRklG
+OTVkallXSTZzLy9ONllYeHNyck1rR0JQOEVlelB5aExoNmF3UDR6N1E5UUFJJiMxMzsKUVprWW94
+cmwvMXkwK2J5VjJxblRVVUNMUnBLL0JEcC9oY2Z3UGZLQ0EvMlJRQ0hKcmI2K3owZW5EUEZSSzBO
+S213T2NkbEd0VWswbSYjMTM7ClBnV0dTS3R1d1ZzUEFoVERKdWhvc1pPaGtOZituU09PSHJRT24x
+RTJyek9yZC9rUWxxaUN3Ukg5Nzk2TnBUQStIU01mT29iSkVFUHEmIzEzOwp0cEY3UDVxYnd0bDk1
+VWE1T3A0QWhhNzBISGZVRlM0Qk9RS0xCVmZNWmRPUitpUG9oNU93QUsraHRZa0ZDRzlQMldIdTd3
+ZjhFQytXJiMxMzsKN2s5Nmd2VGQ4eEU3b3VvYWJUMng2WWZZcUVsUEhpVS9JTTlnVnpXV0wvc3ZZ
+RHlTVnVvRndCakROTjFjZHEwcU9ZUjF5dVMxYy85RCYjMTM7CkZSN2VvN0dGRUN5K1RCZDdJaUtS
+ZkJWZVlHT09QTW5vRmZ4UkxXcnBzV05ud0Q3bGtQa0xDZ0ZDays4eUVjT1JnNjI1bW82NXo0eTYm
+IzEzOwpKNEs4Zm9kYTdxd21YTlAzUlMxOG9uNkJIdDhsUStiWGdPSG14SUhrMGFPMHFORHFndkxy
+MkZseUxHSkdpRU1ScURNTVI2L2EwNmJ0JiMxMzsKa25VTUhsN0NxTWZqSWtqUDRWTk55R1BkSmd3
+Vmsya2ViOXVORnZKQ3hUK00yZkdYUTFOYkpOZnR2NU1nU3NwOU4xeSt4NmdBM0VodyYjMTM7CnlI
+bG1KQjRZTXRvOHRUVjFpODR4UFh4aTJDQWVEYUdEdXdvc3Q4WVVDU2pxN1JDSzh0R2NhQVlya1hR
+WTJ5UWZYM2N3RHNFeFJxVlcmIzEzOwp5cmp5UnQrTjZtSzk5UT09PC9kczpYNTA5Q2VydGlmaWNh
+dGU+PC9kczpYNTA5RGF0YT48L2RzOktleUluZm8+PC9kczpTaWduYXR1cmU+PC9zbWQ6c2lnbmVk
+TWFyaz4K
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Holder-Arab/TreatyStatute-Holder-Arab-Revoked.smd b/core/src/test/resources/google/registry/tmch/idn/Holder-Arab/TreatyStatute-Holder-Arab-Revoked.smd
new file mode 100644
index 000000000..55f30da76
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Holder-Arab/TreatyStatute-Holder-Arab-Revoked.smd
@@ -0,0 +1,120 @@
+Marks: الاختبار & لتقييم
+smdID: 000000921669082365554-65535
+U-labels: xn------nzeaagpf7azb2ppajr3fa, xn-----btdaafne4a7azpoaiq8ea, xn----ymcaaeld1a4a6onahp3ea, xn--mgbaadjcy1a8mmago8da
+notBefore: 2022-11-22T01:59:25.554Z
+notAfter: 2027-10-21T08:59:34.305Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il9jOTQ1
+MzUyMi0zYThkLTQyM2QtYmJmMy0yNmY1NDg0OGM3ZDQiPjxzbWQ6aWQ+MDAwMDAwOTIxNjY5MDgy
+MzY1NTU0LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMTo1OToyNS41NTRaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0yMVQwODo1OTozNC4zMDVaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
+cmVhdHlPclN0YXR1dGU+PG1hcms6aWQ+MDAwMTQyMTUwMzMwNTgwODE1MDMzMDU4MDgtMTwvbWFy
+azppZD48bWFyazptYXJrTmFtZT7Yp9mE2KfYrtiq2KjYp9ixICZhbXA7INmE2KrZgtmK2YrZhTwv
+bWFyazptYXJrTmFtZT48bWFyazpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpuYW1l
+PtmF2YfZhtiv2LMg2KfZhNmF2LnZhNmI2YXYp9iq2YrYqTwvbWFyazpuYW1lPjxtYXJrOm9yZz7Y
+p9iu2KrYqNin2LE8L21hcms6b3JnPjxtYXJrOmFkZHI+PG1hcms6c3RyZWV0Ptis2LnZgdixINin
+2KjZhiDYs9mK2YbYp9ihIDc1PC9tYXJrOnN0cmVldD48bWFyazpjaXR5PtmF2YPZhtin2LM8L21h
+cms6Y2l0eT48bWFyazpwYz4yOTAwPC9tYXJrOnBjPjxtYXJrOmNjPk1BPC9tYXJrOmNjPjwvbWFy
+azphZGRyPjxtYXJrOnZvaWNlPisyMTIuNTIyNTM5MDQwPC9tYXJrOnZvaWNlPjxtYXJrOmZheD4r
+MjEyLjUyMjUzOTA0MTwvbWFyazpmYXg+PG1hcms6ZW1haWw+aW5mb0BleGFtcGxlLmV4YW1wbGU8
+L21hcms6ZW1haWw+PC9tYXJrOmhvbGRlcj48bWFyazpwcm90ZWN0aW9uPjxtYXJrOmNjPk1BPC9t
+YXJrOmNjPjxtYXJrOnJ1bGluZz5NQTwvbWFyazpydWxpbmc+PC9tYXJrOnByb3RlY3Rpb24+PG1h
+cms6bGFiZWw+eG4tLS0tLS1uemVhYWdwZjdhemIycHBhanIzZmE8L21hcms6bGFiZWw+PG1hcms6
+bGFiZWw+eG4tLS0tLWJ0ZGFhZm5lNGE3YXpwb2FpcThlYTwvbWFyazpsYWJlbD48bWFyazpsYWJl
+bD54bi0tLS15bWNhYWVsZDFhNGE2b25haHAzZWE8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4t
+LW1nYmFhZGpjeTFhOG1tYWdvOGRhPC9tYXJrOmxhYmVsPjxtYXJrOmdvb2RzQW5kU2VydmljZXM+
+2LrZitiq2KfYsTwvbWFyazpnb29kc0FuZFNlcnZpY2VzPjxtYXJrOnJlZk51bT4xMjM0PC9tYXJr
+OnJlZk51bT48bWFyazpwcm9EYXRlPjIwMTMtMDItMDJUMDA6MDA6MDAuMDAwWjwvbWFyazpwcm9E
+YXRlPjxtYXJrOnRpdGxlPlRlc3QgVHJlYXR5PC9tYXJrOnRpdGxlPjxtYXJrOmV4ZWNEYXRlPjIw
+MTMtMDItMDJUMDA6MDA6MDAuMDAwWjwvbWFyazpleGVjRGF0ZT48L21hcms6dHJlYXR5T3JTdGF0
+dXRlPjwvbWFyazptYXJrPjxkczpTaWduYXR1cmUgeG1sbnM6ZHM9Imh0dHA6Ly93d3cudzMub3Jn
+LzIwMDAvMDkveG1sZHNpZyMiIElkPSJfNjc2ZDVlMWUtNDEwZi00ODZlLWFjMmItZGM4YjlhNWQy
+OTUzIj48ZHM6U2lnbmVkSW5mbz48ZHM6Q2Fub25pY2FsaXphdGlvbk1ldGhvZCBBbGdvcml0aG09
+Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjxkczpTaWduYXR1cmVN
+ZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGRzaWctbW9yZSNy
+c2Etc2hhMjU2Ii8+PGRzOlJlZmVyZW5jZSBVUkk9IiNfYzk0NTM1MjItM2E4ZC00MjNkLWJiZjMt
+MjZmNTQ4NDhjN2Q0Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0
+cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48ZHM6
+VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMx
+NG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8v
+d3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+UVlRWVVu
+SzBMZ3M3QnlBb2krYmx1K2xBRkpibE9UN0R0bmRrUXlQQ2pPTT08L2RzOkRpZ2VzdFZhbHVlPjwv
+ZHM6UmVmZXJlbmNlPjxkczpSZWZlcmVuY2UgVVJJPSIjXzBhNTExYTkwLTE2YjAtNDhlMS04YTFl
+LTIwMzA3ZTJkNTMyMCI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0
+dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48
+ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxl
+bmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPlRMRmM4TFFsaFgwM2pTWUlTVW9XWDJ5TStDNzB0
+ZE04VktIQ1E2eGVWT0k9PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48L2RzOlNpZ25l
+ZEluZm8+PGRzOlNpZ25hdHVyZVZhbHVlIElkPSJfZWFmNWNjOGUtMWM5OS00Yzg2LTkzZDItN2Iz
+YmZiNWEzOWE4Ij5Ta2wzbk55bENqOFA4eHhscjRVVGpLMysrMS93MWdpVkFKNnB6VlZFNGsxT25u
+eVdzWHR0Q3ZyWFh4M0JyMHRqc2xxQXpGanZFMDlUJiMxMzsKRmVSYkMxQzVrV0ZZL2RSV0loQzlU
+YmNxa2U4M3VvZ2tuNC9sb001d0FOblJDeUNkdXFpMXVjdDd2dGdQcHJRQTdIYk9ITFlWZERhQyYj
+MTM7CmZtdGVLc0FxRnlqNFR1UEtqMnRKUzR2bG13S2NpSmNvcUFKRHdyazVPYndEbFlheUdpN2J1
+a2pkcFlSOEhUbWFEMDZQbUN2TXBFUVcmIzEzOwpnVzhaSXVrNXoramFmS3l4b1BkVWR0MVNZMFFE
+cXFxbXFpcERWNDZyZkNwQ0JwVnRNOXBqWllKZjN4bHgyeTBVVUxjcmxxaDA5VjVjJiMxMzsKWm1D
+TjU5WG1UcHpIbUpPTkp2LzhQcVN2WnpGc1J6REtjaTltdWV4amZnYXQxekpVajBqVmZxZEJmd2Nq
+dDFPTnJnMS9QMHdjMm80MyYjMTM7CmNVRUttYjZzcWppa0pGR1dUS1cwL2tWeGkvUnU5V0xDRmRa
+dWlMMHJwdnhhdmFLelYrR0c0QUFMejNadXdGMFVwL0t4TjVTZXZhenomIzEzOwpuRVVRRGZZTVVC
+Qk5nQUFobHVWWi9BMXRyL0xodVZiM2xsbzVCY1A2SjNkQXR0N2JlL1ZWTVo2QnYwdjl2ZUVVRHBn
+dmFGWjlzWDUrJiMxMzsKcFFja0xVSnphN3h0N0poUWhMMUIzbTcwMm9GZHFlWjFkODkxMkExZHhM
+VjhLa0k0L0JOY2VPRU96aVViaWxieEQ2SmJTeUVzZVNISCYjMTM7ClUyQ1FnUkYxTzBuU3h0TFFE
+QWFDQitOSkdCbDZJazBzRmdiWm1Ha1h6U1BoZ2NMdUZHK2dhcklmVld2OTlHbzJvamtsVVErVjFh
+bz08L2RzOlNpZ25hdHVyZVZhbHVlPjxkczpLZXlJbmZvIElkPSJfMGE1MTFhOTAtMTZiMC00OGUx
+LThhMWUtMjAzMDdlMmQ1MzIwIj48ZHM6WDUwOURhdGE+PGRzOlg1MDlDZXJ0aWZpY2F0ZT5NSUlI
+WHpDQ0JVZWdBd0lCQWdJVVhxSS92ZDE4Q2FnOThvTnBkelY3Qml5LzZFQXdEUVlKS29aSWh2Y05B
+UUVOQlFBd2ZERUxNQWtHJiMxMzsKQTFVRUJoTUNWVk14UERBNkJnTlZCQW9NTTBsdWRHVnlibVYw
+SUVOdmNuQnZjbUYwYVc5dUlHWnZjaUJCYzNOcFoyNWxaQ0JPWVcxbCYjMTM7CmN5QmhibVFnVG5W
+dFltVnljekV2TUMwR0ExVUVBd3dtU1VOQlRrNGdWSEpoWkdWdFlYSnJJRU5zWldGeWFXNW5hRzkx
+YzJVZ1VHbHMmIzEzOwpiM1FnUTBFd0hoY05Nakl4TVRFMk1UTXlPRFU1V2hjTk1qY3hNVEUxTVRN
+eU9EVTVXakNCMERFTE1Ba0dBMVVFQmhNQ1FrVXhFVEFQJiMxMzsKQmdOVkJBZ1RDRUp5ZFhOelpX
+eHpNUkl3RUFZRFZRUUhFd2xXYVd4MmIyOXlaR1V4TXpBeEJnTlZCQW9US2tSbGJHOXBkSFJsSUVO
+diYjMTM7CmJuTjFiSFJwYm1jZ1lXNWtJRUZrZG1semIzSjVJRU5XUWtFdlUwTlNUREUrTUR3R0Ex
+VUVBeE0xU1VOQlRrNGdWRTFEU0NCQmRYUm8mIzEzOwpiM0pwZW1Wa0lGUnlZV1JsYldGeWF5QlFh
+V3h2ZENCV1lXeHBaR0YwYjNJZ1ZtRnNhV1F4SlRBakJna3Foa2lHOXcwQkNRRVdGbUpsJiMxMzsK
+ZEcxamFITnRaRUJrWld4dmFYUjBaUzVqYjIwd2dnSWlNQTBHQ1NxR1NJYjNEUUVCQVFVQUE0SUNE
+d0F3Z2dJS0FvSUNBUUM2Rkp3eiYjMTM7CktxUVZYNmZHMy9FTFJTR1dWOUdyS2FGTUttaFdJeGVw
+d1JaTjZNeE1xa2Q1RG5ZZmlUK1dwOThqRWtxZ1R4MlVNYjlxdWdjR05WNmcmIzEzOwozNS9DclFi
+L0YvbXozQzRzZkxOdURwU3FLOVFGOCtwYVRINmhRbXJPcHFWK1VUdmRqOVNNZ0tHeUZpelM4OENE
+V014NHczaTRGQUtlJiMxMzsKNk5Sc0pSR1RBdEtEdU1IY0E0c2owOEdqZTNsUFdjZ0Z2Y1FORFZl
+RUJUdU9IQkcrUmhqN1YxSmlOR1AvNGVwVFhURlhnUEZEZ2V6MyYjMTM7CllBZnhxcGJ1TzRUWDZi
+YllkazJudk1MRnZMRU5rQ0ZZdWxuWVB6Z25FQkdTTUtJYUFJbGIrc2NIQ3ZXZ1dqMlRMZ3doMkdK
+TmN6Vk0mIzEzOwoxTFBNcUdTK1VraTlNaDc5ODIyL3hvYXI0OTh4RHgyWXgvOHN3Z0VOTFNnQ3NR
+QVc4bk1nd1duNkFiWWwyUkFCWHVyYXlGc240UDFSJiMxMzsKdVFObVVwL3FyUktSdlNKcjFPTGtI
+WmZGVGNTWVFhVml1TVlQWHpHejh0bU1MbG1JL0I2QUNINEF3Uk1kbll2Rk8zS0kxUkJuUEtJZCYj
+MTM7Cnd3ZlVwWjVJVElwYkE3Q0dnVHgxcXh0TTF3SVVyN3BIZUtQNmpWZTNrZERMZysvQloyeE1F
+dEJrNWE4WTdCNHYzeHdIWEdUdlY4bU4mIzEzOwowQWcvU3lUL1FVeUVSaFhVeUFOMitFd1orU1FD
+VXlOZnppb1dRODc4ZUd5a1UrNDYrQmJnSTNJSXIzNlhLUHdtenQwU1orS0kzdG5GJiMxMzsKVGxu
+OW1YMEtDMGlkb2o1eWt6UG9DL01JZWQwc3A0VGlneEViV054N0VGODBQdlIvRERFd1ZQRUVra2p5
+NjNYRnVseGlDUUlEQVFBQiYjMTM7Cm80SUJnakNDQVg0d0RBWURWUjBUQVFIL0JBSXdBREFPQmdO
+VkhROEJBZjhFQkFNQ0I0QXdIUVlEVlIwT0JCWUVGSG45czBERWEya3YmIzEzOwpnRS9lSU9Uc3Fv
+Vzg1TVhGTUlHNkJnTlZIU01FZ2JJd2dhK0FGRWQ3VDY1NlVaRzEwYitkTnVtR2Z6WVdCS2xGb1lH
+QXBINHdmREVMJiMxMzsKTUFrR0ExVUVCaE1DVlZNeFBEQTZCZ05WQkFvTU0wbHVkR1Z5Ym1WMElF
+TnZjbkJ2Y21GMGFXOXVJR1p2Y2lCQmMzTnBaMjVsWkNCTyYjMTM7CllXMWxjeUJoYm1RZ1RuVnRZ
+bVZ5Y3pFdk1DMEdBMVVFQXd3bVNVTkJUazRnVkhKaFpHVnRZWEpySUVOc1pXRnlhVzVuYUc5MWMy
+VWcmIzEzOwpVR2xzYjNRZ1EwR0NGSHBxYlRGZUpjUHRVQzlYdXVQS1BzTHdEUitNTURRR0ExVWRI
+d1F0TUNzd0thQW5vQ1dHSTJoMGRIQTZMeTlqJiMxMzsKY213dWFXTmhibTR1YjNKbkwzUnRZMmhm
+Y0dsc2IzUXVZM0pzTUV3R0ExVWRJQVJGTUVNd0VBWU9Ld1lCQkFHQ3lSc0JCWU03REFvdyYjMTM7
+Ckx3WUlLd1lCQlFVSEFnRXdJekFoQmdnckJnRUZCUWNDQVJZVmFIUjBjSE02THk5amNITXVhV05o
+Ym00dWIzSm5NQTBHQ1NxR1NJYjMmIzEzOwpEUUVCRFFVQUE0SUNBUUJkU2F0NTZ1ZWpMbkFqRklG
+OTVkallXSTZzLy9ONllYeHNyck1rR0JQOEVlelB5aExoNmF3UDR6N1E5UUFJJiMxMzsKUVprWW94
+cmwvMXkwK2J5VjJxblRVVUNMUnBLL0JEcC9oY2Z3UGZLQ0EvMlJRQ0hKcmI2K3owZW5EUEZSSzBO
+S213T2NkbEd0VWswbSYjMTM7ClBnV0dTS3R1d1ZzUEFoVERKdWhvc1pPaGtOZituU09PSHJRT24x
+RTJyek9yZC9rUWxxaUN3Ukg5Nzk2TnBUQStIU01mT29iSkVFUHEmIzEzOwp0cEY3UDVxYnd0bDk1
+VWE1T3A0QWhhNzBISGZVRlM0Qk9RS0xCVmZNWmRPUitpUG9oNU93QUsraHRZa0ZDRzlQMldIdTd3
+ZjhFQytXJiMxMzsKN2s5Nmd2VGQ4eEU3b3VvYWJUMng2WWZZcUVsUEhpVS9JTTlnVnpXV0wvc3ZZ
+RHlTVnVvRndCakROTjFjZHEwcU9ZUjF5dVMxYy85RCYjMTM7CkZSN2VvN0dGRUN5K1RCZDdJaUtS
+ZkJWZVlHT09QTW5vRmZ4UkxXcnBzV05ud0Q3bGtQa0xDZ0ZDays4eUVjT1JnNjI1bW82NXo0eTYm
+IzEzOwpKNEs4Zm9kYTdxd21YTlAzUlMxOG9uNkJIdDhsUStiWGdPSG14SUhrMGFPMHFORHFndkxy
+MkZseUxHSkdpRU1ScURNTVI2L2EwNmJ0JiMxMzsKa25VTUhsN0NxTWZqSWtqUDRWTk55R1BkSmd3
+Vmsya2ViOXVORnZKQ3hUK00yZkdYUTFOYkpOZnR2NU1nU3NwOU4xeSt4NmdBM0VodyYjMTM7CnlI
+bG1KQjRZTXRvOHRUVjFpODR4UFh4aTJDQWVEYUdEdXdvc3Q4WVVDU2pxN1JDSzh0R2NhQVlya1hR
+WTJ5UWZYM2N3RHNFeFJxVlcmIzEzOwp5cmp5UnQrTjZtSzk5UT09PC9kczpYNTA5Q2VydGlmaWNh
+dGU+PC9kczpYNTA5RGF0YT48L2RzOktleUluZm8+PC9kczpTaWduYXR1cmU+PC9zbWQ6c2lnbmVk
+TWFyaz4K
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Holder-Chinese/Court-Holder-Chinese-Active.smd b/core/src/test/resources/google/registry/tmch/idn/Holder-Chinese/Court-Holder-Chinese-Active.smd
new file mode 100644
index 000000000..9e4961ca1
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Holder-Chinese/Court-Holder-Chinese-Active.smd
@@ -0,0 +1,115 @@
+Marks: 证明&标志
+smdID: 000000701669082676846-65535
+U-labels: xn----z33bn7p06br59e, xn--and-qy3f87yx4cc34g, xn--m6t41lkubhz2e
+notBefore: 2022-11-22T02:04:36.846Z
+notAfter: 2027-10-21T08:12:01.925Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il8xYTcz
+YmFmYy1hNzRmLTRkMzktOWQ4YS1mNmQ4MzgyNjQ0ZmYiPjxzbWQ6aWQ+MDAwMDAwNzAxNjY5MDgy
+Njc2ODQ2LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMjowNDozNi44NDZaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0yMVQwODoxMjowMS45MjVaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazpj
+b3VydD48bWFyazppZD4wMDAxNDUxNTAzMDY0NjA2MTUwMzA2NDYwNi0xPC9tYXJrOmlkPjxtYXJr
+Om1hcmtOYW1lPuivgeaYjiZhbXA75qCH5b+XPC9tYXJrOm1hcmtOYW1lPjxtYXJrOmhvbGRlciBl
+bnRpdGxlbWVudD0ib3duZXIiPjxtYXJrOm5hbWU+5p2O5bCP5pa5PC9tYXJrOm5hbWU+PG1hcms6
+b3JnPua1i+ivlTwvbWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpzdHJlZXQ+6aaZ5riv5Lic6Lev
+NuWPt++8jDXlj7fmpbzvvIw45Y+35a6kIDwvbWFyazpzdHJlZXQ+PG1hcms6Y2l0eT7pnZLlspvl
+uII8L21hcms6Y2l0eT48bWFyazpwYz4xMDAwPC9tYXJrOnBjPjxtYXJrOmNjPkNOPC9tYXJrOmNj
+PjwvbWFyazphZGRyPjxtYXJrOnZvaWNlPis4Ni4xMDg0NjU3MTczPC9tYXJrOnZvaWNlPjxtYXJr
+OmZheD4rODYuMTA4NDY1NzE3MzwvbWFyazpmYXg+PG1hcms6ZW1haWw+aW5mb0BleGFtcGxlLmV4
+YW1wbGU8L21hcms6ZW1haWw+PC9tYXJrOmhvbGRlcj48bWFyazpsYWJlbD54bi0tLS16MzNibjdw
+MDZicjU5ZTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tYW5kLXF5M2Y4N3l4NGNjMzRnPC9t
+YXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1tNnQ0MWxrdWJoejJlPC9tYXJrOmxhYmVsPjxtYXJr
+Omdvb2RzQW5kU2VydmljZXM+IOWQieS7ljwvbWFyazpnb29kc0FuZFNlcnZpY2VzPjxtYXJrOnJl
+Zk51bT4xMjM0PC9tYXJrOnJlZk51bT48bWFyazpwcm9EYXRlPjIwMTMtMDEtMDFUMDA6MDA6MDAu
+MDAwWjwvbWFyazpwcm9EYXRlPjxtYXJrOmNjPlVTPC9tYXJrOmNjPjxtYXJrOmNvdXJ0TmFtZT5U
+ZXN0IENvdXJ0PC9tYXJrOmNvdXJ0TmFtZT48L21hcms6Y291cnQ+PC9tYXJrOm1hcms+PGRzOlNp
+Z25hdHVyZSB4bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyIgSWQ9
+Il9mNTMxM2Q3Yy00ZWE2LTRmM2QtOTIxZi02OTVlNGU5Y2RhMWYiPjxkczpTaWduZWRJbmZvPjxk
+czpDYW5vbmljYWxpemF0aW9uTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAw
+MS8xMC94bWwtZXhjLWMxNG4jIi8+PGRzOlNpZ25hdHVyZU1ldGhvZCBBbGdvcml0aG09Imh0dHA6
+Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZHNpZy1tb3JlI3JzYS1zaGEyNTYiLz48ZHM6UmVmZXJl
+bmNlIFVSST0iI18xYTczYmFmYy1hNzRmLTRkMzktOWQ4YS1mNmQ4MzgyNjQ0ZmYiPjxkczpUcmFu
+c2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5
+L3htbGRzaWcjZW52ZWxvcGVkLXNpZ25hdHVyZSIvPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJo
+dHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+
+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1s
+ZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1ZT56VjNFVmZPR2haVWNEZU1yZm1XeVZMdDU4WDlo
+SlZDRFVSeDVncTBaMnJVPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PGRzOlJlZmVy
+ZW5jZSBVUkk9IiNfOWY5ZTRlMzctOWQwMi00OTNhLTkwNTEtY2Q1NjJjMDViNTE5Ij48ZHM6VHJh
+bnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8x
+MC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3Jp
+dGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0
+VmFsdWU+STZNaThsanpOWmVFME5FUGlodURYZVQ4dkZ2Qk9ObkJDZURNeWRMd1Zxbz08L2RzOkRp
+Z2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNlPjwvZHM6U2lnbmVkSW5mbz48ZHM6U2lnbmF0dXJlVmFs
+dWUgSWQ9Il8wMmY1YjZhYi03MjI1LTQ1NTAtODE2Yi02NGI2OTMxZDM4MGIiPkg4VGoxczVQaEVF
+dGJ6UEswb2NXYThkSjY3NGIram01OG5TZHZidit4RC9SNlFULytmZm9VaTVuSUROVS9qakZXYVFN
+KzYzLzEwYXgmIzEzOwpNMjUrRi9rdXRJWkNpMkxCL3VhVnM0ZVc2a2ZkSG9ETXlEZlYwTWRHL3BG
+RS9YK3ZsSGRCZ2VjOGw4em1ldVBNbHVvc3FWUW1YWXp3JiMxMzsKTlRsdFB0ejgvd3pCc1NyYjZV
+dUJBdUNPZ0xiOW0zQWZFdDdtdWxoQTIvZ2pDVG5UMG1QbWovbDZ0S09GSVNVQ0UxTjY4Wkt1NVlw
+SCYjMTM7Ck9MWmswR3hzbVpEZ1hQR29iQzc5RXBMVzhWbEw5UVFlTHROcU1veTFVN3NsOENzWEI2
+Uk9JcGIzSWhEbXZxRXFXcVFvamxkaGFmMDUmIzEzOwpaN2U2OWJLcWNZSUpVRFFmV1J0dWhtVTdu
+dWUwZXJJVHpKTW1jMEZQY0RyOHB1dVFkaEJNNHJUNTN2ZlRRNldKbGZ5Y0xnTDBMQXBHJiMxMzsK
+ajd0SGFBUWx2SWpvMnFDbGk1TjY5WTRMT25XdXo4SVdBU1ZOaUZ6L3VXaVJvaVQyT0pSZVZMNnYr
+WkJwa3JFbjEzOEZwaFUrR20yUiYjMTM7Ck9yeXFUS0krbHM1YXA0MitROXJnTWdVWXV2UXF0SWJa
+ZUVEbHBVY3RtTEdvRE9nVTdIT1JZNENyK3BJNzhyN1IrMVJXRE5aS0l1YWEmIzEzOwpDcWJ6UjdB
+SGloMElJNVJjRDY3ZThzQkgzUFdHVE1FYWtnRG41YzhwMzU5dFQ0N3RTdGVGdFRnVmtMWHdtNzE2
+Nm4veXUwd2orZXFQJiMxMzsKRGJnQ25aRzhoYmo0dHdYTlpTYW55S3NEZzROK3ZvV3FPRncyczBm
+M3dra3VMRUZlVVIwOFdhQ1NDUTlnS3lxT2tzZzJqakx3RzhJPTwvZHM6U2lnbmF0dXJlVmFsdWU+
+PGRzOktleUluZm8gSWQ9Il85ZjllNGUzNy05ZDAyLTQ5M2EtOTA1MS1jZDU2MmMwNWI1MTkiPjxk
+czpYNTA5RGF0YT48ZHM6WDUwOUNlcnRpZmljYXRlPk1JSUhYekNDQlVlZ0F3SUJBZ0lVWHFJL3Zk
+MThDYWc5OG9OcGR6VjdCaXkvNkVBd0RRWUpLb1pJaHZjTkFRRU5CUUF3ZkRFTE1Ba0cmIzEzOwpB
+MVVFQmhNQ1ZWTXhQREE2QmdOVkJBb01NMGx1ZEdWeWJtVjBJRU52Y25CdmNtRjBhVzl1SUdadmNp
+QkJjM05wWjI1bFpDQk9ZVzFsJiMxMzsKY3lCaGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF3d21T
+VU5CVGs0Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5YVc1bmFHOTFjMlVnVUdscyYjMTM7CmIzUWdRMEV3
+SGhjTk1qSXhNVEUyTVRNeU9EVTVXaGNOTWpjeE1URTFNVE15T0RVNVdqQ0IwREVMTUFrR0ExVUVC
+aE1DUWtVeEVUQVAmIzEzOwpCZ05WQkFnVENFSnlkWE56Wld4ek1SSXdFQVlEVlFRSEV3bFdhV3gy
+YjI5eVpHVXhNekF4QmdOVkJBb1RLa1JsYkc5cGRIUmxJRU52JiMxMzsKYm5OMWJIUnBibWNnWVc1
+a0lFRmtkbWx6YjNKNUlFTldRa0V2VTBOU1RERStNRHdHQTFVRUF4TTFTVU5CVGs0Z1ZFMURTQ0JC
+ZFhSbyYjMTM7CmIzSnBlbVZrSUZSeVlXUmxiV0Z5YXlCUWFXeHZkQ0JXWVd4cFpHRjBiM0lnVm1G
+c2FXUXhKVEFqQmdrcWhraUc5dzBCQ1FFV0ZtSmwmIzEzOwpkRzFqYUhOdFpFQmtaV3h2YVhSMFpT
+NWpiMjB3Z2dJaU1BMEdDU3FHU0liM0RRRUJBUVVBQTRJQ0R3QXdnZ0lLQW9JQ0FRQzZGSnd6JiMx
+MzsKS3FRVlg2ZkczL0VMUlNHV1Y5R3JLYUZNS21oV0l4ZXB3UlpONk14TXFrZDVEbllmaVQrV3A5
+OGpFa3FnVHgyVU1iOXF1Z2NHTlY2ZyYjMTM7CjM1L0NyUWIvRi9tejNDNHNmTE51RHBTcUs5UUY4
+K3BhVEg2aFFtck9wcVYrVVR2ZGo5U01nS0d5Rml6Uzg4Q0RXTXg0dzNpNEZBS2UmIzEzOwo2TlJz
+SlJHVEF0S0R1TUhjQTRzajA4R2plM2xQV2NnRnZjUU5EVmVFQlR1T0hCRytSaGo3VjFKaU5HUC80
+ZXBUWFRGWGdQRkRnZXozJiMxMzsKWUFmeHFwYnVPNFRYNmJiWWRrMm52TUxGdkxFTmtDRll1bG5Z
+UHpnbkVCR1NNS0lhQUlsYitzY0hDdldnV2oyVExnd2gyR0pOY3pWTSYjMTM7CjFMUE1xR1MrVWtp
+OU1oNzk4MjIveG9hcjQ5OHhEeDJZeC84c3dnRU5MU2dDc1FBVzhuTWd3V242QWJZbDJSQUJYdXJh
+eUZzbjRQMVImIzEzOwp1UU5tVXAvcXJSS1J2U0pyMU9Ma0haZkZUY1NZUWFWaXVNWVBYekd6OHRt
+TUxsbUkvQjZBQ0g0QXdSTWRuWXZGTzNLSTFSQm5QS0lkJiMxMzsKd3dmVXBaNUlUSXBiQTdDR2dU
+eDFxeHRNMXdJVXI3cEhlS1A2alZlM2tkRExnKy9CWjJ4TUV0Qms1YThZN0I0djN4d0hYR1R2Vjht
+TiYjMTM7CjBBZy9TeVQvUVV5RVJoWFV5QU4yK0V3WitTUUNVeU5memlvV1E4NzhlR3lrVSs0NitC
+YmdJM0lJcjM2WEtQd216dDBTWitLSTN0bkYmIzEzOwpUbG45bVgwS0MwaWRvajV5a3pQb0MvTUll
+ZDBzcDRUaWd4RWJXTng3RUY4MFB2Ui9EREV3VlBFRWtrank2M1hGdWx4aUNRSURBUUFCJiMxMzsK
+bzRJQmdqQ0NBWDR3REFZRFZSMFRBUUgvQkFJd0FEQU9CZ05WSFE4QkFmOEVCQU1DQjRBd0hRWURW
+UjBPQkJZRUZIbjlzMERFYTJrdiYjMTM7CmdFL2VJT1RzcW9XODVNWEZNSUc2QmdOVkhTTUVnYkl3
+Z2ErQUZFZDdUNjU2VVpHMTBiK2ROdW1HZnpZV0JLbEZvWUdBcEg0d2ZERUwmIzEzOwpNQWtHQTFV
+RUJoTUNWVk14UERBNkJnTlZCQW9NTTBsdWRHVnlibVYwSUVOdmNuQnZjbUYwYVc5dUlHWnZjaUJC
+YzNOcFoyNWxaQ0JPJiMxMzsKWVcxbGN5QmhibVFnVG5WdFltVnljekV2TUMwR0ExVUVBd3dtU1VO
+QlRrNGdWSEpoWkdWdFlYSnJJRU5zWldGeWFXNW5hRzkxYzJVZyYjMTM7ClVHbHNiM1FnUTBHQ0ZI
+cHFiVEZlSmNQdFVDOVh1dVBLUHNMd0RSK01NRFFHQTFVZEh3UXRNQ3N3S2FBbm9DV0dJMmgwZEhB
+Nkx5OWomIzEzOwpjbXd1YVdOaGJtNHViM0puTDNSdFkyaGZjR2xzYjNRdVkzSnNNRXdHQTFVZElB
+UkZNRU13RUFZT0t3WUJCQUdDeVJzQkJZTTdEQW93JiMxMzsKTHdZSUt3WUJCUVVIQWdFd0l6QWhC
+Z2dyQmdFRkJRY0NBUllWYUhSMGNITTZMeTlqY0hNdWFXTmhibTR1YjNKbk1BMEdDU3FHU0liMyYj
+MTM7CkRRRUJEUVVBQTRJQ0FRQmRTYXQ1NnVlakxuQWpGSUY5NWRqWVdJNnMvL042WVh4c3JyTWtH
+QlA4RWV6UHloTGg2YXdQNHo3UTlRQUkmIzEzOwpRWmtZb3hybC8xeTArYnlWMnFuVFVVQ0xScEsv
+QkRwL2hjZndQZktDQS8yUlFDSEpyYjYrejBlbkRQRlJLME5LbXdPY2RsR3RVazBtJiMxMzsKUGdX
+R1NLdHV3VnNQQWhUREp1aG9zWk9oa05mK25TT09IclFPbjFFMnJ6T3JkL2tRbHFpQ3dSSDk3OTZO
+cFRBK0hTTWZPb2JKRUVQcSYjMTM7CnRwRjdQNXFid3RsOTVVYTVPcDRBaGE3MEhIZlVGUzRCT1FL
+TEJWZk1aZE9SK2lQb2g1T3dBSytodFlrRkNHOVAyV0h1N3dmOEVDK1cmIzEzOwo3azk2Z3ZUZDh4
+RTdvdW9hYlQyeDZZZllxRWxQSGlVL0lNOWdWeldXTC9zdllEeVNWdW9Gd0JqRE5OMWNkcTBxT1lS
+MXl1UzFjLzlEJiMxMzsKRlI3ZW83R0ZFQ3krVEJkN0lpS1JmQlZlWUdPT1BNbm9GZnhSTFdycHNX
+Tm53RDdsa1BrTENnRkNrKzh5RWNPUmc2MjVtbzY1ejR5NiYjMTM7Cko0Szhmb2RhN3F3bVhOUDNS
+UzE4b242Qkh0OGxRK2JYZ09IbXhJSGswYU8wcU5EcWd2THIyRmx5TEdKR2lFTVJxRE1NUjYvYTA2
+YnQmIzEzOwprblVNSGw3Q3FNZmpJa2pQNFZOTnlHUGRKZ3dWazJrZWI5dU5GdkpDeFQrTTJmR1hR
+MU5iSk5mdHY1TWdTc3A5TjF5K3g2Z0EzRWh3JiMxMzsKeUhsbUpCNFlNdG84dFRWMWk4NHhQWHhp
+MkNBZURhR0R1d29zdDhZVUNTanE3UkNLOHRHY2FBWXJrWFFZMnlRZlgzY3dEc0V4UnFWVyYjMTM7
+CnlyanlSdCtONm1LOTlRPT08L2RzOlg1MDlDZXJ0aWZpY2F0ZT48L2RzOlg1MDlEYXRhPjwvZHM6
+S2V5SW5mbz48L2RzOlNpZ25hdHVyZT48L3NtZDpzaWduZWRNYXJrPgo=
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Holder-Chinese/Court-Holder-Chinese-Revoked.smd b/core/src/test/resources/google/registry/tmch/idn/Holder-Chinese/Court-Holder-Chinese-Revoked.smd
new file mode 100644
index 000000000..836b5ca71
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Holder-Chinese/Court-Holder-Chinese-Revoked.smd
@@ -0,0 +1,115 @@
+Marks: 证明&标志
+smdID: 000000701669082634742-65535
+U-labels: xn----z33bn7p06br59e, xn--and-qy3f87yx4cc34g, xn--m6t41lkubhz2e
+notBefore: 2022-11-22T02:03:54.742Z
+notAfter: 2027-10-21T08:12:01.925Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il81OTIx
+MWM0Yy1jNGExLTRlOTAtYjI0My04ZGMyZDI1YzU5MGUiPjxzbWQ6aWQ+MDAwMDAwNzAxNjY5MDgy
+NjM0NzQyLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMjowMzo1NC43NDJaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0yMVQwODoxMjowMS45MjVaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazpj
+b3VydD48bWFyazppZD4wMDAxNDUxNTAzMDY0NjA2MTUwMzA2NDYwNi0xPC9tYXJrOmlkPjxtYXJr
+Om1hcmtOYW1lPuivgeaYjiZhbXA75qCH5b+XPC9tYXJrOm1hcmtOYW1lPjxtYXJrOmhvbGRlciBl
+bnRpdGxlbWVudD0ib3duZXIiPjxtYXJrOm5hbWU+5p2O5bCP5pa5PC9tYXJrOm5hbWU+PG1hcms6
+b3JnPua1i+ivlTwvbWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpzdHJlZXQ+6aaZ5riv5Lic6Lev
+NuWPt++8jDXlj7fmpbzvvIw45Y+35a6kIDwvbWFyazpzdHJlZXQ+PG1hcms6Y2l0eT7pnZLlspvl
+uII8L21hcms6Y2l0eT48bWFyazpwYz4xMDAwPC9tYXJrOnBjPjxtYXJrOmNjPkNOPC9tYXJrOmNj
+PjwvbWFyazphZGRyPjxtYXJrOnZvaWNlPis4Ni4xMDg0NjU3MTczPC9tYXJrOnZvaWNlPjxtYXJr
+OmZheD4rODYuMTA4NDY1NzE3MzwvbWFyazpmYXg+PG1hcms6ZW1haWw+aW5mb0BleGFtcGxlLmV4
+YW1wbGU8L21hcms6ZW1haWw+PC9tYXJrOmhvbGRlcj48bWFyazpsYWJlbD54bi0tLS16MzNibjdw
+MDZicjU5ZTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tYW5kLXF5M2Y4N3l4NGNjMzRnPC9t
+YXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1tNnQ0MWxrdWJoejJlPC9tYXJrOmxhYmVsPjxtYXJr
+Omdvb2RzQW5kU2VydmljZXM+IOWQieS7ljwvbWFyazpnb29kc0FuZFNlcnZpY2VzPjxtYXJrOnJl
+Zk51bT4xMjM0PC9tYXJrOnJlZk51bT48bWFyazpwcm9EYXRlPjIwMTMtMDEtMDFUMDA6MDA6MDAu
+MDAwWjwvbWFyazpwcm9EYXRlPjxtYXJrOmNjPlVTPC9tYXJrOmNjPjxtYXJrOmNvdXJ0TmFtZT5U
+ZXN0IENvdXJ0PC9tYXJrOmNvdXJ0TmFtZT48L21hcms6Y291cnQ+PC9tYXJrOm1hcms+PGRzOlNp
+Z25hdHVyZSB4bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyIgSWQ9
+Il9hZDFlYWQ5OC00ZjFlLTQzZmItOThjYS1hYWZjMDRjZjJhZTYiPjxkczpTaWduZWRJbmZvPjxk
+czpDYW5vbmljYWxpemF0aW9uTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAw
+MS8xMC94bWwtZXhjLWMxNG4jIi8+PGRzOlNpZ25hdHVyZU1ldGhvZCBBbGdvcml0aG09Imh0dHA6
+Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZHNpZy1tb3JlI3JzYS1zaGEyNTYiLz48ZHM6UmVmZXJl
+bmNlIFVSST0iI181OTIxMWM0Yy1jNGExLTRlOTAtYjI0My04ZGMyZDI1YzU5MGUiPjxkczpUcmFu
+c2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5
+L3htbGRzaWcjZW52ZWxvcGVkLXNpZ25hdHVyZSIvPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJo
+dHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+
+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1s
+ZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1ZT5wQjVORmpBWUFpcWJuYjlRRVdJcGFHTDhZSm1s
+L1ByV1dQRm1pRzRUdFMwPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PGRzOlJlZmVy
+ZW5jZSBVUkk9IiNfZDlhMjFlNmEtZTE3NC00MWVmLWJlNzgtMjVlNjU5ZjYxZTZlIj48ZHM6VHJh
+bnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8x
+MC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3Jp
+dGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0
+VmFsdWU+cms2b2t4d0hiZTVXZ1NwYllIV0owc05NUW5NbjBWdFJIck9YdzI2Z3VQRT08L2RzOkRp
+Z2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNlPjwvZHM6U2lnbmVkSW5mbz48ZHM6U2lnbmF0dXJlVmFs
+dWUgSWQ9Il8xZDVlMTM1Ny00NzM3LTQ5OTAtYTVmOS0wYTBkMzBjZmZiYTciPlQ3WUZYaTQxckFH
+eElhV0RxNzZLRVZreDJEVnYrckdTUjdqalUvYTY4MUdYeUdnM3I2UlFDNENaSE91QitZMHkrQ1pP
+RWd0MWpEQjAmIzEzOwpTRmdqOGFrbzNjam84TjNYU3lxbUhnR0JMc2wxcFlLNkMrV1BwbldjY3pj
+NStKVHovZ0I0cFFLMDltVmxublp5M3lvRHltTFF4blUyJiMxMzsKQmNQa2g2dWI0ekdPSklpVHhu
+ejYrTThZemVRWE5vSUdVYXUwZUkyNithSVFXMEs3R2pqdjVVNFdWLzBsU3Qxd0cwK09qOFBKM0xS
+RSYjMTM7CmRNakpqTUZzR3FITk9zaWFrbWhLMFYrU3B5RGlSdzY5R2huZ29hUTBYYld3SHdaU3lO
+ajRONW9HU1krNzVoMEhsMXluWUFGdGJ6ZkImIzEzOwpQa0JUbW9jbDcvZkdXd1NjOEpxUUQ2bXBQ
+U0R2N0lYTDhka1pnOURTTEtiNStjVm1NVWxGR1NYSk9XWXlWUWJtNTlvYWdYWk5kb3MvJiMxMzsK
+Zkg4TUxGdHhFdFpZNjdaeDZKOWlOajZZYlNFN3BkZS9EUEk5dTgzV25IZVQwa3QzUGFTUmd4TFIz
+QmJnaExaUDd4aU9aR0ZkZU1pMyYjMTM7ClZWTW82R3BPMGM3YnNBMFE1dVpkZWx6VDI2RmVpdlpq
+clVNa2RtUE1oajU4N1I3UStMQWRtUGdHQ3ZnbmtTMHVJbmZHbUNYaHV6cEgmIzEzOwp0ZGlpUDd6
+aDdPR09OdTVydTRxQXYrRWk0UEVkc3F0M015cG9NMWk4MFhOc21FQjRhTXd1cXhRRWFmbDVHZW9u
+clc1WmFUSjU0RzhQJiMxMzsKWXJrZ3ZleGZaOUx1MXBRVk16WXFPejk3L2RZK01oOG01Q2FnS2sx
+alljYW4vdnMzNkhqNmNKYWVaemJVQVNtU0p1Ymt1NWdONi9nPTwvZHM6U2lnbmF0dXJlVmFsdWU+
+PGRzOktleUluZm8gSWQ9Il9kOWEyMWU2YS1lMTc0LTQxZWYtYmU3OC0yNWU2NTlmNjFlNmUiPjxk
+czpYNTA5RGF0YT48ZHM6WDUwOUNlcnRpZmljYXRlPk1JSUhYekNDQlVlZ0F3SUJBZ0lVWHFJL3Zk
+MThDYWc5OG9OcGR6VjdCaXkvNkVBd0RRWUpLb1pJaHZjTkFRRU5CUUF3ZkRFTE1Ba0cmIzEzOwpB
+MVVFQmhNQ1ZWTXhQREE2QmdOVkJBb01NMGx1ZEdWeWJtVjBJRU52Y25CdmNtRjBhVzl1SUdadmNp
+QkJjM05wWjI1bFpDQk9ZVzFsJiMxMzsKY3lCaGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF3d21T
+VU5CVGs0Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5YVc1bmFHOTFjMlVnVUdscyYjMTM7CmIzUWdRMEV3
+SGhjTk1qSXhNVEUyTVRNeU9EVTVXaGNOTWpjeE1URTFNVE15T0RVNVdqQ0IwREVMTUFrR0ExVUVC
+aE1DUWtVeEVUQVAmIzEzOwpCZ05WQkFnVENFSnlkWE56Wld4ek1SSXdFQVlEVlFRSEV3bFdhV3gy
+YjI5eVpHVXhNekF4QmdOVkJBb1RLa1JsYkc5cGRIUmxJRU52JiMxMzsKYm5OMWJIUnBibWNnWVc1
+a0lFRmtkbWx6YjNKNUlFTldRa0V2VTBOU1RERStNRHdHQTFVRUF4TTFTVU5CVGs0Z1ZFMURTQ0JC
+ZFhSbyYjMTM7CmIzSnBlbVZrSUZSeVlXUmxiV0Z5YXlCUWFXeHZkQ0JXWVd4cFpHRjBiM0lnVm1G
+c2FXUXhKVEFqQmdrcWhraUc5dzBCQ1FFV0ZtSmwmIzEzOwpkRzFqYUhOdFpFQmtaV3h2YVhSMFpT
+NWpiMjB3Z2dJaU1BMEdDU3FHU0liM0RRRUJBUVVBQTRJQ0R3QXdnZ0lLQW9JQ0FRQzZGSnd6JiMx
+MzsKS3FRVlg2ZkczL0VMUlNHV1Y5R3JLYUZNS21oV0l4ZXB3UlpONk14TXFrZDVEbllmaVQrV3A5
+OGpFa3FnVHgyVU1iOXF1Z2NHTlY2ZyYjMTM7CjM1L0NyUWIvRi9tejNDNHNmTE51RHBTcUs5UUY4
+K3BhVEg2aFFtck9wcVYrVVR2ZGo5U01nS0d5Rml6Uzg4Q0RXTXg0dzNpNEZBS2UmIzEzOwo2TlJz
+SlJHVEF0S0R1TUhjQTRzajA4R2plM2xQV2NnRnZjUU5EVmVFQlR1T0hCRytSaGo3VjFKaU5HUC80
+ZXBUWFRGWGdQRkRnZXozJiMxMzsKWUFmeHFwYnVPNFRYNmJiWWRrMm52TUxGdkxFTmtDRll1bG5Z
+UHpnbkVCR1NNS0lhQUlsYitzY0hDdldnV2oyVExnd2gyR0pOY3pWTSYjMTM7CjFMUE1xR1MrVWtp
+OU1oNzk4MjIveG9hcjQ5OHhEeDJZeC84c3dnRU5MU2dDc1FBVzhuTWd3V242QWJZbDJSQUJYdXJh
+eUZzbjRQMVImIzEzOwp1UU5tVXAvcXJSS1J2U0pyMU9Ma0haZkZUY1NZUWFWaXVNWVBYekd6OHRt
+TUxsbUkvQjZBQ0g0QXdSTWRuWXZGTzNLSTFSQm5QS0lkJiMxMzsKd3dmVXBaNUlUSXBiQTdDR2dU
+eDFxeHRNMXdJVXI3cEhlS1A2alZlM2tkRExnKy9CWjJ4TUV0Qms1YThZN0I0djN4d0hYR1R2Vjht
+TiYjMTM7CjBBZy9TeVQvUVV5RVJoWFV5QU4yK0V3WitTUUNVeU5memlvV1E4NzhlR3lrVSs0NitC
+YmdJM0lJcjM2WEtQd216dDBTWitLSTN0bkYmIzEzOwpUbG45bVgwS0MwaWRvajV5a3pQb0MvTUll
+ZDBzcDRUaWd4RWJXTng3RUY4MFB2Ui9EREV3VlBFRWtrank2M1hGdWx4aUNRSURBUUFCJiMxMzsK
+bzRJQmdqQ0NBWDR3REFZRFZSMFRBUUgvQkFJd0FEQU9CZ05WSFE4QkFmOEVCQU1DQjRBd0hRWURW
+UjBPQkJZRUZIbjlzMERFYTJrdiYjMTM7CmdFL2VJT1RzcW9XODVNWEZNSUc2QmdOVkhTTUVnYkl3
+Z2ErQUZFZDdUNjU2VVpHMTBiK2ROdW1HZnpZV0JLbEZvWUdBcEg0d2ZERUwmIzEzOwpNQWtHQTFV
+RUJoTUNWVk14UERBNkJnTlZCQW9NTTBsdWRHVnlibVYwSUVOdmNuQnZjbUYwYVc5dUlHWnZjaUJC
+YzNOcFoyNWxaQ0JPJiMxMzsKWVcxbGN5QmhibVFnVG5WdFltVnljekV2TUMwR0ExVUVBd3dtU1VO
+QlRrNGdWSEpoWkdWdFlYSnJJRU5zWldGeWFXNW5hRzkxYzJVZyYjMTM7ClVHbHNiM1FnUTBHQ0ZI
+cHFiVEZlSmNQdFVDOVh1dVBLUHNMd0RSK01NRFFHQTFVZEh3UXRNQ3N3S2FBbm9DV0dJMmgwZEhB
+Nkx5OWomIzEzOwpjbXd1YVdOaGJtNHViM0puTDNSdFkyaGZjR2xzYjNRdVkzSnNNRXdHQTFVZElB
+UkZNRU13RUFZT0t3WUJCQUdDeVJzQkJZTTdEQW93JiMxMzsKTHdZSUt3WUJCUVVIQWdFd0l6QWhC
+Z2dyQmdFRkJRY0NBUllWYUhSMGNITTZMeTlqY0hNdWFXTmhibTR1YjNKbk1BMEdDU3FHU0liMyYj
+MTM7CkRRRUJEUVVBQTRJQ0FRQmRTYXQ1NnVlakxuQWpGSUY5NWRqWVdJNnMvL042WVh4c3JyTWtH
+QlA4RWV6UHloTGg2YXdQNHo3UTlRQUkmIzEzOwpRWmtZb3hybC8xeTArYnlWMnFuVFVVQ0xScEsv
+QkRwL2hjZndQZktDQS8yUlFDSEpyYjYrejBlbkRQRlJLME5LbXdPY2RsR3RVazBtJiMxMzsKUGdX
+R1NLdHV3VnNQQWhUREp1aG9zWk9oa05mK25TT09IclFPbjFFMnJ6T3JkL2tRbHFpQ3dSSDk3OTZO
+cFRBK0hTTWZPb2JKRUVQcSYjMTM7CnRwRjdQNXFid3RsOTVVYTVPcDRBaGE3MEhIZlVGUzRCT1FL
+TEJWZk1aZE9SK2lQb2g1T3dBSytodFlrRkNHOVAyV0h1N3dmOEVDK1cmIzEzOwo3azk2Z3ZUZDh4
+RTdvdW9hYlQyeDZZZllxRWxQSGlVL0lNOWdWeldXTC9zdllEeVNWdW9Gd0JqRE5OMWNkcTBxT1lS
+MXl1UzFjLzlEJiMxMzsKRlI3ZW83R0ZFQ3krVEJkN0lpS1JmQlZlWUdPT1BNbm9GZnhSTFdycHNX
+Tm53RDdsa1BrTENnRkNrKzh5RWNPUmc2MjVtbzY1ejR5NiYjMTM7Cko0Szhmb2RhN3F3bVhOUDNS
+UzE4b242Qkh0OGxRK2JYZ09IbXhJSGswYU8wcU5EcWd2THIyRmx5TEdKR2lFTVJxRE1NUjYvYTA2
+YnQmIzEzOwprblVNSGw3Q3FNZmpJa2pQNFZOTnlHUGRKZ3dWazJrZWI5dU5GdkpDeFQrTTJmR1hR
+MU5iSk5mdHY1TWdTc3A5TjF5K3g2Z0EzRWh3JiMxMzsKeUhsbUpCNFlNdG84dFRWMWk4NHhQWHhp
+MkNBZURhR0R1d29zdDhZVUNTanE3UkNLOHRHY2FBWXJrWFFZMnlRZlgzY3dEc0V4UnFWVyYjMTM7
+CnlyanlSdCtONm1LOTlRPT08L2RzOlg1MDlDZXJ0aWZpY2F0ZT48L2RzOlg1MDlEYXRhPjwvZHM6
+S2V5SW5mbz48L2RzOlNpZ25hdHVyZT48L3NtZDpzaWduZWRNYXJrPgo=
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Holder-Chinese/Trademark-Holder-Chinese-Active.smd b/core/src/test/resources/google/registry/tmch/idn/Holder-Chinese/Trademark-Holder-Chinese-Active.smd
new file mode 100644
index 000000000..e2cb5b164
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Holder-Chinese/Trademark-Holder-Chinese-Active.smd
@@ -0,0 +1,116 @@
+Marks: 试验&用例
+smdID: 000000711669082680660-65535
+U-labels: xn----lb7ao71jn7sf0q, xn--and-xc0em33obp2aosv, xn--et-rt3cn04lhyx1ps, xn--fsqv03gtrpson
+notBefore: 2022-11-22T02:04:40.660Z
+notAfter: 2027-10-21T08:12:01.925Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il9iNjI1
+MDE1Ny1iYjA3LTQ4MmMtYmQ3OS0xMmE1MGI2Mjc2ZjciPjxzbWQ6aWQ+MDAwMDAwNzExNjY5MDgy
+NjgwNjYwLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMjowNDo0MC42NjBaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0yMVQwODoxMjowMS45MjVaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
+cmFkZW1hcms+PG1hcms6aWQ+MDAwMTQ1MTUwMzA2NDc4NDE1MDMwNjQ3ODQtMTwvbWFyazppZD48
+bWFyazptYXJrTmFtZT7or5XpqowmYW1wO+eUqOS+izwvbWFyazptYXJrTmFtZT48bWFyazpob2xk
+ZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpuYW1lPuadjuWwj+aWuTwvbWFyazpuYW1lPjxt
+YXJrOm9yZz7mtYvor5U8L21hcms6b3JnPjxtYXJrOmFkZHI+PG1hcms6c3RyZWV0Pummmea4r+S4
+nOi3rzblj7fvvIw15Y+35qW877yMOOWPt+WupCA8L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+6Z2S
+5bKb5biCPC9tYXJrOmNpdHk+PG1hcms6cGM+MTAwMDwvbWFyazpwYz48bWFyazpjYz5DTjwvbWFy
+azpjYz48L21hcms6YWRkcj48bWFyazp2b2ljZT4rODYuMTA4NDY1NzE3MzwvbWFyazp2b2ljZT48
+bWFyazpmYXg+Kzg2LjEwODQ2NTcxNzM8L21hcms6ZmF4PjxtYXJrOmVtYWlsPmluZm9AZXhhbXBs
+ZS5leGFtcGxlPC9tYXJrOmVtYWlsPjwvbWFyazpob2xkZXI+PG1hcms6anVyaXNkaWN0aW9uPlVT
+PC9tYXJrOmp1cmlzZGljdGlvbj48bWFyazpjbGFzcz4xNTwvbWFyazpjbGFzcz48bWFyazpsYWJl
+bD54bi0tLS1sYjdhbzcxam43c2YwcTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tYW5kLXhj
+MGVtMzNvYnAyYW9zdjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tZXQtcnQzY24wNGxoeXgx
+cHM8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLWZzcXYwM2d0cnBzb248L21hcms6bGFiZWw+
+PG1hcms6Z29vZHNBbmRTZXJ2aWNlcz4g5ZCJ5LuWPC9tYXJrOmdvb2RzQW5kU2VydmljZXM+PG1h
+cms6cmVnTnVtPjEyMzQ8L21hcms6cmVnTnVtPjxtYXJrOnJlZ0RhdGU+MjAxMy0wMS0wMVQwMDow
+MDowMC4wMDBaPC9tYXJrOnJlZ0RhdGU+PC9tYXJrOnRyYWRlbWFyaz48L21hcms6bWFyaz48ZHM6
+U2lnbmF0dXJlIHhtbG5zOmRzPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjIiBJ
+ZD0iX2JhNTI5YzI1LWJiYWUtNDFlNS1iODRjLTBlYzBlNzE1ZDA2MyI+PGRzOlNpZ25lZEluZm8+
+PGRzOkNhbm9uaWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8y
+MDAxLzEwL3htbC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJlTWV0aG9kIEFsZ29yaXRobT0iaHR0
+cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxkc2lnLW1vcmUjcnNhLXNoYTI1NiIvPjxkczpSZWZl
+cmVuY2UgVVJJPSIjX2I2MjUwMTU3LWJiMDctNDgyYy1iZDc5LTEyYTUwYjYyNzZmNyI+PGRzOlRy
+YW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDAv
+MDkveG1sZHNpZyNlbnZlbG9wZWQtc2lnbmF0dXJlIi8+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09
+Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jt
+cz48ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94
+bWxlbmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPkIzYUpNSzVyTkE2QUY1czBsQmN1SXFpdUF4
+THRobHZ3QzdnVlJDOGsxc2c9PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48ZHM6UmVm
+ZXJlbmNlIFVSST0iI185ZDE4YWMxZi0zMmNlLTQwMTktOTM0Ni1hZDBkODI3MGUxOWUiPjxkczpU
+cmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAx
+LzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdv
+cml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdl
+c3RWYWx1ZT5mZVRYTVpsWEpMMDNQeUQwV05teTMxZ0VZZ08vQ0hsZDRlMXdDNlh1WmFzPTwvZHM6
+RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PC9kczpTaWduZWRJbmZvPjxkczpTaWduYXR1cmVW
+YWx1ZSBJZD0iXzFiMjliNTFhLWYwNjYtNDdhMy1iNDI0LTc5MjU5NDY2ZTNlYyI+akFCVG4vWXd2
+N0pJUGxVL3pPdVJPR3BOMEN1UDduRXNHNUpvR2JmUWdCa0lHR1dWcW9uZkIxRjFjb2RRNnA3K0h3
+ajZxVEdDa2pDMyYjMTM7Ck5SRlZmT1JNdE05T3pSaithS2pGUHJTZ3NYU3ltL2dpbW5icUYyUnJt
+Yjgrb2IzSkZ4MmdIOVd0TTBDZDg4eTd3b0xTd3FWL2dFeUsmIzEzOwpzaHVNQU9OMWNUVFRJWE5n
+T1A4YXRVMlJGeVJsTTY5OUdkK0dncDFKWlA0eUpobkVRWmVPbC9BYnFBU2FhNW0vb3NTWTR3VHk4
+ckJNJiMxMzsKTVFzYjVEMFFzWHMvcWpIQ1NNZTFGZVNlcHNJRlQ0QWNmay9IUjEwYnplZ3Rra3hN
+dFZLK09oK0xCNTBLRFljZk1zNWpjbHF0aEtRaiYjMTM7CjZ2Yjc1TnVxRm1jZ2xpamdXYWNFY0Vt
+LzBCb095Nml1K2FFVWw0bGJ5WnJsZHdiSG9jR3lXQ010eFE0ZlZXNTJSL1B4SmxmS0hFZjYmIzEz
+Owpka1pSeDZ0YXladVYrajZPWDdua2liUjhzeVhwL2svaVFLc3pXTGFrb3dhbnprMDZOcXlWczkv
+SS9rOVpWQVZFUG1HVVZUTVFDeG1LJiMxMzsKanlMNUNpYTkwWHF0MWVweWRvTmpVRVp3dXV2K1lX
+bmpVWEY2a1JEZW8xOTR3R0JveUUzb05qeFF6Ny9yNVo2NmV4OEF3K0dobEhyUyYjMTM7Ckl4czlv
+ak43NWJKTDNBc29NWnVzQUJoeGx0R0tLc283NFl3VzVOR3UyM2crWkM1dlJKeEl3U0w0V3pGU2p6
+cW02dVF0cjc1WkhLSkEmIzEzOwpWY3V2ZmVzdzhuN2lUNXZFZ0lrbDF2U2RxOURRZlluUGFSVkE2
+VURNeGVxWjdiWW1mSGdvNkdydS9mMHlNYUJMK2xESWZMYWdIMkU9PC9kczpTaWduYXR1cmVWYWx1
+ZT48ZHM6S2V5SW5mbyBJZD0iXzlkMThhYzFmLTMyY2UtNDAxOS05MzQ2LWFkMGQ4MjcwZTE5ZSI+
+PGRzOlg1MDlEYXRhPjxkczpYNTA5Q2VydGlmaWNhdGU+TUlJSFh6Q0NCVWVnQXdJQkFnSVVYcUkv
+dmQxOENhZzk4b05wZHpWN0JpeS82RUF3RFFZSktvWklodmNOQVFFTkJRQXdmREVMTUFrRyYjMTM7
+CkExVUVCaE1DVlZNeFBEQTZCZ05WQkFvTU0wbHVkR1Z5Ym1WMElFTnZjbkJ2Y21GMGFXOXVJR1p2
+Y2lCQmMzTnBaMjVsWkNCT1lXMWwmIzEzOwpjeUJoYm1RZ1RuVnRZbVZ5Y3pFdk1DMEdBMVVFQXd3
+bVNVTkJUazRnVkhKaFpHVnRZWEpySUVOc1pXRnlhVzVuYUc5MWMyVWdVR2xzJiMxMzsKYjNRZ1Ew
+RXdIaGNOTWpJeE1URTJNVE15T0RVNVdoY05NamN4TVRFMU1UTXlPRFU1V2pDQjBERUxNQWtHQTFV
+RUJoTUNRa1V4RVRBUCYjMTM7CkJnTlZCQWdUQ0VKeWRYTnpaV3h6TVJJd0VBWURWUVFIRXdsV2FX
+eDJiMjl5WkdVeE16QXhCZ05WQkFvVEtrUmxiRzlwZEhSbElFTnYmIzEzOwpibk4xYkhScGJtY2dZ
+VzVrSUVGa2RtbHpiM0o1SUVOV1FrRXZVME5TVERFK01Ed0dBMVVFQXhNMVNVTkJUazRnVkUxRFND
+QkJkWFJvJiMxMzsKYjNKcGVtVmtJRlJ5WVdSbGJXRnlheUJRYVd4dmRDQldZV3hwWkdGMGIzSWdW
+bUZzYVdReEpUQWpCZ2txaGtpRzl3MEJDUUVXRm1KbCYjMTM7CmRHMWphSE50WkVCa1pXeHZhWFIw
+WlM1amIyMHdnZ0lpTUEwR0NTcUdTSWIzRFFFQkFRVUFBNElDRHdBd2dnSUtBb0lDQVFDNkZKd3om
+IzEzOwpLcVFWWDZmRzMvRUxSU0dXVjlHckthRk1LbWhXSXhlcHdSWk42TXhNcWtkNURuWWZpVCtX
+cDk4akVrcWdUeDJVTWI5cXVnY0dOVjZnJiMxMzsKMzUvQ3JRYi9GL216M0M0c2ZMTnVEcFNxSzlR
+RjgrcGFUSDZoUW1yT3BxVitVVHZkajlTTWdLR3lGaXpTODhDRFdNeDR3M2k0RkFLZSYjMTM7CjZO
+UnNKUkdUQXRLRHVNSGNBNHNqMDhHamUzbFBXY2dGdmNRTkRWZUVCVHVPSEJHK1JoajdWMUppTkdQ
+LzRlcFRYVEZYZ1BGRGdlejMmIzEzOwpZQWZ4cXBidU80VFg2YmJZZGsybnZNTEZ2TEVOa0NGWXVs
+bllQemduRUJHU01LSWFBSWxiK3NjSEN2V2dXajJUTGd3aDJHSk5jelZNJiMxMzsKMUxQTXFHUytV
+a2k5TWg3OTgyMi94b2FyNDk4eER4Mll4Lzhzd2dFTkxTZ0NzUUFXOG5NZ3dXbjZBYllsMlJBQlh1
+cmF5RnNuNFAxUiYjMTM7CnVRTm1VcC9xclJLUnZTSnIxT0xrSFpmRlRjU1lRYVZpdU1ZUFh6R3o4
+dG1NTGxtSS9CNkFDSDRBd1JNZG5ZdkZPM0tJMVJCblBLSWQmIzEzOwp3d2ZVcFo1SVRJcGJBN0NH
+Z1R4MXF4dE0xd0lVcjdwSGVLUDZqVmUza2RETGcrL0JaMnhNRXRCazVhOFk3QjR2M3h3SFhHVHZW
+OG1OJiMxMzsKMEFnL1N5VC9RVXlFUmhYVXlBTjIrRXdaK1NRQ1V5TmZ6aW9XUTg3OGVHeWtVKzQ2
+K0JiZ0kzSUlyMzZYS1B3bXp0MFNaK0tJM3RuRiYjMTM7ClRsbjltWDBLQzBpZG9qNXlrelBvQy9N
+SWVkMHNwNFRpZ3hFYldOeDdFRjgwUHZSL0RERXdWUEVFa2tqeTYzWEZ1bHhpQ1FJREFRQUImIzEz
+OwpvNElCZ2pDQ0FYNHdEQVlEVlIwVEFRSC9CQUl3QURBT0JnTlZIUThCQWY4RUJBTUNCNEF3SFFZ
+RFZSME9CQllFRkhuOXMwREVhMmt2JiMxMzsKZ0UvZUlPVHNxb1c4NU1YRk1JRzZCZ05WSFNNRWdi
+SXdnYStBRkVkN1Q2NTZVWkcxMGIrZE51bUdmellXQktsRm9ZR0FwSDR3ZkRFTCYjMTM7Ck1Ba0dB
+MVVFQmhNQ1ZWTXhQREE2QmdOVkJBb01NMGx1ZEdWeWJtVjBJRU52Y25CdmNtRjBhVzl1SUdadmNp
+QkJjM05wWjI1bFpDQk8mIzEzOwpZVzFsY3lCaGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF3d21T
+VU5CVGs0Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5YVc1bmFHOTFjMlVnJiMxMzsKVUdsc2IzUWdRMEdD
+RkhwcWJURmVKY1B0VUM5WHV1UEtQc0x3RFIrTU1EUUdBMVVkSHdRdE1Dc3dLYUFub0NXR0kyaDBk
+SEE2THk5aiYjMTM7CmNtd3VhV05oYm00dWIzSm5MM1J0WTJoZmNHbHNiM1F1WTNKc01Fd0dBMVVk
+SUFSRk1FTXdFQVlPS3dZQkJBR0N5UnNCQllNN0RBb3cmIzEzOwpMd1lJS3dZQkJRVUhBZ0V3SXpB
+aEJnZ3JCZ0VGQlFjQ0FSWVZhSFIwY0hNNkx5OWpjSE11YVdOaGJtNHViM0puTUEwR0NTcUdTSWIz
+JiMxMzsKRFFFQkRRVUFBNElDQVFCZFNhdDU2dWVqTG5BakZJRjk1ZGpZV0k2cy8vTjZZWHhzcnJN
+a0dCUDhFZXpQeWhMaDZhd1A0ejdROVFBSSYjMTM7ClFaa1lveHJsLzF5MCtieVYycW5UVVVDTFJw
+Sy9CRHAvaGNmd1BmS0NBLzJSUUNISnJiNit6MGVuRFBGUkswTkttd09jZGxHdFVrMG0mIzEzOwpQ
+Z1dHU0t0dXdWc1BBaFRESnVob3NaT2hrTmYrblNPT0hyUU9uMUUycnpPcmQva1FscWlDd1JIOTc5
+Nk5wVEErSFNNZk9vYkpFRVBxJiMxMzsKdHBGN1A1cWJ3dGw5NVVhNU9wNEFoYTcwSEhmVUZTNEJP
+UUtMQlZmTVpkT1IraVBvaDVPd0FLK2h0WWtGQ0c5UDJXSHU3d2Y4RUMrVyYjMTM7CjdrOTZndlRk
+OHhFN291b2FiVDJ4NllmWXFFbFBIaVUvSU05Z1Z6V1dML3N2WUR5U1Z1b0Z3QmpETk4xY2RxMHFP
+WVIxeXVTMWMvOUQmIzEzOwpGUjdlbzdHRkVDeStUQmQ3SWlLUmZCVmVZR09PUE1ub0ZmeFJMV3Jw
+c1dObndEN2xrUGtMQ2dGQ2srOHlFY09SZzYyNW1vNjV6NHk2JiMxMzsKSjRLOGZvZGE3cXdtWE5Q
+M1JTMThvbjZCSHQ4bFErYlhnT0hteElIazBhTzBxTkRxZ3ZMcjJGbHlMR0pHaUVNUnFETU1SNi9h
+MDZidCYjMTM7CmtuVU1IbDdDcU1maklralA0Vk5OeUdQZEpnd1ZrMmtlYjl1TkZ2SkN4VCtNMmZH
+WFExTmJKTmZ0djVNZ1NzcDlOMXkreDZnQTNFaHcmIzEzOwp5SGxtSkI0WU10bzh0VFYxaTg0eFBY
+eGkyQ0FlRGFHRHV3b3N0OFlVQ1NqcTdSQ0s4dEdjYUFZcmtYUVkyeVFmWDNjd0RzRXhScVZXJiMx
+MzsKeXJqeVJ0K042bUs5OVE9PTwvZHM6WDUwOUNlcnRpZmljYXRlPjwvZHM6WDUwOURhdGE+PC9k
+czpLZXlJbmZvPjwvZHM6U2lnbmF0dXJlPjwvc21kOnNpZ25lZE1hcms+Cg==
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Holder-Chinese/Trademark-Holder-Chinese-Revoked.smd b/core/src/test/resources/google/registry/tmch/idn/Holder-Chinese/Trademark-Holder-Chinese-Revoked.smd
new file mode 100644
index 000000000..ed1501efc
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Holder-Chinese/Trademark-Holder-Chinese-Revoked.smd
@@ -0,0 +1,116 @@
+Marks: 试验&用例
+smdID: 000000711669082638580-65535
+U-labels: xn----lb7ao71jn7sf0q, xn--and-xc0em33obp2aosv, xn--et-rt3cn04lhyx1ps, xn--fsqv03gtrpson
+notBefore: 2022-11-22T02:03:58.580Z
+notAfter: 2027-10-21T08:12:01.925Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il84OWFi
+MTdiOC0zYWUyLTRhZDgtYjYwZS04MGZiYWQ0ZmQ0MTUiPjxzbWQ6aWQ+MDAwMDAwNzExNjY5MDgy
+NjM4NTgwLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMjowMzo1OC41ODBaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0yMVQwODoxMjowMS45MjVaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
+cmFkZW1hcms+PG1hcms6aWQ+MDAwMTQ1MTUwMzA2NDc4NDE1MDMwNjQ3ODQtMTwvbWFyazppZD48
+bWFyazptYXJrTmFtZT7or5XpqowmYW1wO+eUqOS+izwvbWFyazptYXJrTmFtZT48bWFyazpob2xk
+ZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpuYW1lPuadjuWwj+aWuTwvbWFyazpuYW1lPjxt
+YXJrOm9yZz7mtYvor5U8L21hcms6b3JnPjxtYXJrOmFkZHI+PG1hcms6c3RyZWV0Pummmea4r+S4
+nOi3rzblj7fvvIw15Y+35qW877yMOOWPt+WupCA8L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+6Z2S
+5bKb5biCPC9tYXJrOmNpdHk+PG1hcms6cGM+MTAwMDwvbWFyazpwYz48bWFyazpjYz5DTjwvbWFy
+azpjYz48L21hcms6YWRkcj48bWFyazp2b2ljZT4rODYuMTA4NDY1NzE3MzwvbWFyazp2b2ljZT48
+bWFyazpmYXg+Kzg2LjEwODQ2NTcxNzM8L21hcms6ZmF4PjxtYXJrOmVtYWlsPmluZm9AZXhhbXBs
+ZS5leGFtcGxlPC9tYXJrOmVtYWlsPjwvbWFyazpob2xkZXI+PG1hcms6anVyaXNkaWN0aW9uPlVT
+PC9tYXJrOmp1cmlzZGljdGlvbj48bWFyazpjbGFzcz4xNTwvbWFyazpjbGFzcz48bWFyazpsYWJl
+bD54bi0tLS1sYjdhbzcxam43c2YwcTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tYW5kLXhj
+MGVtMzNvYnAyYW9zdjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tZXQtcnQzY24wNGxoeXgx
+cHM8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLWZzcXYwM2d0cnBzb248L21hcms6bGFiZWw+
+PG1hcms6Z29vZHNBbmRTZXJ2aWNlcz4g5ZCJ5LuWPC9tYXJrOmdvb2RzQW5kU2VydmljZXM+PG1h
+cms6cmVnTnVtPjEyMzQ8L21hcms6cmVnTnVtPjxtYXJrOnJlZ0RhdGU+MjAxMy0wMS0wMVQwMDow
+MDowMC4wMDBaPC9tYXJrOnJlZ0RhdGU+PC9tYXJrOnRyYWRlbWFyaz48L21hcms6bWFyaz48ZHM6
+U2lnbmF0dXJlIHhtbG5zOmRzPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjIiBJ
+ZD0iX2EyZDMwOTM0LTJlMGQtNDllMC1hNDVkLThjMTNlNzM4NDQyMyI+PGRzOlNpZ25lZEluZm8+
+PGRzOkNhbm9uaWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8y
+MDAxLzEwL3htbC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJlTWV0aG9kIEFsZ29yaXRobT0iaHR0
+cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxkc2lnLW1vcmUjcnNhLXNoYTI1NiIvPjxkczpSZWZl
+cmVuY2UgVVJJPSIjXzg5YWIxN2I4LTNhZTItNGFkOC1iNjBlLTgwZmJhZDRmZDQxNSI+PGRzOlRy
+YW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDAv
+MDkveG1sZHNpZyNlbnZlbG9wZWQtc2lnbmF0dXJlIi8+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09
+Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jt
+cz48ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94
+bWxlbmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPjVXbklPaTNabXdlOUFVM0hMM29zcnh4Tmh4
+eFRueElidkpYMEs4cVFQS0k9PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48ZHM6UmVm
+ZXJlbmNlIFVSST0iI180MDRjZDRlNi00YTQ5LTRiMDctOTYxZS03ZmEyYTczNmJjZWEiPjxkczpU
+cmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAx
+LzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdv
+cml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdl
+c3RWYWx1ZT5SNm5PMDZaWnhzN0hpNFByd24rYlpwU0JOU0d3dVVVeEdON3JTRmRoVXY4PTwvZHM6
+RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PC9kczpTaWduZWRJbmZvPjxkczpTaWduYXR1cmVW
+YWx1ZSBJZD0iXzE3MDdkMjZhLTM2NjEtNDBjZC1hY2IzLTYyNTM1NmQwZDRjYyI+WElteVQ0dU84
+bzIxM28xQWh6OWhUeUZkSU1sVXg2TnNpRnFyWElUdkxDSVVNWmpyamdzS0dTaXc3OEhhSFZhdXhF
+YVRDTVV4SGhBeSYjMTM7CkdYcUJMK0NOOEZraGJwdkprZzZCcmRqa1ZZQ3Z2YUhrU3A0T0FEWWZp
+N0o2R1AwOU44WUhLY01CdVJnRVlwZ1ZOcUlPanFhenR4MFUmIzEzOwpMZkNvb1AvSmRhcmkreHdR
+dmtURU9uY3FmOEUwYVVoSVFqdFhHNlAxVHJJR2w5RFZhcC9vQVhwbFFLVUpUZUtYNkVHVlY1OW5w
+TCt3JiMxMzsKK096RDdiTmFoOUkvT2JzeVNlZ293Y2ttUXl1SXBZdnJnL3MzQnhSQmNhdStBbStq
+QmY4eC8vSnYvZmZrK2p3dXNyTEd4TFRVOWZFaSYjMTM7CnowN1JvOEJQNUZtd3Rqa0tZdFdidk1o
+Zm1oT0lUaHpxaWh1ZnIyanJqdjdjdTJNRkN2THJramU1VUpZbXJIK0IwUUpocmc2bDk0QkQmIzEz
+OwpLaWx5K1hST0liTDlibHFGNXNhd2V5Q09IaW13YjVDUVpnQytocWNSencvanhwbFhTYTBPdU5H
+eE1oTXBYczhWMUpMNGNJYTEzZkk0JiMxMzsKbzZ5eE51OFZ2dXdXZHdtYlIwSVlGa1BYb0JLQnl2
+eTZVVGIwQitzR29lOVNGT3duQStJemdIVmlFNGp3UHRqdXB1RTR3bm0vSnNwLyYjMTM7CmVIQ2My
+WnJiV09vSUYzVjFvejR4bk45MU10aEFHYmlxVTdMZFBTWVJyZjJOdDlMbDUzWC9lWUx1VEtKTjFL
+dmNrdEJCRVkrMm11NHUmIzEzOwpjUmhEbm52UTBkdDcxSmdiZmJvMFh0TlMvRUN4ZjMvMDlHNjFD
+dHhtUU8xUXR6T3JzNkFqRlpNR05XaTJlcnRJa2dDZGIzUjlNKzg9PC9kczpTaWduYXR1cmVWYWx1
+ZT48ZHM6S2V5SW5mbyBJZD0iXzQwNGNkNGU2LTRhNDktNGIwNy05NjFlLTdmYTJhNzM2YmNlYSI+
+PGRzOlg1MDlEYXRhPjxkczpYNTA5Q2VydGlmaWNhdGU+TUlJSFh6Q0NCVWVnQXdJQkFnSVVYcUkv
+dmQxOENhZzk4b05wZHpWN0JpeS82RUF3RFFZSktvWklodmNOQVFFTkJRQXdmREVMTUFrRyYjMTM7
+CkExVUVCaE1DVlZNeFBEQTZCZ05WQkFvTU0wbHVkR1Z5Ym1WMElFTnZjbkJ2Y21GMGFXOXVJR1p2
+Y2lCQmMzTnBaMjVsWkNCT1lXMWwmIzEzOwpjeUJoYm1RZ1RuVnRZbVZ5Y3pFdk1DMEdBMVVFQXd3
+bVNVTkJUazRnVkhKaFpHVnRZWEpySUVOc1pXRnlhVzVuYUc5MWMyVWdVR2xzJiMxMzsKYjNRZ1Ew
+RXdIaGNOTWpJeE1URTJNVE15T0RVNVdoY05NamN4TVRFMU1UTXlPRFU1V2pDQjBERUxNQWtHQTFV
+RUJoTUNRa1V4RVRBUCYjMTM7CkJnTlZCQWdUQ0VKeWRYTnpaV3h6TVJJd0VBWURWUVFIRXdsV2FX
+eDJiMjl5WkdVeE16QXhCZ05WQkFvVEtrUmxiRzlwZEhSbElFTnYmIzEzOwpibk4xYkhScGJtY2dZ
+VzVrSUVGa2RtbHpiM0o1SUVOV1FrRXZVME5TVERFK01Ed0dBMVVFQXhNMVNVTkJUazRnVkUxRFND
+QkJkWFJvJiMxMzsKYjNKcGVtVmtJRlJ5WVdSbGJXRnlheUJRYVd4dmRDQldZV3hwWkdGMGIzSWdW
+bUZzYVdReEpUQWpCZ2txaGtpRzl3MEJDUUVXRm1KbCYjMTM7CmRHMWphSE50WkVCa1pXeHZhWFIw
+WlM1amIyMHdnZ0lpTUEwR0NTcUdTSWIzRFFFQkFRVUFBNElDRHdBd2dnSUtBb0lDQVFDNkZKd3om
+IzEzOwpLcVFWWDZmRzMvRUxSU0dXVjlHckthRk1LbWhXSXhlcHdSWk42TXhNcWtkNURuWWZpVCtX
+cDk4akVrcWdUeDJVTWI5cXVnY0dOVjZnJiMxMzsKMzUvQ3JRYi9GL216M0M0c2ZMTnVEcFNxSzlR
+RjgrcGFUSDZoUW1yT3BxVitVVHZkajlTTWdLR3lGaXpTODhDRFdNeDR3M2k0RkFLZSYjMTM7CjZO
+UnNKUkdUQXRLRHVNSGNBNHNqMDhHamUzbFBXY2dGdmNRTkRWZUVCVHVPSEJHK1JoajdWMUppTkdQ
+LzRlcFRYVEZYZ1BGRGdlejMmIzEzOwpZQWZ4cXBidU80VFg2YmJZZGsybnZNTEZ2TEVOa0NGWXVs
+bllQemduRUJHU01LSWFBSWxiK3NjSEN2V2dXajJUTGd3aDJHSk5jelZNJiMxMzsKMUxQTXFHUytV
+a2k5TWg3OTgyMi94b2FyNDk4eER4Mll4Lzhzd2dFTkxTZ0NzUUFXOG5NZ3dXbjZBYllsMlJBQlh1
+cmF5RnNuNFAxUiYjMTM7CnVRTm1VcC9xclJLUnZTSnIxT0xrSFpmRlRjU1lRYVZpdU1ZUFh6R3o4
+dG1NTGxtSS9CNkFDSDRBd1JNZG5ZdkZPM0tJMVJCblBLSWQmIzEzOwp3d2ZVcFo1SVRJcGJBN0NH
+Z1R4MXF4dE0xd0lVcjdwSGVLUDZqVmUza2RETGcrL0JaMnhNRXRCazVhOFk3QjR2M3h3SFhHVHZW
+OG1OJiMxMzsKMEFnL1N5VC9RVXlFUmhYVXlBTjIrRXdaK1NRQ1V5TmZ6aW9XUTg3OGVHeWtVKzQ2
+K0JiZ0kzSUlyMzZYS1B3bXp0MFNaK0tJM3RuRiYjMTM7ClRsbjltWDBLQzBpZG9qNXlrelBvQy9N
+SWVkMHNwNFRpZ3hFYldOeDdFRjgwUHZSL0RERXdWUEVFa2tqeTYzWEZ1bHhpQ1FJREFRQUImIzEz
+OwpvNElCZ2pDQ0FYNHdEQVlEVlIwVEFRSC9CQUl3QURBT0JnTlZIUThCQWY4RUJBTUNCNEF3SFFZ
+RFZSME9CQllFRkhuOXMwREVhMmt2JiMxMzsKZ0UvZUlPVHNxb1c4NU1YRk1JRzZCZ05WSFNNRWdi
+SXdnYStBRkVkN1Q2NTZVWkcxMGIrZE51bUdmellXQktsRm9ZR0FwSDR3ZkRFTCYjMTM7Ck1Ba0dB
+MVVFQmhNQ1ZWTXhQREE2QmdOVkJBb01NMGx1ZEdWeWJtVjBJRU52Y25CdmNtRjBhVzl1SUdadmNp
+QkJjM05wWjI1bFpDQk8mIzEzOwpZVzFsY3lCaGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF3d21T
+VU5CVGs0Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5YVc1bmFHOTFjMlVnJiMxMzsKVUdsc2IzUWdRMEdD
+RkhwcWJURmVKY1B0VUM5WHV1UEtQc0x3RFIrTU1EUUdBMVVkSHdRdE1Dc3dLYUFub0NXR0kyaDBk
+SEE2THk5aiYjMTM7CmNtd3VhV05oYm00dWIzSm5MM1J0WTJoZmNHbHNiM1F1WTNKc01Fd0dBMVVk
+SUFSRk1FTXdFQVlPS3dZQkJBR0N5UnNCQllNN0RBb3cmIzEzOwpMd1lJS3dZQkJRVUhBZ0V3SXpB
+aEJnZ3JCZ0VGQlFjQ0FSWVZhSFIwY0hNNkx5OWpjSE11YVdOaGJtNHViM0puTUEwR0NTcUdTSWIz
+JiMxMzsKRFFFQkRRVUFBNElDQVFCZFNhdDU2dWVqTG5BakZJRjk1ZGpZV0k2cy8vTjZZWHhzcnJN
+a0dCUDhFZXpQeWhMaDZhd1A0ejdROVFBSSYjMTM7ClFaa1lveHJsLzF5MCtieVYycW5UVVVDTFJw
+Sy9CRHAvaGNmd1BmS0NBLzJSUUNISnJiNit6MGVuRFBGUkswTkttd09jZGxHdFVrMG0mIzEzOwpQ
+Z1dHU0t0dXdWc1BBaFRESnVob3NaT2hrTmYrblNPT0hyUU9uMUUycnpPcmQva1FscWlDd1JIOTc5
+Nk5wVEErSFNNZk9vYkpFRVBxJiMxMzsKdHBGN1A1cWJ3dGw5NVVhNU9wNEFoYTcwSEhmVUZTNEJP
+UUtMQlZmTVpkT1IraVBvaDVPd0FLK2h0WWtGQ0c5UDJXSHU3d2Y4RUMrVyYjMTM7CjdrOTZndlRk
+OHhFN291b2FiVDJ4NllmWXFFbFBIaVUvSU05Z1Z6V1dML3N2WUR5U1Z1b0Z3QmpETk4xY2RxMHFP
+WVIxeXVTMWMvOUQmIzEzOwpGUjdlbzdHRkVDeStUQmQ3SWlLUmZCVmVZR09PUE1ub0ZmeFJMV3Jw
+c1dObndEN2xrUGtMQ2dGQ2srOHlFY09SZzYyNW1vNjV6NHk2JiMxMzsKSjRLOGZvZGE3cXdtWE5Q
+M1JTMThvbjZCSHQ4bFErYlhnT0hteElIazBhTzBxTkRxZ3ZMcjJGbHlMR0pHaUVNUnFETU1SNi9h
+MDZidCYjMTM7CmtuVU1IbDdDcU1maklralA0Vk5OeUdQZEpnd1ZrMmtlYjl1TkZ2SkN4VCtNMmZH
+WFExTmJKTmZ0djVNZ1NzcDlOMXkreDZnQTNFaHcmIzEzOwp5SGxtSkI0WU10bzh0VFYxaTg0eFBY
+eGkyQ0FlRGFHRHV3b3N0OFlVQ1NqcTdSQ0s4dEdjYUFZcmtYUVkyeVFmWDNjd0RzRXhScVZXJiMx
+MzsKeXJqeVJ0K042bUs5OVE9PTwvZHM6WDUwOUNlcnRpZmljYXRlPjwvZHM6WDUwOURhdGE+PC9k
+czpLZXlJbmZvPjwvZHM6U2lnbmF0dXJlPjwvc21kOnNpZ25lZE1hcms+Cg==
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Holder-Chinese/TreatyStatute-Holder-Chinese-Active.smd b/core/src/test/resources/google/registry/tmch/idn/Holder-Chinese/TreatyStatute-Holder-Chinese-Active.smd
new file mode 100644
index 000000000..65131c7bf
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Holder-Chinese/TreatyStatute-Holder-Chinese-Active.smd
@@ -0,0 +1,118 @@
+Marks: 错误&证明
+smdID: 000000721669082683993-65535
+U-labels: xn----wp6bo72ihfa346b, xn--and-k58f177n1hah08c, xn--2hv125f6d788a
+notBefore: 2022-11-22T02:04:43.993Z
+notAfter: 2027-10-21T08:12:01.925Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il9jNTlj
+ZmIxYi1iZjIyLTQwNmEtYjJlYi0wMGU4YTQzYTNiNDkiPjxzbWQ6aWQ+MDAwMDAwNzIxNjY5MDgy
+NjgzOTkzLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMjowNDo0My45OTNaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0yMVQwODoxMjowMS45MjVaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
+cmVhdHlPclN0YXR1dGU+PG1hcms6aWQ+MDAwMTQ1MTUwMzA2NDk2NTE1MDMwNjQ5NjUtMTwvbWFy
+azppZD48bWFyazptYXJrTmFtZT7plJnor68mYW1wO+ivgeaYjjwvbWFyazptYXJrTmFtZT48bWFy
+azpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpuYW1lPuadjuWwj+aWuTwvbWFyazpu
+YW1lPjxtYXJrOm9yZz7mtYvor5U8L21hcms6b3JnPjxtYXJrOmFkZHI+PG1hcms6c3RyZWV0Pumm
+mea4r+S4nOi3rzblj7fvvIw15Y+35qW877yMOOWPt+WupCA8L21hcms6c3RyZWV0PjxtYXJrOmNp
+dHk+6Z2S5bKb5biCPC9tYXJrOmNpdHk+PG1hcms6cGM+MTAwMDwvbWFyazpwYz48bWFyazpjYz5D
+TjwvbWFyazpjYz48L21hcms6YWRkcj48bWFyazp2b2ljZT4rODYuMTA4NDY1NzE3MzwvbWFyazp2
+b2ljZT48bWFyazpmYXg+Kzg2LjEwODQ2NTcxNzM8L21hcms6ZmF4PjxtYXJrOmVtYWlsPmluZm9A
+ZXhhbXBsZS5leGFtcGxlPC9tYXJrOmVtYWlsPjwvbWFyazpob2xkZXI+PG1hcms6cHJvdGVjdGlv
+bj48bWFyazpjYz5VUzwvbWFyazpjYz48bWFyazpydWxpbmc+Q048L21hcms6cnVsaW5nPjwvbWFy
+azpwcm90ZWN0aW9uPjxtYXJrOmxhYmVsPnhuLS0tLXdwNmJvNzJpaGZhMzQ2YjwvbWFyazpsYWJl
+bD48bWFyazpsYWJlbD54bi0tYW5kLWs1OGYxNzduMWhhaDA4YzwvbWFyazpsYWJlbD48bWFyazps
+YWJlbD54bi0tMmh2MTI1ZjZkNzg4YTwvbWFyazpsYWJlbD48bWFyazpnb29kc0FuZFNlcnZpY2Vz
+PiDlkInku5Y8L21hcms6Z29vZHNBbmRTZXJ2aWNlcz48bWFyazpyZWZOdW0+MTIzNDwvbWFyazpy
+ZWZOdW0+PG1hcms6cHJvRGF0ZT4yMDAwLTAxLTAxVDAwOjAwOjAwLjAwMFo8L21hcms6cHJvRGF0
+ZT48bWFyazp0aXRsZT5UZXN0IFRyZWF0eTwvbWFyazp0aXRsZT48bWFyazpleGVjRGF0ZT4yMDEz
+LTAyLTAyVDAwOjAwOjAwLjAwMFo8L21hcms6ZXhlY0RhdGU+PC9tYXJrOnRyZWF0eU9yU3RhdHV0
+ZT48L21hcms6bWFyaz48ZHM6U2lnbmF0dXJlIHhtbG5zOmRzPSJodHRwOi8vd3d3LnczLm9yZy8y
+MDAwLzA5L3htbGRzaWcjIiBJZD0iXzI0MDY4NDJmLTQwMzItNDM4Ni04ZjJlLWM3NjZmMmNjMzVi
+MSI+PGRzOlNpZ25lZEluZm8+PGRzOkNhbm9uaWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGhtPSJo
+dHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJlTWV0
+aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxkc2lnLW1vcmUjcnNh
+LXNoYTI1NiIvPjxkczpSZWZlcmVuY2UgVVJJPSIjX2M1OWNmYjFiLWJmMjItNDA2YS1iMmViLTAw
+ZThhNDNhM2I0OSI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6
+Ly93d3cudzMub3JnLzIwMDAvMDkveG1sZHNpZyNlbnZlbG9wZWQtc2lnbmF0dXJlIi8+PGRzOlRy
+YW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRu
+IyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3
+dy53My5vcmcvMjAwMS8wNC94bWxlbmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPmRtWG1oNGJw
+alFndW14U2pweGp4Yjc2TG5xQmVjcWJCQmxpV1F6clRNYUk9PC9kczpEaWdlc3RWYWx1ZT48L2Rz
+OlJlZmVyZW5jZT48ZHM6UmVmZXJlbmNlIFVSST0iI184YmVlYTE5Ny01MmQ3LTRhMjItYmVjMy1l
+MDNlNjc1YWZiOGUiPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRw
+Oi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRz
+OkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5j
+I3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1ZT44Sjl0WUlmeXBTU3VFT2EzMnhGYXUrWGdjTWxKOUNL
+SkZMUlBjMkQ3UEY4PTwvZHM6RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PC9kczpTaWduZWRJ
+bmZvPjxkczpTaWduYXR1cmVWYWx1ZSBJZD0iX2YyZjY3ZjA2LTFkMWQtNGNiOC1hMTkwLTc1MzU4
+Yzk1N2FiOCI+YkE2VkUyZTZQWGRVUEFwODIyQlZsbVh1MTJldThKWnptS2orcGRUOGhEWFByZ3ZZ
+aUlyTlorNGNORjlQV1MrL3ZmMy9zWEVTb1VDeSYjMTM7CkZxNGd0SzlMam9JMElndE5XSi9BREJO
+RTlmQTZCTDh3UERZa0syR1BtalQrRUsycGpVWk14MzRFdno0S3NMKzdqbytUU0pMWEVKNDgmIzEz
+OwpvWG14Y0lETml4azl2VjU0bUpkNlRFbkQzMUNZRVA3UGRmZnBMQnlYZjhFdjl2OTRwZUtmTEQ3
+VWVUZ3ljSW9YQmdBNDZkVmxkQU5iJiMxMzsKQitZUU5ITGlyUEtrcTg5eG9UM0lSS3QxaXVPL3FX
+clRUYVhMaDE1Y1lHWmthN0Z5VHNySzQybnlTcEpJbWxZWDdZbmtNaFdqSkx0RSYjMTM7Ck4rY1RY
+azAyMlZMemZqYmxKWUhPM2QrRDdVMUJ1ZVpERDlzSGw2Mi9xcEhQckJZMHliRVY5aEhKVmtKMmpl
+RGVWN0p1eElSSkFmNjYmIzEzOwpTZFNibjg1V2FydkxCZkJ4OGNwaE1PeXRsWDhaTnVwUEVjQlhs
+UXJzR2U3RHoyZG9pZStCMElBOXNXcCtKMEJZcUpiUXc1REFIZ0tjJiMxMzsKdGtvaXE4TEJhZ1VN
+UjE4OFNoV2RmVS91ZHpNOG41Q3JiaWgxQmFXbjlNbEVlMCtBRWtxVHZocGdJUFQyN2IxSVA2bmZk
+akZ5SWdvOSYjMTM7Cmpaa0JTSHNOcCsyWEQvdnRZcG5TakY0L24yamR3QWU3Nm5ROGhYNmR5cmNz
+dkFSeW0vbEhYUjdYS3VOclcwenpVWHJWVUdLVlVyblQmIzEzOwozT1VPR01MYWt5VnRSZGM3cE44
+c2xjQm1mRmFBb1l1L1F0Yml5N1Yzb1p5d2d0R3d4L0dEdlcrSzJqN1BoTUhlNTY4N3pYUmlTaG89
+PC9kczpTaWduYXR1cmVWYWx1ZT48ZHM6S2V5SW5mbyBJZD0iXzhiZWVhMTk3LTUyZDctNGEyMi1i
+ZWMzLWUwM2U2NzVhZmI4ZSI+PGRzOlg1MDlEYXRhPjxkczpYNTA5Q2VydGlmaWNhdGU+TUlJSFh6
+Q0NCVWVnQXdJQkFnSVVYcUkvdmQxOENhZzk4b05wZHpWN0JpeS82RUF3RFFZSktvWklodmNOQVFF
+TkJRQXdmREVMTUFrRyYjMTM7CkExVUVCaE1DVlZNeFBEQTZCZ05WQkFvTU0wbHVkR1Z5Ym1WMElF
+TnZjbkJ2Y21GMGFXOXVJR1p2Y2lCQmMzTnBaMjVsWkNCT1lXMWwmIzEzOwpjeUJoYm1RZ1RuVnRZ
+bVZ5Y3pFdk1DMEdBMVVFQXd3bVNVTkJUazRnVkhKaFpHVnRZWEpySUVOc1pXRnlhVzVuYUc5MWMy
+VWdVR2xzJiMxMzsKYjNRZ1EwRXdIaGNOTWpJeE1URTJNVE15T0RVNVdoY05NamN4TVRFMU1UTXlP
+RFU1V2pDQjBERUxNQWtHQTFVRUJoTUNRa1V4RVRBUCYjMTM7CkJnTlZCQWdUQ0VKeWRYTnpaV3h6
+TVJJd0VBWURWUVFIRXdsV2FXeDJiMjl5WkdVeE16QXhCZ05WQkFvVEtrUmxiRzlwZEhSbElFTnYm
+IzEzOwpibk4xYkhScGJtY2dZVzVrSUVGa2RtbHpiM0o1SUVOV1FrRXZVME5TVERFK01Ed0dBMVVF
+QXhNMVNVTkJUazRnVkUxRFNDQkJkWFJvJiMxMzsKYjNKcGVtVmtJRlJ5WVdSbGJXRnlheUJRYVd4
+dmRDQldZV3hwWkdGMGIzSWdWbUZzYVdReEpUQWpCZ2txaGtpRzl3MEJDUUVXRm1KbCYjMTM7CmRH
+MWphSE50WkVCa1pXeHZhWFIwWlM1amIyMHdnZ0lpTUEwR0NTcUdTSWIzRFFFQkFRVUFBNElDRHdB
+d2dnSUtBb0lDQVFDNkZKd3omIzEzOwpLcVFWWDZmRzMvRUxSU0dXVjlHckthRk1LbWhXSXhlcHdS
+Wk42TXhNcWtkNURuWWZpVCtXcDk4akVrcWdUeDJVTWI5cXVnY0dOVjZnJiMxMzsKMzUvQ3JRYi9G
+L216M0M0c2ZMTnVEcFNxSzlRRjgrcGFUSDZoUW1yT3BxVitVVHZkajlTTWdLR3lGaXpTODhDRFdN
+eDR3M2k0RkFLZSYjMTM7CjZOUnNKUkdUQXRLRHVNSGNBNHNqMDhHamUzbFBXY2dGdmNRTkRWZUVC
+VHVPSEJHK1JoajdWMUppTkdQLzRlcFRYVEZYZ1BGRGdlejMmIzEzOwpZQWZ4cXBidU80VFg2YmJZ
+ZGsybnZNTEZ2TEVOa0NGWXVsbllQemduRUJHU01LSWFBSWxiK3NjSEN2V2dXajJUTGd3aDJHSk5j
+elZNJiMxMzsKMUxQTXFHUytVa2k5TWg3OTgyMi94b2FyNDk4eER4Mll4Lzhzd2dFTkxTZ0NzUUFX
+OG5NZ3dXbjZBYllsMlJBQlh1cmF5RnNuNFAxUiYjMTM7CnVRTm1VcC9xclJLUnZTSnIxT0xrSFpm
+RlRjU1lRYVZpdU1ZUFh6R3o4dG1NTGxtSS9CNkFDSDRBd1JNZG5ZdkZPM0tJMVJCblBLSWQmIzEz
+Owp3d2ZVcFo1SVRJcGJBN0NHZ1R4MXF4dE0xd0lVcjdwSGVLUDZqVmUza2RETGcrL0JaMnhNRXRC
+azVhOFk3QjR2M3h3SFhHVHZWOG1OJiMxMzsKMEFnL1N5VC9RVXlFUmhYVXlBTjIrRXdaK1NRQ1V5
+TmZ6aW9XUTg3OGVHeWtVKzQ2K0JiZ0kzSUlyMzZYS1B3bXp0MFNaK0tJM3RuRiYjMTM7ClRsbjlt
+WDBLQzBpZG9qNXlrelBvQy9NSWVkMHNwNFRpZ3hFYldOeDdFRjgwUHZSL0RERXdWUEVFa2tqeTYz
+WEZ1bHhpQ1FJREFRQUImIzEzOwpvNElCZ2pDQ0FYNHdEQVlEVlIwVEFRSC9CQUl3QURBT0JnTlZI
+UThCQWY4RUJBTUNCNEF3SFFZRFZSME9CQllFRkhuOXMwREVhMmt2JiMxMzsKZ0UvZUlPVHNxb1c4
+NU1YRk1JRzZCZ05WSFNNRWdiSXdnYStBRkVkN1Q2NTZVWkcxMGIrZE51bUdmellXQktsRm9ZR0Fw
+SDR3ZkRFTCYjMTM7Ck1Ba0dBMVVFQmhNQ1ZWTXhQREE2QmdOVkJBb01NMGx1ZEdWeWJtVjBJRU52
+Y25CdmNtRjBhVzl1SUdadmNpQkJjM05wWjI1bFpDQk8mIzEzOwpZVzFsY3lCaGJtUWdUblZ0WW1W
+eWN6RXZNQzBHQTFVRUF3d21TVU5CVGs0Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5YVc1bmFHOTFjMlVn
+JiMxMzsKVUdsc2IzUWdRMEdDRkhwcWJURmVKY1B0VUM5WHV1UEtQc0x3RFIrTU1EUUdBMVVkSHdR
+dE1Dc3dLYUFub0NXR0kyaDBkSEE2THk5aiYjMTM7CmNtd3VhV05oYm00dWIzSm5MM1J0WTJoZmNH
+bHNiM1F1WTNKc01Fd0dBMVVkSUFSRk1FTXdFQVlPS3dZQkJBR0N5UnNCQllNN0RBb3cmIzEzOwpM
+d1lJS3dZQkJRVUhBZ0V3SXpBaEJnZ3JCZ0VGQlFjQ0FSWVZhSFIwY0hNNkx5OWpjSE11YVdOaGJt
+NHViM0puTUEwR0NTcUdTSWIzJiMxMzsKRFFFQkRRVUFBNElDQVFCZFNhdDU2dWVqTG5BakZJRjk1
+ZGpZV0k2cy8vTjZZWHhzcnJNa0dCUDhFZXpQeWhMaDZhd1A0ejdROVFBSSYjMTM7ClFaa1lveHJs
+LzF5MCtieVYycW5UVVVDTFJwSy9CRHAvaGNmd1BmS0NBLzJSUUNISnJiNit6MGVuRFBGUkswTktt
+d09jZGxHdFVrMG0mIzEzOwpQZ1dHU0t0dXdWc1BBaFRESnVob3NaT2hrTmYrblNPT0hyUU9uMUUy
+cnpPcmQva1FscWlDd1JIOTc5Nk5wVEErSFNNZk9vYkpFRVBxJiMxMzsKdHBGN1A1cWJ3dGw5NVVh
+NU9wNEFoYTcwSEhmVUZTNEJPUUtMQlZmTVpkT1IraVBvaDVPd0FLK2h0WWtGQ0c5UDJXSHU3d2Y4
+RUMrVyYjMTM7CjdrOTZndlRkOHhFN291b2FiVDJ4NllmWXFFbFBIaVUvSU05Z1Z6V1dML3N2WUR5
+U1Z1b0Z3QmpETk4xY2RxMHFPWVIxeXVTMWMvOUQmIzEzOwpGUjdlbzdHRkVDeStUQmQ3SWlLUmZC
+VmVZR09PUE1ub0ZmeFJMV3Jwc1dObndEN2xrUGtMQ2dGQ2srOHlFY09SZzYyNW1vNjV6NHk2JiMx
+MzsKSjRLOGZvZGE3cXdtWE5QM1JTMThvbjZCSHQ4bFErYlhnT0hteElIazBhTzBxTkRxZ3ZMcjJG
+bHlMR0pHaUVNUnFETU1SNi9hMDZidCYjMTM7CmtuVU1IbDdDcU1maklralA0Vk5OeUdQZEpnd1Zr
+MmtlYjl1TkZ2SkN4VCtNMmZHWFExTmJKTmZ0djVNZ1NzcDlOMXkreDZnQTNFaHcmIzEzOwp5SGxt
+SkI0WU10bzh0VFYxaTg0eFBYeGkyQ0FlRGFHRHV3b3N0OFlVQ1NqcTdSQ0s4dEdjYUFZcmtYUVky
+eVFmWDNjd0RzRXhScVZXJiMxMzsKeXJqeVJ0K042bUs5OVE9PTwvZHM6WDUwOUNlcnRpZmljYXRl
+PjwvZHM6WDUwOURhdGE+PC9kczpLZXlJbmZvPjwvZHM6U2lnbmF0dXJlPjwvc21kOnNpZ25lZE1h
+cms+Cg==
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Holder-Chinese/TreatyStatute-Holder-Chinese-Revoked.smd b/core/src/test/resources/google/registry/tmch/idn/Holder-Chinese/TreatyStatute-Holder-Chinese-Revoked.smd
new file mode 100644
index 000000000..b63e3b490
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Holder-Chinese/TreatyStatute-Holder-Chinese-Revoked.smd
@@ -0,0 +1,118 @@
+Marks: 错误&证明
+smdID: 000000721669082641964-65535
+U-labels: xn----wp6bo72ihfa346b, xn--and-k58f177n1hah08c, xn--2hv125f6d788a
+notBefore: 2022-11-22T02:04:01.964Z
+notAfter: 2027-10-21T08:12:01.925Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il9lY2Yw
+MmUxZi1kY2JmLTRjYjYtYmY0NC02Nzc5MDFiM2M1NDAiPjxzbWQ6aWQ+MDAwMDAwNzIxNjY5MDgy
+NjQxOTY0LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMjowNDowMS45NjRaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0yMVQwODoxMjowMS45MjVaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
+cmVhdHlPclN0YXR1dGU+PG1hcms6aWQ+MDAwMTQ1MTUwMzA2NDk2NTE1MDMwNjQ5NjUtMTwvbWFy
+azppZD48bWFyazptYXJrTmFtZT7plJnor68mYW1wO+ivgeaYjjwvbWFyazptYXJrTmFtZT48bWFy
+azpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpuYW1lPuadjuWwj+aWuTwvbWFyazpu
+YW1lPjxtYXJrOm9yZz7mtYvor5U8L21hcms6b3JnPjxtYXJrOmFkZHI+PG1hcms6c3RyZWV0Pumm
+mea4r+S4nOi3rzblj7fvvIw15Y+35qW877yMOOWPt+WupCA8L21hcms6c3RyZWV0PjxtYXJrOmNp
+dHk+6Z2S5bKb5biCPC9tYXJrOmNpdHk+PG1hcms6cGM+MTAwMDwvbWFyazpwYz48bWFyazpjYz5D
+TjwvbWFyazpjYz48L21hcms6YWRkcj48bWFyazp2b2ljZT4rODYuMTA4NDY1NzE3MzwvbWFyazp2
+b2ljZT48bWFyazpmYXg+Kzg2LjEwODQ2NTcxNzM8L21hcms6ZmF4PjxtYXJrOmVtYWlsPmluZm9A
+ZXhhbXBsZS5leGFtcGxlPC9tYXJrOmVtYWlsPjwvbWFyazpob2xkZXI+PG1hcms6cHJvdGVjdGlv
+bj48bWFyazpjYz5VUzwvbWFyazpjYz48bWFyazpydWxpbmc+Q048L21hcms6cnVsaW5nPjwvbWFy
+azpwcm90ZWN0aW9uPjxtYXJrOmxhYmVsPnhuLS0tLXdwNmJvNzJpaGZhMzQ2YjwvbWFyazpsYWJl
+bD48bWFyazpsYWJlbD54bi0tYW5kLWs1OGYxNzduMWhhaDA4YzwvbWFyazpsYWJlbD48bWFyazps
+YWJlbD54bi0tMmh2MTI1ZjZkNzg4YTwvbWFyazpsYWJlbD48bWFyazpnb29kc0FuZFNlcnZpY2Vz
+PiDlkInku5Y8L21hcms6Z29vZHNBbmRTZXJ2aWNlcz48bWFyazpyZWZOdW0+MTIzNDwvbWFyazpy
+ZWZOdW0+PG1hcms6cHJvRGF0ZT4yMDAwLTAxLTAxVDAwOjAwOjAwLjAwMFo8L21hcms6cHJvRGF0
+ZT48bWFyazp0aXRsZT5UZXN0IFRyZWF0eTwvbWFyazp0aXRsZT48bWFyazpleGVjRGF0ZT4yMDEz
+LTAyLTAyVDAwOjAwOjAwLjAwMFo8L21hcms6ZXhlY0RhdGU+PC9tYXJrOnRyZWF0eU9yU3RhdHV0
+ZT48L21hcms6bWFyaz48ZHM6U2lnbmF0dXJlIHhtbG5zOmRzPSJodHRwOi8vd3d3LnczLm9yZy8y
+MDAwLzA5L3htbGRzaWcjIiBJZD0iXzllODk2ZTkwLTcyMWYtNGE5NC05MmY0LWU1OGY1M2QxODI3
+YSI+PGRzOlNpZ25lZEluZm8+PGRzOkNhbm9uaWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGhtPSJo
+dHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJlTWV0
+aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxkc2lnLW1vcmUjcnNh
+LXNoYTI1NiIvPjxkczpSZWZlcmVuY2UgVVJJPSIjX2VjZjAyZTFmLWRjYmYtNGNiNi1iZjQ0LTY3
+NzkwMWIzYzU0MCI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6
+Ly93d3cudzMub3JnLzIwMDAvMDkveG1sZHNpZyNlbnZlbG9wZWQtc2lnbmF0dXJlIi8+PGRzOlRy
+YW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRu
+IyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3
+dy53My5vcmcvMjAwMS8wNC94bWxlbmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPnY2TmJObFph
+YmtObTFGNTh6aGdPOWwrN0wzeUNYVStPWWhTL05JOHhVQUk9PC9kczpEaWdlc3RWYWx1ZT48L2Rz
+OlJlZmVyZW5jZT48ZHM6UmVmZXJlbmNlIFVSST0iI19kNWY5OGJiMC1lNjFmLTQwZDMtYWE2YS01
+OWNlODI2MDRiZTAiPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRw
+Oi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRz
+OkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5j
+I3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1ZT5LRWozY3k3WTRmZks4UGhxdEQvdy9USTBKUndCNHVQ
+Mkk2K2pRakkvSXU0PTwvZHM6RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PC9kczpTaWduZWRJ
+bmZvPjxkczpTaWduYXR1cmVWYWx1ZSBJZD0iXzQyMTFkMjcwLTgyNmQtNDkwZi05MDc2LTc3NTNj
+OGFhY2Y5ZSI+cnduRDFBTHhFZUV5SHNHaEMxMVZLODAyRFA3bllSNWY5ZFlybkp4Y0VoS0lxeGUv
+azZHZU5NS29rMVpOcWdRTVFkOWtmMDVmNU9ULyYjMTM7CnJXUXVmdFFDbFNZditGQ0RmTHhYbEV3
+THM1L1Q0WVpURUJleitkZFNSd2w5S1RHQ1hvUUowa2srZTNEbHNidncxODE2a0VUVitZV1QmIzEz
+OwpVQVY2a0dlalhHbHVGWGxLWTlYVkhKVnpMMmh3VGFMQnhMZkFvdVlhY3VZSnZUNkJFb0xFR3dJ
+S1hZNyt4blVNei84ZmtleWtrNkk0JiMxMzsKY3k4eWVMSnZEZmU2K0hkMitZQ0pXR05jNW05ODBI
+YWJNT2o1QWNHNXR6L0YvVlFzcSt1dFh0QXpUWDRzT3VLWmRtOEZVNnkyaGtsMCYjMTM7CmpWWUZW
+bFNja1FCVGZhV1NmZkxrUjFuTHZjeXFyT0xqem5JYVl0WU1KbytOSmhxV05CWlNvUWx2OWlWZlBI
+K2U1STZIZGxzaXRxa20mIzEzOwpJRG45aUlPREc1ZGozV2NjeFBTMmRnRXI1Z29zSnRudWFKYldY
+R3QvN0RIUUNsY2EzRDJRcGowMW5vcFVrc0I1VTBFYmNRNlNZUU85JiMxMzsKdnNSdWFTV1o5R0Rt
+Wlc0dTJSSjQ3eWgwcTE5YXBkbWZIaHBpMCtSVDF3d2cxb2ZmbkdxZ2lOWmh5MUdsTDI5SDdSS1Zx
+LytDWFJ2SyYjMTM7CkhOWm0zSCt0eXpuZDJyT2w1ejJvMlFEOWF2ZkYxVHZ6NElSTHBuVndBc2Ni
+cjc5cmthaGhyNVdkQnc4bE5OTG8zU0dlNXViYmJWV0UmIzEzOwpISjNZcVVLVHVGYTJFMTc1emJl
+YWptWVU3eHhuUUM0eENORngwM21JeHJueU9PcUhzdWNHdUttallHNjlzeWIwYjduM3FWOVZhZVE9
+PC9kczpTaWduYXR1cmVWYWx1ZT48ZHM6S2V5SW5mbyBJZD0iX2Q1Zjk4YmIwLWU2MWYtNDBkMy1h
+YTZhLTU5Y2U4MjYwNGJlMCI+PGRzOlg1MDlEYXRhPjxkczpYNTA5Q2VydGlmaWNhdGU+TUlJSFh6
+Q0NCVWVnQXdJQkFnSVVYcUkvdmQxOENhZzk4b05wZHpWN0JpeS82RUF3RFFZSktvWklodmNOQVFF
+TkJRQXdmREVMTUFrRyYjMTM7CkExVUVCaE1DVlZNeFBEQTZCZ05WQkFvTU0wbHVkR1Z5Ym1WMElF
+TnZjbkJ2Y21GMGFXOXVJR1p2Y2lCQmMzTnBaMjVsWkNCT1lXMWwmIzEzOwpjeUJoYm1RZ1RuVnRZ
+bVZ5Y3pFdk1DMEdBMVVFQXd3bVNVTkJUazRnVkhKaFpHVnRZWEpySUVOc1pXRnlhVzVuYUc5MWMy
+VWdVR2xzJiMxMzsKYjNRZ1EwRXdIaGNOTWpJeE1URTJNVE15T0RVNVdoY05NamN4TVRFMU1UTXlP
+RFU1V2pDQjBERUxNQWtHQTFVRUJoTUNRa1V4RVRBUCYjMTM7CkJnTlZCQWdUQ0VKeWRYTnpaV3h6
+TVJJd0VBWURWUVFIRXdsV2FXeDJiMjl5WkdVeE16QXhCZ05WQkFvVEtrUmxiRzlwZEhSbElFTnYm
+IzEzOwpibk4xYkhScGJtY2dZVzVrSUVGa2RtbHpiM0o1SUVOV1FrRXZVME5TVERFK01Ed0dBMVVF
+QXhNMVNVTkJUazRnVkUxRFNDQkJkWFJvJiMxMzsKYjNKcGVtVmtJRlJ5WVdSbGJXRnlheUJRYVd4
+dmRDQldZV3hwWkdGMGIzSWdWbUZzYVdReEpUQWpCZ2txaGtpRzl3MEJDUUVXRm1KbCYjMTM7CmRH
+MWphSE50WkVCa1pXeHZhWFIwWlM1amIyMHdnZ0lpTUEwR0NTcUdTSWIzRFFFQkFRVUFBNElDRHdB
+d2dnSUtBb0lDQVFDNkZKd3omIzEzOwpLcVFWWDZmRzMvRUxSU0dXVjlHckthRk1LbWhXSXhlcHdS
+Wk42TXhNcWtkNURuWWZpVCtXcDk4akVrcWdUeDJVTWI5cXVnY0dOVjZnJiMxMzsKMzUvQ3JRYi9G
+L216M0M0c2ZMTnVEcFNxSzlRRjgrcGFUSDZoUW1yT3BxVitVVHZkajlTTWdLR3lGaXpTODhDRFdN
+eDR3M2k0RkFLZSYjMTM7CjZOUnNKUkdUQXRLRHVNSGNBNHNqMDhHamUzbFBXY2dGdmNRTkRWZUVC
+VHVPSEJHK1JoajdWMUppTkdQLzRlcFRYVEZYZ1BGRGdlejMmIzEzOwpZQWZ4cXBidU80VFg2YmJZ
+ZGsybnZNTEZ2TEVOa0NGWXVsbllQemduRUJHU01LSWFBSWxiK3NjSEN2V2dXajJUTGd3aDJHSk5j
+elZNJiMxMzsKMUxQTXFHUytVa2k5TWg3OTgyMi94b2FyNDk4eER4Mll4Lzhzd2dFTkxTZ0NzUUFX
+OG5NZ3dXbjZBYllsMlJBQlh1cmF5RnNuNFAxUiYjMTM7CnVRTm1VcC9xclJLUnZTSnIxT0xrSFpm
+RlRjU1lRYVZpdU1ZUFh6R3o4dG1NTGxtSS9CNkFDSDRBd1JNZG5ZdkZPM0tJMVJCblBLSWQmIzEz
+Owp3d2ZVcFo1SVRJcGJBN0NHZ1R4MXF4dE0xd0lVcjdwSGVLUDZqVmUza2RETGcrL0JaMnhNRXRC
+azVhOFk3QjR2M3h3SFhHVHZWOG1OJiMxMzsKMEFnL1N5VC9RVXlFUmhYVXlBTjIrRXdaK1NRQ1V5
+TmZ6aW9XUTg3OGVHeWtVKzQ2K0JiZ0kzSUlyMzZYS1B3bXp0MFNaK0tJM3RuRiYjMTM7ClRsbjlt
+WDBLQzBpZG9qNXlrelBvQy9NSWVkMHNwNFRpZ3hFYldOeDdFRjgwUHZSL0RERXdWUEVFa2tqeTYz
+WEZ1bHhpQ1FJREFRQUImIzEzOwpvNElCZ2pDQ0FYNHdEQVlEVlIwVEFRSC9CQUl3QURBT0JnTlZI
+UThCQWY4RUJBTUNCNEF3SFFZRFZSME9CQllFRkhuOXMwREVhMmt2JiMxMzsKZ0UvZUlPVHNxb1c4
+NU1YRk1JRzZCZ05WSFNNRWdiSXdnYStBRkVkN1Q2NTZVWkcxMGIrZE51bUdmellXQktsRm9ZR0Fw
+SDR3ZkRFTCYjMTM7Ck1Ba0dBMVVFQmhNQ1ZWTXhQREE2QmdOVkJBb01NMGx1ZEdWeWJtVjBJRU52
+Y25CdmNtRjBhVzl1SUdadmNpQkJjM05wWjI1bFpDQk8mIzEzOwpZVzFsY3lCaGJtUWdUblZ0WW1W
+eWN6RXZNQzBHQTFVRUF3d21TVU5CVGs0Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5YVc1bmFHOTFjMlVn
+JiMxMzsKVUdsc2IzUWdRMEdDRkhwcWJURmVKY1B0VUM5WHV1UEtQc0x3RFIrTU1EUUdBMVVkSHdR
+dE1Dc3dLYUFub0NXR0kyaDBkSEE2THk5aiYjMTM7CmNtd3VhV05oYm00dWIzSm5MM1J0WTJoZmNH
+bHNiM1F1WTNKc01Fd0dBMVVkSUFSRk1FTXdFQVlPS3dZQkJBR0N5UnNCQllNN0RBb3cmIzEzOwpM
+d1lJS3dZQkJRVUhBZ0V3SXpBaEJnZ3JCZ0VGQlFjQ0FSWVZhSFIwY0hNNkx5OWpjSE11YVdOaGJt
+NHViM0puTUEwR0NTcUdTSWIzJiMxMzsKRFFFQkRRVUFBNElDQVFCZFNhdDU2dWVqTG5BakZJRjk1
+ZGpZV0k2cy8vTjZZWHhzcnJNa0dCUDhFZXpQeWhMaDZhd1A0ejdROVFBSSYjMTM7ClFaa1lveHJs
+LzF5MCtieVYycW5UVVVDTFJwSy9CRHAvaGNmd1BmS0NBLzJSUUNISnJiNit6MGVuRFBGUkswTktt
+d09jZGxHdFVrMG0mIzEzOwpQZ1dHU0t0dXdWc1BBaFRESnVob3NaT2hrTmYrblNPT0hyUU9uMUUy
+cnpPcmQva1FscWlDd1JIOTc5Nk5wVEErSFNNZk9vYkpFRVBxJiMxMzsKdHBGN1A1cWJ3dGw5NVVh
+NU9wNEFoYTcwSEhmVUZTNEJPUUtMQlZmTVpkT1IraVBvaDVPd0FLK2h0WWtGQ0c5UDJXSHU3d2Y4
+RUMrVyYjMTM7CjdrOTZndlRkOHhFN291b2FiVDJ4NllmWXFFbFBIaVUvSU05Z1Z6V1dML3N2WUR5
+U1Z1b0Z3QmpETk4xY2RxMHFPWVIxeXVTMWMvOUQmIzEzOwpGUjdlbzdHRkVDeStUQmQ3SWlLUmZC
+VmVZR09PUE1ub0ZmeFJMV3Jwc1dObndEN2xrUGtMQ2dGQ2srOHlFY09SZzYyNW1vNjV6NHk2JiMx
+MzsKSjRLOGZvZGE3cXdtWE5QM1JTMThvbjZCSHQ4bFErYlhnT0hteElIazBhTzBxTkRxZ3ZMcjJG
+bHlMR0pHaUVNUnFETU1SNi9hMDZidCYjMTM7CmtuVU1IbDdDcU1maklralA0Vk5OeUdQZEpnd1Zr
+MmtlYjl1TkZ2SkN4VCtNMmZHWFExTmJKTmZ0djVNZ1NzcDlOMXkreDZnQTNFaHcmIzEzOwp5SGxt
+SkI0WU10bzh0VFYxaTg0eFBYeGkyQ0FlRGFHRHV3b3N0OFlVQ1NqcTdSQ0s4dEdjYUFZcmtYUVky
+eVFmWDNjd0RzRXhScVZXJiMxMzsKeXJqeVJ0K042bUs5OVE9PTwvZHM6WDUwOUNlcnRpZmljYXRl
+PjwvZHM6WDUwOURhdGE+PC9kczpLZXlJbmZvPjwvZHM6U2lnbmF0dXJlPjwvc21kOnNpZ25lZE1h
+cms+Cg==
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Holder-English/Court-Holder-English-Active.smd b/core/src/test/resources/google/registry/tmch/idn/Holder-English/Court-Holder-English-Active.smd
new file mode 100644
index 000000000..882b2670c
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Holder-English/Court-Holder-English-Active.smd
@@ -0,0 +1,119 @@
+Marks: Test & Validate
+smdID: 000000501669081830803-65535
+U-labels: test---validate, test--validate, test-and-validate, test-andvalidate, test-validate, testand-validate, testandvalidate, testvalidate
+notBefore: 2022-11-22T01:50:30.803Z
+notAfter: 2027-10-21T08:12:19.525Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il9mYjRk
+OWJmZi0xYjAyLTQzOGUtOWMzYy03NWEyMmE2MDE4ODMiPjxzbWQ6aWQ+MDAwMDAwNTAxNjY5MDgx
+ODMwODAzLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMTo1MDozMC44MDNaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0yMVQwODoxMjoxOS41MjVaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazpj
+b3VydD48bWFyazppZD4wMDAxMzYxNTAzMDU2NDc0MTUwMzA1NjQ3NC0xPC9tYXJrOmlkPjxtYXJr
+Om1hcmtOYW1lPlRlc3QgJmFtcDsgVmFsaWRhdGU8L21hcms6bWFya05hbWU+PG1hcms6aG9sZGVy
+IGVudGl0bGVtZW50PSJvd25lciI+PG1hcms6bmFtZT5GcmFuayBXaGl0ZTwvbWFyazpuYW1lPjxt
+YXJrOm9yZz5UZXN0IE9yZ2FuaXphdGlvbjwvbWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpzdHJl
+ZXQ+V2VzdCBBcnF1ZXMgQXZlbnVlIDEwMSA8L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+U3Vubnl2
+YWxlPC9tYXJrOmNpdHk+PG1hcms6c3A+Q0E8L21hcms6c3A+PG1hcms6cGM+MTAwMjMtMzI0MTwv
+bWFyazpwYz48bWFyazpjYz5VUzwvbWFyazpjYz48L21hcms6YWRkcj48bWFyazp2b2ljZT4rMS4z
+MDE0NTU2NjAwPC9tYXJrOnZvaWNlPjxtYXJrOmZheD4rMS4zMDE0NTU2NjAxPC9tYXJrOmZheD48
+bWFyazplbWFpbD5pbmZvQGV4YW1wbGUuZXhhbXBsZTwvbWFyazplbWFpbD48L21hcms6aG9sZGVy
+PjxtYXJrOmxhYmVsPnRlc3QtLS12YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0
+LS12YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0LWFuZC12YWxpZGF0ZTwvbWFy
+azpsYWJlbD48bWFyazpsYWJlbD50ZXN0LWFuZHZhbGlkYXRlPC9tYXJrOmxhYmVsPjxtYXJrOmxh
+YmVsPnRlc3QtdmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+dGVzdGFuZC12YWxpZGF0
+ZTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0YW5kdmFsaWRhdGU8L21hcms6bGFiZWw+PG1h
+cms6bGFiZWw+dGVzdHZhbGlkYXRlPC9tYXJrOmxhYmVsPjxtYXJrOmdvb2RzQW5kU2VydmljZXM+
+Z29sZDwvbWFyazpnb29kc0FuZFNlcnZpY2VzPjxtYXJrOnJlZk51bT4xMjM0PC9tYXJrOnJlZk51
+bT48bWFyazpwcm9EYXRlPjIwMTMtMDEtMDFUMDA6MDA6MDAuMDAwWjwvbWFyazpwcm9EYXRlPjxt
+YXJrOmNjPlVTPC9tYXJrOmNjPjxtYXJrOmNvdXJ0TmFtZT5Ib3ZlPC9tYXJrOmNvdXJ0TmFtZT48
+L21hcms6Y291cnQ+PC9tYXJrOm1hcms+PGRzOlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0cDovL3d3
+dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyIgSWQ9Il8wZDQyM2YxNy05ZDAyLTQyZDctOGFlNS0w
+MzFiNjFjMGY1MGEiPjxkczpTaWduZWRJbmZvPjxkczpDYW5vbmljYWxpemF0aW9uTWV0aG9kIEFs
+Z29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PGRzOlNp
+Z25hdHVyZU1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZHNp
+Zy1tb3JlI3JzYS1zaGEyNTYiLz48ZHM6UmVmZXJlbmNlIFVSST0iI19mYjRkOWJmZi0xYjAyLTQz
+OGUtOWMzYy03NWEyMmE2MDE4ODMiPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3Jp
+dGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjZW52ZWxvcGVkLXNpZ25hdHVy
+ZSIvPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3ht
+bC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09
+Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1
+ZT4zTStkMlVUZThYOHFDV2xZMmhqYkhBRnQyUlEyQmUyb0tXWitmUDlHMlVVPTwvZHM6RGlnZXN0
+VmFsdWU+PC9kczpSZWZlcmVuY2U+PGRzOlJlZmVyZW5jZSBVUkk9IiNfMDg2OTNiYzQtMWUyNi00
+OTBjLTlkMmMtMzBlOGJiMTgyMWU2Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29y
+aXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFu
+c2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAx
+LzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+Wk5hdE5ZcEt5UndnQUlpRlJQY1VZ
+bUtIdmtubVZvMHgzKzg1MDNTNmZHbz08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNlPjwv
+ZHM6U2lnbmVkSW5mbz48ZHM6U2lnbmF0dXJlVmFsdWUgSWQ9Il9jNzc1ZjgyMC01OTI1LTQ5NzMt
+YTE1ZC1kMmZjMTZmZGJiNDUiPmF0TnRqbWMxQzFwdXg2VUloRUhSc1pzZ3FPYmw2ZXNIaHl3RjNS
+M0tZRC9XYTZKOE43Y1IyUHN2bWI5VllyU29xWUVVcXN1djRnbFYmIzEzOwpiTnNJTmF2QkhYRVhq
+SHdudmh1Zzg2VFJWMUJEb2FiYVRuTEs0K0JtV1htZnhZUGxUdVFNczkvcy9VK2lFb2lYSkZYcVMr
+Zjg1KzdWJiMxMzsKeHpqSE5nakVlbWtSdUdzNTVnNXoycEhoWDErOHFtM3pUY0JtNVFMZGtxWFU2
+SW5ucUZTVCszeTBZbjBGNURYNTJsbTNnanFwbGxLayYjMTM7CkNocWFSSldSR0sva0JtOXFkV0ZL
+dCs1aytPaXhlOUM1SE00VjRXaUN4M05YakYrdE1SUjNpbHE4ckRjVmQzN1JLYVMrZTdQeEZZM08m
+IzEzOwpWTXo4V3h0R0wyYTlxVEFCNk1zK3pHNUtxNk05ZmpoSElybVQ5SDdpTnM3Z3RINFdYWFA3
+aXJuV3JBb3Axa2o2TzJtMlRnanJPQlBNJiMxMzsKdDdXV2t4allsUmtQM3FUaG5ZWjN6VG0zT256
+d0JlRDFmeUwzY1VYbEhBVmJ4dXZ1MXk0QmRaZTBnaGZ6S0tCUGVYY1NBLzYrVjlVNCYjMTM7CkdD
+OUxuNHNrbC9TMmV6RVcyMzUzeG5KbE45dk9mRUE1TW5QTyt5R1phTzBWaDlTZ3A5WEcxN3cyQ09l
+V2pvTnI3ZG5FeTFEMVduK1ImIzEzOwo4WEROSXk0YjNJa1Z4QUlIVW9DOWowOFh1NFdHYjFIcmNu
+YU83OWFpNDZlbGFRanlHWUdvV3d0VUJta1JybnBmY28zcDdMSWxKVEloJiMxMzsKdWQzdUI3R1lK
+R3lDV0ZsRVNweXJYa2xYZU1pMUxWeGZmWktDeEgyYStsOFl5QjFwUHJxZStITlhNTUpNM2tCYnRu
+V2NUeFQ3Z29zPTwvZHM6U2lnbmF0dXJlVmFsdWU+PGRzOktleUluZm8gSWQ9Il8wODY5M2JjNC0x
+ZTI2LTQ5MGMtOWQyYy0zMGU4YmIxODIxZTYiPjxkczpYNTA5RGF0YT48ZHM6WDUwOUNlcnRpZmlj
+YXRlPk1JSUhYekNDQlVlZ0F3SUJBZ0lVWHFJL3ZkMThDYWc5OG9OcGR6VjdCaXkvNkVBd0RRWUpL
+b1pJaHZjTkFRRU5CUUF3ZkRFTE1Ba0cmIzEzOwpBMVVFQmhNQ1ZWTXhQREE2QmdOVkJBb01NMGx1
+ZEdWeWJtVjBJRU52Y25CdmNtRjBhVzl1SUdadmNpQkJjM05wWjI1bFpDQk9ZVzFsJiMxMzsKY3lC
+aGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF3d21TVU5CVGs0Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5
+YVc1bmFHOTFjMlVnVUdscyYjMTM7CmIzUWdRMEV3SGhjTk1qSXhNVEUyTVRNeU9EVTVXaGNOTWpj
+eE1URTFNVE15T0RVNVdqQ0IwREVMTUFrR0ExVUVCaE1DUWtVeEVUQVAmIzEzOwpCZ05WQkFnVENF
+SnlkWE56Wld4ek1SSXdFQVlEVlFRSEV3bFdhV3gyYjI5eVpHVXhNekF4QmdOVkJBb1RLa1JsYkc5
+cGRIUmxJRU52JiMxMzsKYm5OMWJIUnBibWNnWVc1a0lFRmtkbWx6YjNKNUlFTldRa0V2VTBOU1RE
+RStNRHdHQTFVRUF4TTFTVU5CVGs0Z1ZFMURTQ0JCZFhSbyYjMTM7CmIzSnBlbVZrSUZSeVlXUmxi
+V0Z5YXlCUWFXeHZkQ0JXWVd4cFpHRjBiM0lnVm1Gc2FXUXhKVEFqQmdrcWhraUc5dzBCQ1FFV0Zt
+SmwmIzEzOwpkRzFqYUhOdFpFQmtaV3h2YVhSMFpTNWpiMjB3Z2dJaU1BMEdDU3FHU0liM0RRRUJB
+UVVBQTRJQ0R3QXdnZ0lLQW9JQ0FRQzZGSnd6JiMxMzsKS3FRVlg2ZkczL0VMUlNHV1Y5R3JLYUZN
+S21oV0l4ZXB3UlpONk14TXFrZDVEbllmaVQrV3A5OGpFa3FnVHgyVU1iOXF1Z2NHTlY2ZyYjMTM7
+CjM1L0NyUWIvRi9tejNDNHNmTE51RHBTcUs5UUY4K3BhVEg2aFFtck9wcVYrVVR2ZGo5U01nS0d5
+Rml6Uzg4Q0RXTXg0dzNpNEZBS2UmIzEzOwo2TlJzSlJHVEF0S0R1TUhjQTRzajA4R2plM2xQV2Nn
+RnZjUU5EVmVFQlR1T0hCRytSaGo3VjFKaU5HUC80ZXBUWFRGWGdQRkRnZXozJiMxMzsKWUFmeHFw
+YnVPNFRYNmJiWWRrMm52TUxGdkxFTmtDRll1bG5ZUHpnbkVCR1NNS0lhQUlsYitzY0hDdldnV2oy
+VExnd2gyR0pOY3pWTSYjMTM7CjFMUE1xR1MrVWtpOU1oNzk4MjIveG9hcjQ5OHhEeDJZeC84c3dn
+RU5MU2dDc1FBVzhuTWd3V242QWJZbDJSQUJYdXJheUZzbjRQMVImIzEzOwp1UU5tVXAvcXJSS1J2
+U0pyMU9Ma0haZkZUY1NZUWFWaXVNWVBYekd6OHRtTUxsbUkvQjZBQ0g0QXdSTWRuWXZGTzNLSTFS
+Qm5QS0lkJiMxMzsKd3dmVXBaNUlUSXBiQTdDR2dUeDFxeHRNMXdJVXI3cEhlS1A2alZlM2tkRExn
+Ky9CWjJ4TUV0Qms1YThZN0I0djN4d0hYR1R2VjhtTiYjMTM7CjBBZy9TeVQvUVV5RVJoWFV5QU4y
+K0V3WitTUUNVeU5memlvV1E4NzhlR3lrVSs0NitCYmdJM0lJcjM2WEtQd216dDBTWitLSTN0bkYm
+IzEzOwpUbG45bVgwS0MwaWRvajV5a3pQb0MvTUllZDBzcDRUaWd4RWJXTng3RUY4MFB2Ui9EREV3
+VlBFRWtrank2M1hGdWx4aUNRSURBUUFCJiMxMzsKbzRJQmdqQ0NBWDR3REFZRFZSMFRBUUgvQkFJ
+d0FEQU9CZ05WSFE4QkFmOEVCQU1DQjRBd0hRWURWUjBPQkJZRUZIbjlzMERFYTJrdiYjMTM7CmdF
+L2VJT1RzcW9XODVNWEZNSUc2QmdOVkhTTUVnYkl3Z2ErQUZFZDdUNjU2VVpHMTBiK2ROdW1HZnpZ
+V0JLbEZvWUdBcEg0d2ZERUwmIzEzOwpNQWtHQTFVRUJoTUNWVk14UERBNkJnTlZCQW9NTTBsdWRH
+VnlibVYwSUVOdmNuQnZjbUYwYVc5dUlHWnZjaUJCYzNOcFoyNWxaQ0JPJiMxMzsKWVcxbGN5Qmhi
+bVFnVG5WdFltVnljekV2TUMwR0ExVUVBd3dtU1VOQlRrNGdWSEpoWkdWdFlYSnJJRU5zWldGeWFX
+NW5hRzkxYzJVZyYjMTM7ClVHbHNiM1FnUTBHQ0ZIcHFiVEZlSmNQdFVDOVh1dVBLUHNMd0RSK01N
+RFFHQTFVZEh3UXRNQ3N3S2FBbm9DV0dJMmgwZEhBNkx5OWomIzEzOwpjbXd1YVdOaGJtNHViM0pu
+TDNSdFkyaGZjR2xzYjNRdVkzSnNNRXdHQTFVZElBUkZNRU13RUFZT0t3WUJCQUdDeVJzQkJZTTdE
+QW93JiMxMzsKTHdZSUt3WUJCUVVIQWdFd0l6QWhCZ2dyQmdFRkJRY0NBUllWYUhSMGNITTZMeTlq
+Y0hNdWFXTmhibTR1YjNKbk1BMEdDU3FHU0liMyYjMTM7CkRRRUJEUVVBQTRJQ0FRQmRTYXQ1NnVl
+akxuQWpGSUY5NWRqWVdJNnMvL042WVh4c3JyTWtHQlA4RWV6UHloTGg2YXdQNHo3UTlRQUkmIzEz
+OwpRWmtZb3hybC8xeTArYnlWMnFuVFVVQ0xScEsvQkRwL2hjZndQZktDQS8yUlFDSEpyYjYrejBl
+bkRQRlJLME5LbXdPY2RsR3RVazBtJiMxMzsKUGdXR1NLdHV3VnNQQWhUREp1aG9zWk9oa05mK25T
+T09IclFPbjFFMnJ6T3JkL2tRbHFpQ3dSSDk3OTZOcFRBK0hTTWZPb2JKRUVQcSYjMTM7CnRwRjdQ
+NXFid3RsOTVVYTVPcDRBaGE3MEhIZlVGUzRCT1FLTEJWZk1aZE9SK2lQb2g1T3dBSytodFlrRkNH
+OVAyV0h1N3dmOEVDK1cmIzEzOwo3azk2Z3ZUZDh4RTdvdW9hYlQyeDZZZllxRWxQSGlVL0lNOWdW
+eldXTC9zdllEeVNWdW9Gd0JqRE5OMWNkcTBxT1lSMXl1UzFjLzlEJiMxMzsKRlI3ZW83R0ZFQ3kr
+VEJkN0lpS1JmQlZlWUdPT1BNbm9GZnhSTFdycHNXTm53RDdsa1BrTENnRkNrKzh5RWNPUmc2MjVt
+bzY1ejR5NiYjMTM7Cko0Szhmb2RhN3F3bVhOUDNSUzE4b242Qkh0OGxRK2JYZ09IbXhJSGswYU8w
+cU5EcWd2THIyRmx5TEdKR2lFTVJxRE1NUjYvYTA2YnQmIzEzOwprblVNSGw3Q3FNZmpJa2pQNFZO
+TnlHUGRKZ3dWazJrZWI5dU5GdkpDeFQrTTJmR1hRMU5iSk5mdHY1TWdTc3A5TjF5K3g2Z0EzRWh3
+JiMxMzsKeUhsbUpCNFlNdG84dFRWMWk4NHhQWHhpMkNBZURhR0R1d29zdDhZVUNTanE3UkNLOHRH
+Y2FBWXJrWFFZMnlRZlgzY3dEc0V4UnFWVyYjMTM7CnlyanlSdCtONm1LOTlRPT08L2RzOlg1MDlD
+ZXJ0aWZpY2F0ZT48L2RzOlg1MDlEYXRhPjwvZHM6S2V5SW5mbz48L2RzOlNpZ25hdHVyZT48L3Nt
+ZDpzaWduZWRNYXJrPgo=
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Holder-English/Court-Holder-English-Revoked.smd b/core/src/test/resources/google/registry/tmch/idn/Holder-English/Court-Holder-English-Revoked.smd
new file mode 100644
index 000000000..0389517b8
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Holder-English/Court-Holder-English-Revoked.smd
@@ -0,0 +1,119 @@
+Marks: Test & Validate
+smdID: 000000501669081773210-65535
+U-labels: test---validate, test--validate, test-and-validate, test-andvalidate, test-validate, testand-validate, testandvalidate, testvalidate
+notBefore: 2022-11-22T01:49:33.210Z
+notAfter: 2027-10-21T08:12:19.525Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il83ODE4
+ZmM2OC01MDIyLTQyMDktYmNlNC03NWRhNWJhOGNmYTQiPjxzbWQ6aWQ+MDAwMDAwNTAxNjY5MDgx
+NzczMjEwLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMTo0OTozMy4yMTBaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0yMVQwODoxMjoxOS41MjVaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazpj
+b3VydD48bWFyazppZD4wMDAxMzYxNTAzMDU2NDc0MTUwMzA1NjQ3NC0xPC9tYXJrOmlkPjxtYXJr
+Om1hcmtOYW1lPlRlc3QgJmFtcDsgVmFsaWRhdGU8L21hcms6bWFya05hbWU+PG1hcms6aG9sZGVy
+IGVudGl0bGVtZW50PSJvd25lciI+PG1hcms6bmFtZT5GcmFuayBXaGl0ZTwvbWFyazpuYW1lPjxt
+YXJrOm9yZz5UZXN0IE9yZ2FuaXphdGlvbjwvbWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpzdHJl
+ZXQ+V2VzdCBBcnF1ZXMgQXZlbnVlIDEwMSA8L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+U3Vubnl2
+YWxlPC9tYXJrOmNpdHk+PG1hcms6c3A+Q0E8L21hcms6c3A+PG1hcms6cGM+MTAwMjMtMzI0MTwv
+bWFyazpwYz48bWFyazpjYz5VUzwvbWFyazpjYz48L21hcms6YWRkcj48bWFyazp2b2ljZT4rMS4z
+MDE0NTU2NjAwPC9tYXJrOnZvaWNlPjxtYXJrOmZheD4rMS4zMDE0NTU2NjAxPC9tYXJrOmZheD48
+bWFyazplbWFpbD5pbmZvQGV4YW1wbGUuZXhhbXBsZTwvbWFyazplbWFpbD48L21hcms6aG9sZGVy
+PjxtYXJrOmxhYmVsPnRlc3QtLS12YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0
+LS12YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0LWFuZC12YWxpZGF0ZTwvbWFy
+azpsYWJlbD48bWFyazpsYWJlbD50ZXN0LWFuZHZhbGlkYXRlPC9tYXJrOmxhYmVsPjxtYXJrOmxh
+YmVsPnRlc3QtdmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+dGVzdGFuZC12YWxpZGF0
+ZTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0YW5kdmFsaWRhdGU8L21hcms6bGFiZWw+PG1h
+cms6bGFiZWw+dGVzdHZhbGlkYXRlPC9tYXJrOmxhYmVsPjxtYXJrOmdvb2RzQW5kU2VydmljZXM+
+Z29sZDwvbWFyazpnb29kc0FuZFNlcnZpY2VzPjxtYXJrOnJlZk51bT4xMjM0PC9tYXJrOnJlZk51
+bT48bWFyazpwcm9EYXRlPjIwMTMtMDEtMDFUMDA6MDA6MDAuMDAwWjwvbWFyazpwcm9EYXRlPjxt
+YXJrOmNjPlVTPC9tYXJrOmNjPjxtYXJrOmNvdXJ0TmFtZT5Ib3ZlPC9tYXJrOmNvdXJ0TmFtZT48
+L21hcms6Y291cnQ+PC9tYXJrOm1hcms+PGRzOlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0cDovL3d3
+dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyIgSWQ9Il82MDQ1ZWQzZC0yMmRiLTQ1NjQtYjMwMS1i
+MDQyOWM3YmZmM2MiPjxkczpTaWduZWRJbmZvPjxkczpDYW5vbmljYWxpemF0aW9uTWV0aG9kIEFs
+Z29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PGRzOlNp
+Z25hdHVyZU1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZHNp
+Zy1tb3JlI3JzYS1zaGEyNTYiLz48ZHM6UmVmZXJlbmNlIFVSST0iI183ODE4ZmM2OC01MDIyLTQy
+MDktYmNlNC03NWRhNWJhOGNmYTQiPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3Jp
+dGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjZW52ZWxvcGVkLXNpZ25hdHVy
+ZSIvPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3ht
+bC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09
+Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1
+ZT5xZ1VUQkwxeE1HZGhCUzRLWTVWYVl6YXJPTWZVaEpSaTYreFpLL0VrR2dVPTwvZHM6RGlnZXN0
+VmFsdWU+PC9kczpSZWZlcmVuY2U+PGRzOlJlZmVyZW5jZSBVUkk9IiNfNzY2ZmVjNzQtMTkxOC00
+MDNlLWFhYjgtNWI0MWFjOTkzZGVjIj48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29y
+aXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFu
+c2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAx
+LzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+WUcwQWpadktVODFTb2REeTg2Z2Z5
+WTR6ZXNhdmsyN0hzZ0x1dDJ4MWZ5MD08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNlPjwv
+ZHM6U2lnbmVkSW5mbz48ZHM6U2lnbmF0dXJlVmFsdWUgSWQ9Il8wMjk4MjAwNi02ZGQwLTQyMmQt
+YmNiNi01MWY2OTA1ZGY2NGYiPmJSV3RBVzFGNzRvbWQ4Z0pPQUVuVmVscG9Zak5OY0dFVGI5R3Ax
+Y0IydE4xL0VuSW15aU43eFp3WHl4eDNnRDRVc2djUWgxQTFZNjUmIzEzOwo3R0FtaEp4aDRGNnI3
+STl5V2tReUhIZnRZVXkwS1BXUDJlcFVPdHJFbFNxTTFYMHJqeVdVd1RqUEFYcVQ5a0RweUQ0b3Bx
+WmVVNURjJiMxMzsKT3ljWVI5MWpNaHJwTSsrM1pTQ3dJMnBZVWJ5cWRiSkhiVVE0TGkwS1ZYN3Ew
+SldraTdENVR2cnpQVWQ5WENGNTZZN0oyNmVIR1hQOCYjMTM7CkU5VENLVlZBMkQ1bDNRY1ZiYVY3
+NVJtRXFIR2RpbFFlREc0OE9McFBFRTdNQnpXWWpTTUF1U25MMG5mVW9ldDIzR1RjckxSQ2FVbE4m
+IzEzOwpuYWpsSjh6bDU3YTY5Um94MjYybzY2R2s0UFNsbjUzTmxvUFYxVGdwTWZLTnMzT0dvTUpa
+YU9NcEdPSFBZRnp0SSs5aGdMZVlOTnhIJiMxMzsKeFlPQ2V4SlkyTjVYeFk0NGJBYnpiY3J6QUwx
+RkR5WEUrT29VY1k1U2Z0NVhHMEp5Y0JEOXBGUElNRUpGS1hrK1cyc0NldUVaRnZBNSYjMTM7CnR6
+UktvK2VxVXVNWjAzUDhjREZvVlNkUGxHejFkdk5IWmYxMHRzR0Z3MnVmczZOOUZQUzdEa2pSWjZz
+MWNSZU5rUTRTSnEzS01jQ3gmIzEzOwpDM3VoTmx2UlE0Zm51endHQkpsZVBlbHlkTGRPc3NaQm5N
+ejUxZHJiZnNYM2M5UE5KZDhwa1E0MVlSc0hUNEpVbENaV1BBY0hjYWdGJiMxMzsKOWdvZURBcXpv
+My9oZ2tPUWVxMmMwTUI0MVVOc1dXRkcwL3RGSkpadzNmbHFXYy9rcGlvdUkreFcyejhqU1ZlaXVG
+L0xLa3dsZEk0PTwvZHM6U2lnbmF0dXJlVmFsdWU+PGRzOktleUluZm8gSWQ9Il83NjZmZWM3NC0x
+OTE4LTQwM2UtYWFiOC01YjQxYWM5OTNkZWMiPjxkczpYNTA5RGF0YT48ZHM6WDUwOUNlcnRpZmlj
+YXRlPk1JSUhYekNDQlVlZ0F3SUJBZ0lVWHFJL3ZkMThDYWc5OG9OcGR6VjdCaXkvNkVBd0RRWUpL
+b1pJaHZjTkFRRU5CUUF3ZkRFTE1Ba0cmIzEzOwpBMVVFQmhNQ1ZWTXhQREE2QmdOVkJBb01NMGx1
+ZEdWeWJtVjBJRU52Y25CdmNtRjBhVzl1SUdadmNpQkJjM05wWjI1bFpDQk9ZVzFsJiMxMzsKY3lC
+aGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF3d21TVU5CVGs0Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5
+YVc1bmFHOTFjMlVnVUdscyYjMTM7CmIzUWdRMEV3SGhjTk1qSXhNVEUyTVRNeU9EVTVXaGNOTWpj
+eE1URTFNVE15T0RVNVdqQ0IwREVMTUFrR0ExVUVCaE1DUWtVeEVUQVAmIzEzOwpCZ05WQkFnVENF
+SnlkWE56Wld4ek1SSXdFQVlEVlFRSEV3bFdhV3gyYjI5eVpHVXhNekF4QmdOVkJBb1RLa1JsYkc5
+cGRIUmxJRU52JiMxMzsKYm5OMWJIUnBibWNnWVc1a0lFRmtkbWx6YjNKNUlFTldRa0V2VTBOU1RE
+RStNRHdHQTFVRUF4TTFTVU5CVGs0Z1ZFMURTQ0JCZFhSbyYjMTM7CmIzSnBlbVZrSUZSeVlXUmxi
+V0Z5YXlCUWFXeHZkQ0JXWVd4cFpHRjBiM0lnVm1Gc2FXUXhKVEFqQmdrcWhraUc5dzBCQ1FFV0Zt
+SmwmIzEzOwpkRzFqYUhOdFpFQmtaV3h2YVhSMFpTNWpiMjB3Z2dJaU1BMEdDU3FHU0liM0RRRUJB
+UVVBQTRJQ0R3QXdnZ0lLQW9JQ0FRQzZGSnd6JiMxMzsKS3FRVlg2ZkczL0VMUlNHV1Y5R3JLYUZN
+S21oV0l4ZXB3UlpONk14TXFrZDVEbllmaVQrV3A5OGpFa3FnVHgyVU1iOXF1Z2NHTlY2ZyYjMTM7
+CjM1L0NyUWIvRi9tejNDNHNmTE51RHBTcUs5UUY4K3BhVEg2aFFtck9wcVYrVVR2ZGo5U01nS0d5
+Rml6Uzg4Q0RXTXg0dzNpNEZBS2UmIzEzOwo2TlJzSlJHVEF0S0R1TUhjQTRzajA4R2plM2xQV2Nn
+RnZjUU5EVmVFQlR1T0hCRytSaGo3VjFKaU5HUC80ZXBUWFRGWGdQRkRnZXozJiMxMzsKWUFmeHFw
+YnVPNFRYNmJiWWRrMm52TUxGdkxFTmtDRll1bG5ZUHpnbkVCR1NNS0lhQUlsYitzY0hDdldnV2oy
+VExnd2gyR0pOY3pWTSYjMTM7CjFMUE1xR1MrVWtpOU1oNzk4MjIveG9hcjQ5OHhEeDJZeC84c3dn
+RU5MU2dDc1FBVzhuTWd3V242QWJZbDJSQUJYdXJheUZzbjRQMVImIzEzOwp1UU5tVXAvcXJSS1J2
+U0pyMU9Ma0haZkZUY1NZUWFWaXVNWVBYekd6OHRtTUxsbUkvQjZBQ0g0QXdSTWRuWXZGTzNLSTFS
+Qm5QS0lkJiMxMzsKd3dmVXBaNUlUSXBiQTdDR2dUeDFxeHRNMXdJVXI3cEhlS1A2alZlM2tkRExn
+Ky9CWjJ4TUV0Qms1YThZN0I0djN4d0hYR1R2VjhtTiYjMTM7CjBBZy9TeVQvUVV5RVJoWFV5QU4y
+K0V3WitTUUNVeU5memlvV1E4NzhlR3lrVSs0NitCYmdJM0lJcjM2WEtQd216dDBTWitLSTN0bkYm
+IzEzOwpUbG45bVgwS0MwaWRvajV5a3pQb0MvTUllZDBzcDRUaWd4RWJXTng3RUY4MFB2Ui9EREV3
+VlBFRWtrank2M1hGdWx4aUNRSURBUUFCJiMxMzsKbzRJQmdqQ0NBWDR3REFZRFZSMFRBUUgvQkFJ
+d0FEQU9CZ05WSFE4QkFmOEVCQU1DQjRBd0hRWURWUjBPQkJZRUZIbjlzMERFYTJrdiYjMTM7CmdF
+L2VJT1RzcW9XODVNWEZNSUc2QmdOVkhTTUVnYkl3Z2ErQUZFZDdUNjU2VVpHMTBiK2ROdW1HZnpZ
+V0JLbEZvWUdBcEg0d2ZERUwmIzEzOwpNQWtHQTFVRUJoTUNWVk14UERBNkJnTlZCQW9NTTBsdWRH
+VnlibVYwSUVOdmNuQnZjbUYwYVc5dUlHWnZjaUJCYzNOcFoyNWxaQ0JPJiMxMzsKWVcxbGN5Qmhi
+bVFnVG5WdFltVnljekV2TUMwR0ExVUVBd3dtU1VOQlRrNGdWSEpoWkdWdFlYSnJJRU5zWldGeWFX
+NW5hRzkxYzJVZyYjMTM7ClVHbHNiM1FnUTBHQ0ZIcHFiVEZlSmNQdFVDOVh1dVBLUHNMd0RSK01N
+RFFHQTFVZEh3UXRNQ3N3S2FBbm9DV0dJMmgwZEhBNkx5OWomIzEzOwpjbXd1YVdOaGJtNHViM0pu
+TDNSdFkyaGZjR2xzYjNRdVkzSnNNRXdHQTFVZElBUkZNRU13RUFZT0t3WUJCQUdDeVJzQkJZTTdE
+QW93JiMxMzsKTHdZSUt3WUJCUVVIQWdFd0l6QWhCZ2dyQmdFRkJRY0NBUllWYUhSMGNITTZMeTlq
+Y0hNdWFXTmhibTR1YjNKbk1BMEdDU3FHU0liMyYjMTM7CkRRRUJEUVVBQTRJQ0FRQmRTYXQ1NnVl
+akxuQWpGSUY5NWRqWVdJNnMvL042WVh4c3JyTWtHQlA4RWV6UHloTGg2YXdQNHo3UTlRQUkmIzEz
+OwpRWmtZb3hybC8xeTArYnlWMnFuVFVVQ0xScEsvQkRwL2hjZndQZktDQS8yUlFDSEpyYjYrejBl
+bkRQRlJLME5LbXdPY2RsR3RVazBtJiMxMzsKUGdXR1NLdHV3VnNQQWhUREp1aG9zWk9oa05mK25T
+T09IclFPbjFFMnJ6T3JkL2tRbHFpQ3dSSDk3OTZOcFRBK0hTTWZPb2JKRUVQcSYjMTM7CnRwRjdQ
+NXFid3RsOTVVYTVPcDRBaGE3MEhIZlVGUzRCT1FLTEJWZk1aZE9SK2lQb2g1T3dBSytodFlrRkNH
+OVAyV0h1N3dmOEVDK1cmIzEzOwo3azk2Z3ZUZDh4RTdvdW9hYlQyeDZZZllxRWxQSGlVL0lNOWdW
+eldXTC9zdllEeVNWdW9Gd0JqRE5OMWNkcTBxT1lSMXl1UzFjLzlEJiMxMzsKRlI3ZW83R0ZFQ3kr
+VEJkN0lpS1JmQlZlWUdPT1BNbm9GZnhSTFdycHNXTm53RDdsa1BrTENnRkNrKzh5RWNPUmc2MjVt
+bzY1ejR5NiYjMTM7Cko0Szhmb2RhN3F3bVhOUDNSUzE4b242Qkh0OGxRK2JYZ09IbXhJSGswYU8w
+cU5EcWd2THIyRmx5TEdKR2lFTVJxRE1NUjYvYTA2YnQmIzEzOwprblVNSGw3Q3FNZmpJa2pQNFZO
+TnlHUGRKZ3dWazJrZWI5dU5GdkpDeFQrTTJmR1hRMU5iSk5mdHY1TWdTc3A5TjF5K3g2Z0EzRWh3
+JiMxMzsKeUhsbUpCNFlNdG84dFRWMWk4NHhQWHhpMkNBZURhR0R1d29zdDhZVUNTanE3UkNLOHRH
+Y2FBWXJrWFFZMnlRZlgzY3dEc0V4UnFWVyYjMTM7CnlyanlSdCtONm1LOTlRPT08L2RzOlg1MDlD
+ZXJ0aWZpY2F0ZT48L2RzOlg1MDlEYXRhPjwvZHM6S2V5SW5mbz48L2RzOlNpZ25hdHVyZT48L3Nt
+ZDpzaWduZWRNYXJrPgo=
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Holder-English/Trademark-Holder-English-Active.smd b/core/src/test/resources/google/registry/tmch/idn/Holder-English/Trademark-Holder-English-Active.smd
new file mode 100644
index 000000000..61a59b031
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Holder-English/Trademark-Holder-English-Active.smd
@@ -0,0 +1,121 @@
+Marks: Test & Validate
+smdID: 000000541669081834556-65535
+U-labels: test---validate, test--validate, test-et-validate, test-etvalidate, test-validate, testand-validate, testandvalidate, testet-validate, testetvalidate, testvalidate
+notBefore: 2022-11-22T01:50:34.556Z
+notAfter: 2027-10-21T08:12:19.525Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il9mY2Zh
+MDBjZC1mMjYxLTRjM2MtOTFkNy0wNGNmZjQ4ZjQ4MDYiPjxzbWQ6aWQ+MDAwMDAwNTQxNjY5MDgx
+ODM0NTU2LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMTo1MDozNC41NTZaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0yMVQwODoxMjoxOS41MjVaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
+cmFkZW1hcms+PG1hcms6aWQ+MDAwMTM2MTUwMzA1NjkwOTE1MDMwNTY5MDktMTwvbWFyazppZD48
+bWFyazptYXJrTmFtZT5UZXN0ICZhbXA7IFZhbGlkYXRlPC9tYXJrOm1hcmtOYW1lPjxtYXJrOmhv
+bGRlciBlbnRpdGxlbWVudD0ib3duZXIiPjxtYXJrOm5hbWU+RnJhbmsgV2hpdGU8L21hcms6bmFt
+ZT48bWFyazpvcmc+VGVzdCBPcmdhbml6YXRpb248L21hcms6b3JnPjxtYXJrOmFkZHI+PG1hcms6
+c3RyZWV0Pldlc3QgQXJxdWVzIEF2ZW51ZSAxMDEgPC9tYXJrOnN0cmVldD48bWFyazpjaXR5PlN1
+bm55dmFsZTwvbWFyazpjaXR5PjxtYXJrOnNwPkNBPC9tYXJrOnNwPjxtYXJrOnBjPjEwMDIzLTMy
+NDE8L21hcms6cGM+PG1hcms6Y2M+VVM8L21hcms6Y2M+PC9tYXJrOmFkZHI+PG1hcms6dm9pY2U+
+KzEuMzAxNDU1NjYwMDwvbWFyazp2b2ljZT48bWFyazpmYXg+KzEuMzAxNDU1NjYwMTwvbWFyazpm
+YXg+PG1hcms6ZW1haWw+aW5mb0BleGFtcGxlLmV4YW1wbGU8L21hcms6ZW1haWw+PC9tYXJrOmhv
+bGRlcj48bWFyazpqdXJpc2RpY3Rpb24+VVM8L21hcms6anVyaXNkaWN0aW9uPjxtYXJrOmNsYXNz
+PjE1PC9tYXJrOmNsYXNzPjxtYXJrOmxhYmVsPnRlc3QtLS12YWxpZGF0ZTwvbWFyazpsYWJlbD48
+bWFyazpsYWJlbD50ZXN0LS12YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0LWV0
+LXZhbGlkYXRlPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnRlc3QtZXR2YWxpZGF0ZTwvbWFyazps
+YWJlbD48bWFyazpsYWJlbD50ZXN0LXZhbGlkYXRlPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnRl
+c3RhbmQtdmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+dGVzdGFuZHZhbGlkYXRlPC9t
+YXJrOmxhYmVsPjxtYXJrOmxhYmVsPnRlc3RldC12YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazps
+YWJlbD50ZXN0ZXR2YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0dmFsaWRhdGU8
+L21hcms6bGFiZWw+PG1hcms6Z29vZHNBbmRTZXJ2aWNlcz5ndWl0YXI8L21hcms6Z29vZHNBbmRT
+ZXJ2aWNlcz48bWFyazpyZWdOdW0+MTIzNDwvbWFyazpyZWdOdW0+PG1hcms6cmVnRGF0ZT4yMDEz
+LTAxLTAxVDAwOjAwOjAwLjAwMFo8L21hcms6cmVnRGF0ZT48bWFyazpleERhdGU+MjAxNC0xMS0w
+NVQwMDowMDowMC4wMDBaPC9tYXJrOmV4RGF0ZT48L21hcms6dHJhZGVtYXJrPjwvbWFyazptYXJr
+PjxkczpTaWduYXR1cmUgeG1sbnM6ZHM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1sZHNp
+ZyMiIElkPSJfYTgzZDAyODYtNGI0Ni00NWVhLWE4OTgtMTYxMGUxOWQ5NmMwIj48ZHM6U2lnbmVk
+SW5mbz48ZHM6Q2Fub25pY2FsaXphdGlvbk1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMu
+b3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjxkczpTaWduYXR1cmVNZXRob2QgQWxnb3JpdGht
+PSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGRzaWctbW9yZSNyc2Etc2hhMjU2Ii8+PGRz
+OlJlZmVyZW5jZSBVUkk9IiNfZmNmYTAwY2QtZjI2MS00YzNjLTkxZDctMDRjZmY0OGY0ODA2Ij48
+ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcv
+MjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48ZHM6VHJhbnNmb3JtIEFsZ29y
+aXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFu
+c2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAx
+LzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+cUxrRGtGL0FRL1ovUk1Sa1p5alFz
+c0JXTkhMK3JnOXBaZC9xMTd2ZHBRdz08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNlPjxk
+czpSZWZlcmVuY2UgVVJJPSIjX2RiNDliOWI4LWFlODMtNDQ3NC05YjhhLWU4MDk4NGU3OGUxZSI+
+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3Jn
+LzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6RGlnZXN0TWV0aG9k
+IEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxlbmMjc2hhMjU2Ii8+PGRz
+OkRpZ2VzdFZhbHVlPndiWTFuWWR3Z1RwM1BSTDM4Ym5oOGZqNVJtMi8zaUk5ZjBOQkdFakxGUjA9
+PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48L2RzOlNpZ25lZEluZm8+PGRzOlNpZ25h
+dHVyZVZhbHVlIElkPSJfZTczNTRmY2MtNGU5NC00MDdlLWE4YjMtOTk5YTg3ZjdlNWRhIj5oTkE1
+YWZVU3ExK2lGS0k2S2tlR1Q5bHN1WU95cm1IS0RkVTVtN3lPanFOc2F5SkZERmxNUTdPRlJIcXBn
+QkhGcUpBc3BBZFlVOXRKJiMxMzsKWVl6QVZoSlBIc1E5TVFEZnROdE1OckdnTnRkQWlTOXB2UlNj
+QW1BNEIzQ3lRNHdZT3k0d2JCSjNOQzFmOVd1YTk4TkhpTkVoN08wTiYjMTM7CmFXY3R4bUZONUVJ
+Z3AvM2hXczBybFJYL2JRQVh6Y3RyK3p0QW9CYmdlUTZvdi9HNTFsbitEWEVPMGJpUG9La1hRb21Z
+Q2dVblg2V2cmIzEzOwp4NnRUMHRDblNRVmdrYWovNGtjRmlzcC9OdW5XQ2d3REI2b1pLV3R0VmtD
+bkNETUZBY0k5Wmw2QzRtOUlQQ2tOZUJybVQ4ZDdQWGZBJiMxMzsKUDRISzQvK0JXT0xIeTN2ckxC
+SndjdEpoTnB1MGRWUE5ZQXBweDlZMmlYTXhKMTkxMkIrSlZLVTdSWk1hWGFQVU9YdWZMVHRLSVZt
+USYjMTM7CjgzVW85S2FDMGl3SFF4NCtsVlA0SXFwSStWN1p2WkNkVHprZ0RRU3FzYTlqMHRMUzE4
+YU5vYzN6M3BFYU5yVEhhcXk3V21lclFXbkkmIzEzOwpXeHdaRW0rVnRnVkN2dUVLa0FLUExqRTV2
+bkhsU2hOWHAxWS9OY01kelYvRWhZVUpXbmIzNGZ3d3B4cjdpVUhWU2VjL3Y2dExYa3lHJiMxMzsK
+V0VnNUdnT2FhbURiTmV2QUs0dXNEVTBlRkZQY1RmVnZNYUZJU2hLL05aeWxPeGRNdWNlY0hWa05W
+enNDOExnbDR3NFQ3YjNPU0o5TiYjMTM7CkNuWWlCTTNlOW5hTExiYllNa3JOZ2hUelMyb21MRDI5
+dU5vSjdSQmxBWHF6VmtIcHlBRVVsb05qZjhkOEs2Rlp5ek1nVjJDY2REWT08L2RzOlNpZ25hdHVy
+ZVZhbHVlPjxkczpLZXlJbmZvIElkPSJfZGI0OWI5YjgtYWU4My00NDc0LTliOGEtZTgwOTg0ZTc4
+ZTFlIj48ZHM6WDUwOURhdGE+PGRzOlg1MDlDZXJ0aWZpY2F0ZT5NSUlIWHpDQ0JVZWdBd0lCQWdJ
+VVhxSS92ZDE4Q2FnOThvTnBkelY3Qml5LzZFQXdEUVlKS29aSWh2Y05BUUVOQlFBd2ZERUxNQWtH
+JiMxMzsKQTFVRUJoTUNWVk14UERBNkJnTlZCQW9NTTBsdWRHVnlibVYwSUVOdmNuQnZjbUYwYVc5
+dUlHWnZjaUJCYzNOcFoyNWxaQ0JPWVcxbCYjMTM7CmN5QmhibVFnVG5WdFltVnljekV2TUMwR0Ex
+VUVBd3dtU1VOQlRrNGdWSEpoWkdWdFlYSnJJRU5zWldGeWFXNW5hRzkxYzJVZ1VHbHMmIzEzOwpi
+M1FnUTBFd0hoY05Nakl4TVRFMk1UTXlPRFU1V2hjTk1qY3hNVEUxTVRNeU9EVTVXakNCMERFTE1B
+a0dBMVVFQmhNQ1FrVXhFVEFQJiMxMzsKQmdOVkJBZ1RDRUp5ZFhOelpXeHpNUkl3RUFZRFZRUUhF
+d2xXYVd4MmIyOXlaR1V4TXpBeEJnTlZCQW9US2tSbGJHOXBkSFJsSUVOdiYjMTM7CmJuTjFiSFJw
+Ym1jZ1lXNWtJRUZrZG1semIzSjVJRU5XUWtFdlUwTlNUREUrTUR3R0ExVUVBeE0xU1VOQlRrNGdW
+RTFEU0NCQmRYUm8mIzEzOwpiM0pwZW1Wa0lGUnlZV1JsYldGeWF5QlFhV3h2ZENCV1lXeHBaR0Yw
+YjNJZ1ZtRnNhV1F4SlRBakJna3Foa2lHOXcwQkNRRVdGbUpsJiMxMzsKZEcxamFITnRaRUJrWld4
+dmFYUjBaUzVqYjIwd2dnSWlNQTBHQ1NxR1NJYjNEUUVCQVFVQUE0SUNEd0F3Z2dJS0FvSUNBUUM2
+Rkp3eiYjMTM7CktxUVZYNmZHMy9FTFJTR1dWOUdyS2FGTUttaFdJeGVwd1JaTjZNeE1xa2Q1RG5Z
+ZmlUK1dwOThqRWtxZ1R4MlVNYjlxdWdjR05WNmcmIzEzOwozNS9DclFiL0YvbXozQzRzZkxOdURw
+U3FLOVFGOCtwYVRINmhRbXJPcHFWK1VUdmRqOVNNZ0tHeUZpelM4OENEV014NHczaTRGQUtlJiMx
+MzsKNk5Sc0pSR1RBdEtEdU1IY0E0c2owOEdqZTNsUFdjZ0Z2Y1FORFZlRUJUdU9IQkcrUmhqN1Yx
+SmlOR1AvNGVwVFhURlhnUEZEZ2V6MyYjMTM7CllBZnhxcGJ1TzRUWDZiYllkazJudk1MRnZMRU5r
+Q0ZZdWxuWVB6Z25FQkdTTUtJYUFJbGIrc2NIQ3ZXZ1dqMlRMZ3doMkdKTmN6Vk0mIzEzOwoxTFBN
+cUdTK1VraTlNaDc5ODIyL3hvYXI0OTh4RHgyWXgvOHN3Z0VOTFNnQ3NRQVc4bk1nd1duNkFiWWwy
+UkFCWHVyYXlGc240UDFSJiMxMzsKdVFObVVwL3FyUktSdlNKcjFPTGtIWmZGVGNTWVFhVml1TVlQ
+WHpHejh0bU1MbG1JL0I2QUNINEF3Uk1kbll2Rk8zS0kxUkJuUEtJZCYjMTM7Cnd3ZlVwWjVJVElw
+YkE3Q0dnVHgxcXh0TTF3SVVyN3BIZUtQNmpWZTNrZERMZysvQloyeE1FdEJrNWE4WTdCNHYzeHdI
+WEdUdlY4bU4mIzEzOwowQWcvU3lUL1FVeUVSaFhVeUFOMitFd1orU1FDVXlOZnppb1dRODc4ZUd5
+a1UrNDYrQmJnSTNJSXIzNlhLUHdtenQwU1orS0kzdG5GJiMxMzsKVGxuOW1YMEtDMGlkb2o1eWt6
+UG9DL01JZWQwc3A0VGlneEViV054N0VGODBQdlIvRERFd1ZQRUVra2p5NjNYRnVseGlDUUlEQVFB
+QiYjMTM7Cm80SUJnakNDQVg0d0RBWURWUjBUQVFIL0JBSXdBREFPQmdOVkhROEJBZjhFQkFNQ0I0
+QXdIUVlEVlIwT0JCWUVGSG45czBERWEya3YmIzEzOwpnRS9lSU9Uc3FvVzg1TVhGTUlHNkJnTlZI
+U01FZ2JJd2dhK0FGRWQ3VDY1NlVaRzEwYitkTnVtR2Z6WVdCS2xGb1lHQXBINHdmREVMJiMxMzsK
+TUFrR0ExVUVCaE1DVlZNeFBEQTZCZ05WQkFvTU0wbHVkR1Z5Ym1WMElFTnZjbkJ2Y21GMGFXOXVJ
+R1p2Y2lCQmMzTnBaMjVsWkNCTyYjMTM7CllXMWxjeUJoYm1RZ1RuVnRZbVZ5Y3pFdk1DMEdBMVVF
+QXd3bVNVTkJUazRnVkhKaFpHVnRZWEpySUVOc1pXRnlhVzVuYUc5MWMyVWcmIzEzOwpVR2xzYjNR
+Z1EwR0NGSHBxYlRGZUpjUHRVQzlYdXVQS1BzTHdEUitNTURRR0ExVWRId1F0TUNzd0thQW5vQ1dH
+STJoMGRIQTZMeTlqJiMxMzsKY213dWFXTmhibTR1YjNKbkwzUnRZMmhmY0dsc2IzUXVZM0pzTUV3
+R0ExVWRJQVJGTUVNd0VBWU9Ld1lCQkFHQ3lSc0JCWU03REFvdyYjMTM7Ckx3WUlLd1lCQlFVSEFn
+RXdJekFoQmdnckJnRUZCUWNDQVJZVmFIUjBjSE02THk5amNITXVhV05oYm00dWIzSm5NQTBHQ1Nx
+R1NJYjMmIzEzOwpEUUVCRFFVQUE0SUNBUUJkU2F0NTZ1ZWpMbkFqRklGOTVkallXSTZzLy9ONllY
+eHNyck1rR0JQOEVlelB5aExoNmF3UDR6N1E5UUFJJiMxMzsKUVprWW94cmwvMXkwK2J5VjJxblRV
+VUNMUnBLL0JEcC9oY2Z3UGZLQ0EvMlJRQ0hKcmI2K3owZW5EUEZSSzBOS213T2NkbEd0VWswbSYj
+MTM7ClBnV0dTS3R1d1ZzUEFoVERKdWhvc1pPaGtOZituU09PSHJRT24xRTJyek9yZC9rUWxxaUN3
+Ukg5Nzk2TnBUQStIU01mT29iSkVFUHEmIzEzOwp0cEY3UDVxYnd0bDk1VWE1T3A0QWhhNzBISGZV
+RlM0Qk9RS0xCVmZNWmRPUitpUG9oNU93QUsraHRZa0ZDRzlQMldIdTd3ZjhFQytXJiMxMzsKN2s5
+Nmd2VGQ4eEU3b3VvYWJUMng2WWZZcUVsUEhpVS9JTTlnVnpXV0wvc3ZZRHlTVnVvRndCakROTjFj
+ZHEwcU9ZUjF5dVMxYy85RCYjMTM7CkZSN2VvN0dGRUN5K1RCZDdJaUtSZkJWZVlHT09QTW5vRmZ4
+UkxXcnBzV05ud0Q3bGtQa0xDZ0ZDays4eUVjT1JnNjI1bW82NXo0eTYmIzEzOwpKNEs4Zm9kYTdx
+d21YTlAzUlMxOG9uNkJIdDhsUStiWGdPSG14SUhrMGFPMHFORHFndkxyMkZseUxHSkdpRU1ScURN
+TVI2L2EwNmJ0JiMxMzsKa25VTUhsN0NxTWZqSWtqUDRWTk55R1BkSmd3Vmsya2ViOXVORnZKQ3hU
+K00yZkdYUTFOYkpOZnR2NU1nU3NwOU4xeSt4NmdBM0VodyYjMTM7CnlIbG1KQjRZTXRvOHRUVjFp
+ODR4UFh4aTJDQWVEYUdEdXdvc3Q4WVVDU2pxN1JDSzh0R2NhQVlya1hRWTJ5UWZYM2N3RHNFeFJx
+VlcmIzEzOwp5cmp5UnQrTjZtSzk5UT09PC9kczpYNTA5Q2VydGlmaWNhdGU+PC9kczpYNTA5RGF0
+YT48L2RzOktleUluZm8+PC9kczpTaWduYXR1cmU+PC9zbWQ6c2lnbmVkTWFyaz4K
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Holder-English/Trademark-Holder-English-Revoked.smd b/core/src/test/resources/google/registry/tmch/idn/Holder-English/Trademark-Holder-English-Revoked.smd
new file mode 100644
index 000000000..a1658d61e
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Holder-English/Trademark-Holder-English-Revoked.smd
@@ -0,0 +1,121 @@
+Marks: Test & Validate
+smdID: 000000541669081776937-65535
+U-labels: test---validate, test--validate, test-et-validate, test-etvalidate, test-validate, testand-validate, testandvalidate, testet-validate, testetvalidate, testvalidate
+notBefore: 2022-11-22T01:49:36.937Z
+notAfter: 2027-10-21T08:12:19.525Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il9lYmFj
+MzE3NS05Mjk4LTQ4NjMtYjlmMy0xMmUzNzcyYjQyZGYiPjxzbWQ6aWQ+MDAwMDAwNTQxNjY5MDgx
+Nzc2OTM3LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMTo0OTozNi45MzdaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0yMVQwODoxMjoxOS41MjVaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
+cmFkZW1hcms+PG1hcms6aWQ+MDAwMTM2MTUwMzA1NjkwOTE1MDMwNTY5MDktMTwvbWFyazppZD48
+bWFyazptYXJrTmFtZT5UZXN0ICZhbXA7IFZhbGlkYXRlPC9tYXJrOm1hcmtOYW1lPjxtYXJrOmhv
+bGRlciBlbnRpdGxlbWVudD0ib3duZXIiPjxtYXJrOm5hbWU+RnJhbmsgV2hpdGU8L21hcms6bmFt
+ZT48bWFyazpvcmc+VGVzdCBPcmdhbml6YXRpb248L21hcms6b3JnPjxtYXJrOmFkZHI+PG1hcms6
+c3RyZWV0Pldlc3QgQXJxdWVzIEF2ZW51ZSAxMDEgPC9tYXJrOnN0cmVldD48bWFyazpjaXR5PlN1
+bm55dmFsZTwvbWFyazpjaXR5PjxtYXJrOnNwPkNBPC9tYXJrOnNwPjxtYXJrOnBjPjEwMDIzLTMy
+NDE8L21hcms6cGM+PG1hcms6Y2M+VVM8L21hcms6Y2M+PC9tYXJrOmFkZHI+PG1hcms6dm9pY2U+
+KzEuMzAxNDU1NjYwMDwvbWFyazp2b2ljZT48bWFyazpmYXg+KzEuMzAxNDU1NjYwMTwvbWFyazpm
+YXg+PG1hcms6ZW1haWw+aW5mb0BleGFtcGxlLmV4YW1wbGU8L21hcms6ZW1haWw+PC9tYXJrOmhv
+bGRlcj48bWFyazpqdXJpc2RpY3Rpb24+VVM8L21hcms6anVyaXNkaWN0aW9uPjxtYXJrOmNsYXNz
+PjE1PC9tYXJrOmNsYXNzPjxtYXJrOmxhYmVsPnRlc3QtLS12YWxpZGF0ZTwvbWFyazpsYWJlbD48
+bWFyazpsYWJlbD50ZXN0LS12YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0LWV0
+LXZhbGlkYXRlPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnRlc3QtZXR2YWxpZGF0ZTwvbWFyazps
+YWJlbD48bWFyazpsYWJlbD50ZXN0LXZhbGlkYXRlPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnRl
+c3RhbmQtdmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+dGVzdGFuZHZhbGlkYXRlPC9t
+YXJrOmxhYmVsPjxtYXJrOmxhYmVsPnRlc3RldC12YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazps
+YWJlbD50ZXN0ZXR2YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0dmFsaWRhdGU8
+L21hcms6bGFiZWw+PG1hcms6Z29vZHNBbmRTZXJ2aWNlcz5ndWl0YXI8L21hcms6Z29vZHNBbmRT
+ZXJ2aWNlcz48bWFyazpyZWdOdW0+MTIzNDwvbWFyazpyZWdOdW0+PG1hcms6cmVnRGF0ZT4yMDEz
+LTAxLTAxVDAwOjAwOjAwLjAwMFo8L21hcms6cmVnRGF0ZT48bWFyazpleERhdGU+MjAxNC0xMS0w
+NVQwMDowMDowMC4wMDBaPC9tYXJrOmV4RGF0ZT48L21hcms6dHJhZGVtYXJrPjwvbWFyazptYXJr
+PjxkczpTaWduYXR1cmUgeG1sbnM6ZHM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1sZHNp
+ZyMiIElkPSJfYTRkZjcyNzktNzZlYi00NTI2LWI0YjItMDMyN2IzNTJjMDZhIj48ZHM6U2lnbmVk
+SW5mbz48ZHM6Q2Fub25pY2FsaXphdGlvbk1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMu
+b3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjxkczpTaWduYXR1cmVNZXRob2QgQWxnb3JpdGht
+PSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGRzaWctbW9yZSNyc2Etc2hhMjU2Ii8+PGRz
+OlJlZmVyZW5jZSBVUkk9IiNfZWJhYzMxNzUtOTI5OC00ODYzLWI5ZjMtMTJlMzc3MmI0MmRmIj48
+ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcv
+MjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48ZHM6VHJhbnNmb3JtIEFsZ29y
+aXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFu
+c2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAx
+LzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+aS9JUHVxNllwNVh5UHloeWp4a1po
+VFJUOUgvZzBhc2d5cVZTR2psWE1BMD08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNlPjxk
+czpSZWZlcmVuY2UgVVJJPSIjX2I5YjA1MmRiLTE4MzktNDg0ZC04MzViLTIyMjM4MThmNTBhYyI+
+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3Jn
+LzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6RGlnZXN0TWV0aG9k
+IEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxlbmMjc2hhMjU2Ii8+PGRz
+OkRpZ2VzdFZhbHVlPmRUazE2M1huNW9qT3REOEFLVGtCL2ozMlA5dXNFN0U0T05KbjI3YWZLQWs9
+PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48L2RzOlNpZ25lZEluZm8+PGRzOlNpZ25h
+dHVyZVZhbHVlIElkPSJfMzE1MDliYjEtZWIyOC00ZDY1LWI5MjEtMjRmY2UzZWEwNDc3Ij5jZVNj
+V1lPbDBVK25POXFKczJoaGkrZC9CbkVxYy80cllwNktRNmVJV3dCYlVISTIvc24zRkM4aWdhQWRM
+TWZISXVzdGhsU0ZZQTZUJiMxMzsKSDZBa0t6R3pOT2RjZnhPRFZNSldFdlA3MWc5eFZWMHkyZllE
+bUpiMFVSbjJOZFBScE9KR2QxS2lLWDRQV1FPMHQ2bXFUMVZjNEtjNSYjMTM7CkZZRG1hVjcwM3U1
+Z0ZKYVU3TlVuZldHQ0hNSGk3ZmZobzVHb0VraTR2clJuc2REWGVncWxzYW12T2RNd2I5OEVJSGd1
+VmtpSHh5Y0smIzEzOwppckVQZTZqemZYVmF6N25uTnFOc3VycTk4LzFtVk9MRXI2Zlg1YjU4Snk0
+Wlc4Smc5UkxEVHFsb0tvT1p0dHNNdkZ2RC9EL2lOaXczJiMxMzsKcnlqczFUc0RjU1hmZVNUSmIy
+YnYwNGg5WHFkZ0tlWUZNRVI3MTlVdWNzbUltK3luYlgwb3d0UTB0S2NmeUpIN1pJcWF4NkJVMEQ1
+QiYjMTM7Cktwb2VQTVFialo0V3l4RnhNMEFIeEVrbFRQMFNremN2YTNlcEh3NjdCaXYzSFlUOUcx
+dDZDUVJpY05rUUZaeEg4SERid3BhZm1nWlkmIzEzOwp0Zktray9TaDVvdzFrRGxmWVpmYmVCZGVP
+Y1Y2aDY5K05FdWhDalZNaTI5VjVDRWFDKzFQUStMWXIrSG9HSlB0WHBQblh1S1A5Q3hQJiMxMzsK
+Z3Nrblk3MTM3OUFHb1BKMEhWczNEcmw2WGtaRFRLb1AycDkwejNldTBxWTByNmpweEdOV1V4eGJj
+TVNUcVdFNjU3cEpJNzNzVUNaMSYjMTM7CllucUgrMU5icFcwKzlsclpUSm4rdVNVMzZVa3ZjWjAv
+NkFDZm92eVo2U0lTM0hqVzAvbmdDZHRsZWE1VU1PN2ZudVk0bWxtdkhMOD08L2RzOlNpZ25hdHVy
+ZVZhbHVlPjxkczpLZXlJbmZvIElkPSJfYjliMDUyZGItMTgzOS00ODRkLTgzNWItMjIyMzgxOGY1
+MGFjIj48ZHM6WDUwOURhdGE+PGRzOlg1MDlDZXJ0aWZpY2F0ZT5NSUlIWHpDQ0JVZWdBd0lCQWdJ
+VVhxSS92ZDE4Q2FnOThvTnBkelY3Qml5LzZFQXdEUVlKS29aSWh2Y05BUUVOQlFBd2ZERUxNQWtH
+JiMxMzsKQTFVRUJoTUNWVk14UERBNkJnTlZCQW9NTTBsdWRHVnlibVYwSUVOdmNuQnZjbUYwYVc5
+dUlHWnZjaUJCYzNOcFoyNWxaQ0JPWVcxbCYjMTM7CmN5QmhibVFnVG5WdFltVnljekV2TUMwR0Ex
+VUVBd3dtU1VOQlRrNGdWSEpoWkdWdFlYSnJJRU5zWldGeWFXNW5hRzkxYzJVZ1VHbHMmIzEzOwpi
+M1FnUTBFd0hoY05Nakl4TVRFMk1UTXlPRFU1V2hjTk1qY3hNVEUxTVRNeU9EVTVXakNCMERFTE1B
+a0dBMVVFQmhNQ1FrVXhFVEFQJiMxMzsKQmdOVkJBZ1RDRUp5ZFhOelpXeHpNUkl3RUFZRFZRUUhF
+d2xXYVd4MmIyOXlaR1V4TXpBeEJnTlZCQW9US2tSbGJHOXBkSFJsSUVOdiYjMTM7CmJuTjFiSFJw
+Ym1jZ1lXNWtJRUZrZG1semIzSjVJRU5XUWtFdlUwTlNUREUrTUR3R0ExVUVBeE0xU1VOQlRrNGdW
+RTFEU0NCQmRYUm8mIzEzOwpiM0pwZW1Wa0lGUnlZV1JsYldGeWF5QlFhV3h2ZENCV1lXeHBaR0Yw
+YjNJZ1ZtRnNhV1F4SlRBakJna3Foa2lHOXcwQkNRRVdGbUpsJiMxMzsKZEcxamFITnRaRUJrWld4
+dmFYUjBaUzVqYjIwd2dnSWlNQTBHQ1NxR1NJYjNEUUVCQVFVQUE0SUNEd0F3Z2dJS0FvSUNBUUM2
+Rkp3eiYjMTM7CktxUVZYNmZHMy9FTFJTR1dWOUdyS2FGTUttaFdJeGVwd1JaTjZNeE1xa2Q1RG5Z
+ZmlUK1dwOThqRWtxZ1R4MlVNYjlxdWdjR05WNmcmIzEzOwozNS9DclFiL0YvbXozQzRzZkxOdURw
+U3FLOVFGOCtwYVRINmhRbXJPcHFWK1VUdmRqOVNNZ0tHeUZpelM4OENEV014NHczaTRGQUtlJiMx
+MzsKNk5Sc0pSR1RBdEtEdU1IY0E0c2owOEdqZTNsUFdjZ0Z2Y1FORFZlRUJUdU9IQkcrUmhqN1Yx
+SmlOR1AvNGVwVFhURlhnUEZEZ2V6MyYjMTM7CllBZnhxcGJ1TzRUWDZiYllkazJudk1MRnZMRU5r
+Q0ZZdWxuWVB6Z25FQkdTTUtJYUFJbGIrc2NIQ3ZXZ1dqMlRMZ3doMkdKTmN6Vk0mIzEzOwoxTFBN
+cUdTK1VraTlNaDc5ODIyL3hvYXI0OTh4RHgyWXgvOHN3Z0VOTFNnQ3NRQVc4bk1nd1duNkFiWWwy
+UkFCWHVyYXlGc240UDFSJiMxMzsKdVFObVVwL3FyUktSdlNKcjFPTGtIWmZGVGNTWVFhVml1TVlQ
+WHpHejh0bU1MbG1JL0I2QUNINEF3Uk1kbll2Rk8zS0kxUkJuUEtJZCYjMTM7Cnd3ZlVwWjVJVElw
+YkE3Q0dnVHgxcXh0TTF3SVVyN3BIZUtQNmpWZTNrZERMZysvQloyeE1FdEJrNWE4WTdCNHYzeHdI
+WEdUdlY4bU4mIzEzOwowQWcvU3lUL1FVeUVSaFhVeUFOMitFd1orU1FDVXlOZnppb1dRODc4ZUd5
+a1UrNDYrQmJnSTNJSXIzNlhLUHdtenQwU1orS0kzdG5GJiMxMzsKVGxuOW1YMEtDMGlkb2o1eWt6
+UG9DL01JZWQwc3A0VGlneEViV054N0VGODBQdlIvRERFd1ZQRUVra2p5NjNYRnVseGlDUUlEQVFB
+QiYjMTM7Cm80SUJnakNDQVg0d0RBWURWUjBUQVFIL0JBSXdBREFPQmdOVkhROEJBZjhFQkFNQ0I0
+QXdIUVlEVlIwT0JCWUVGSG45czBERWEya3YmIzEzOwpnRS9lSU9Uc3FvVzg1TVhGTUlHNkJnTlZI
+U01FZ2JJd2dhK0FGRWQ3VDY1NlVaRzEwYitkTnVtR2Z6WVdCS2xGb1lHQXBINHdmREVMJiMxMzsK
+TUFrR0ExVUVCaE1DVlZNeFBEQTZCZ05WQkFvTU0wbHVkR1Z5Ym1WMElFTnZjbkJ2Y21GMGFXOXVJ
+R1p2Y2lCQmMzTnBaMjVsWkNCTyYjMTM7CllXMWxjeUJoYm1RZ1RuVnRZbVZ5Y3pFdk1DMEdBMVVF
+QXd3bVNVTkJUazRnVkhKaFpHVnRZWEpySUVOc1pXRnlhVzVuYUc5MWMyVWcmIzEzOwpVR2xzYjNR
+Z1EwR0NGSHBxYlRGZUpjUHRVQzlYdXVQS1BzTHdEUitNTURRR0ExVWRId1F0TUNzd0thQW5vQ1dH
+STJoMGRIQTZMeTlqJiMxMzsKY213dWFXTmhibTR1YjNKbkwzUnRZMmhmY0dsc2IzUXVZM0pzTUV3
+R0ExVWRJQVJGTUVNd0VBWU9Ld1lCQkFHQ3lSc0JCWU03REFvdyYjMTM7Ckx3WUlLd1lCQlFVSEFn
+RXdJekFoQmdnckJnRUZCUWNDQVJZVmFIUjBjSE02THk5amNITXVhV05oYm00dWIzSm5NQTBHQ1Nx
+R1NJYjMmIzEzOwpEUUVCRFFVQUE0SUNBUUJkU2F0NTZ1ZWpMbkFqRklGOTVkallXSTZzLy9ONllY
+eHNyck1rR0JQOEVlelB5aExoNmF3UDR6N1E5UUFJJiMxMzsKUVprWW94cmwvMXkwK2J5VjJxblRV
+VUNMUnBLL0JEcC9oY2Z3UGZLQ0EvMlJRQ0hKcmI2K3owZW5EUEZSSzBOS213T2NkbEd0VWswbSYj
+MTM7ClBnV0dTS3R1d1ZzUEFoVERKdWhvc1pPaGtOZituU09PSHJRT24xRTJyek9yZC9rUWxxaUN3
+Ukg5Nzk2TnBUQStIU01mT29iSkVFUHEmIzEzOwp0cEY3UDVxYnd0bDk1VWE1T3A0QWhhNzBISGZV
+RlM0Qk9RS0xCVmZNWmRPUitpUG9oNU93QUsraHRZa0ZDRzlQMldIdTd3ZjhFQytXJiMxMzsKN2s5
+Nmd2VGQ4eEU3b3VvYWJUMng2WWZZcUVsUEhpVS9JTTlnVnpXV0wvc3ZZRHlTVnVvRndCakROTjFj
+ZHEwcU9ZUjF5dVMxYy85RCYjMTM7CkZSN2VvN0dGRUN5K1RCZDdJaUtSZkJWZVlHT09QTW5vRmZ4
+UkxXcnBzV05ud0Q3bGtQa0xDZ0ZDays4eUVjT1JnNjI1bW82NXo0eTYmIzEzOwpKNEs4Zm9kYTdx
+d21YTlAzUlMxOG9uNkJIdDhsUStiWGdPSG14SUhrMGFPMHFORHFndkxyMkZseUxHSkdpRU1ScURN
+TVI2L2EwNmJ0JiMxMzsKa25VTUhsN0NxTWZqSWtqUDRWTk55R1BkSmd3Vmsya2ViOXVORnZKQ3hU
+K00yZkdYUTFOYkpOZnR2NU1nU3NwOU4xeSt4NmdBM0VodyYjMTM7CnlIbG1KQjRZTXRvOHRUVjFp
+ODR4UFh4aTJDQWVEYUdEdXdvc3Q4WVVDU2pxN1JDSzh0R2NhQVlya1hRWTJ5UWZYM2N3RHNFeFJx
+VlcmIzEzOwp5cmp5UnQrTjZtSzk5UT09PC9kczpYNTA5Q2VydGlmaWNhdGU+PC9kczpYNTA5RGF0
+YT48L2RzOktleUluZm8+PC9kczpTaWduYXR1cmU+PC9zbWQ6c2lnbmVkTWFyaz4K
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Holder-English/TreatyStatute-Holder-English-Active.smd b/core/src/test/resources/google/registry/tmch/idn/Holder-English/TreatyStatute-Holder-English-Active.smd
new file mode 100644
index 000000000..7d59b0941
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Holder-English/TreatyStatute-Holder-English-Active.smd
@@ -0,0 +1,121 @@
+Marks: Test & Validate
+smdID: 000000551669081837923-65535
+U-labels: test---validate, test--validate, test-and-validate, test-andvalidate, test-validate, testand-validate, testandvalidate, testvalidate
+notBefore: 2022-11-22T01:50:37.923Z
+notAfter: 2027-10-21T08:12:19.525Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il80YTBl
+NzUwMS0xYmJmLTQ4NzItYmE4Mi1lZjA5YTQ1ODhiYjQiPjxzbWQ6aWQ+MDAwMDAwNTUxNjY5MDgx
+ODM3OTIzLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMTo1MDozNy45MjNaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0yMVQwODoxMjoxOS41MjVaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
+cmVhdHlPclN0YXR1dGU+PG1hcms6aWQ+MDAwMTM2MTUwMzA1NzMwNTE1MDMwNTczMDUtMTwvbWFy
+azppZD48bWFyazptYXJrTmFtZT5UZXN0ICZhbXA7IFZhbGlkYXRlPC9tYXJrOm1hcmtOYW1lPjxt
+YXJrOmhvbGRlciBlbnRpdGxlbWVudD0ib3duZXIiPjxtYXJrOm5hbWU+RnJhbmsgV2hpdGU8L21h
+cms6bmFtZT48bWFyazpvcmc+VGVzdCBPcmdhbml6YXRpb248L21hcms6b3JnPjxtYXJrOmFkZHI+
+PG1hcms6c3RyZWV0Pldlc3QgQXJxdWVzIEF2ZW51ZSAxMDEgPC9tYXJrOnN0cmVldD48bWFyazpj
+aXR5PlN1bm55dmFsZTwvbWFyazpjaXR5PjxtYXJrOnNwPkNBPC9tYXJrOnNwPjxtYXJrOnBjPjEw
+MDIzLTMyNDE8L21hcms6cGM+PG1hcms6Y2M+VVM8L21hcms6Y2M+PC9tYXJrOmFkZHI+PG1hcms6
+dm9pY2U+KzEuMzAxNDU1NjYwMDwvbWFyazp2b2ljZT48bWFyazpmYXg+KzEuMzAxNDU1NjYwMTwv
+bWFyazpmYXg+PG1hcms6ZW1haWw+aW5mb0BleGFtcGxlLmV4YW1wbGU8L21hcms6ZW1haWw+PC9t
+YXJrOmhvbGRlcj48bWFyazpwcm90ZWN0aW9uPjxtYXJrOmNjPlVTPC9tYXJrOmNjPjxtYXJrOnJ1
+bGluZz5VUzwvbWFyazpydWxpbmc+PC9tYXJrOnByb3RlY3Rpb24+PG1hcms6bGFiZWw+dGVzdC0t
+LXZhbGlkYXRlPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnRlc3QtLXZhbGlkYXRlPC9tYXJrOmxh
+YmVsPjxtYXJrOmxhYmVsPnRlc3QtYW5kLXZhbGlkYXRlPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVs
+PnRlc3QtYW5kdmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+dGVzdC12YWxpZGF0ZTwv
+bWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0YW5kLXZhbGlkYXRlPC9tYXJrOmxhYmVsPjxtYXJr
+OmxhYmVsPnRlc3RhbmR2YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0dmFsaWRh
+dGU8L21hcms6bGFiZWw+PG1hcms6Z29vZHNBbmRTZXJ2aWNlcz5ndWl0YXI8L21hcms6Z29vZHNB
+bmRTZXJ2aWNlcz48bWFyazpyZWZOdW0+MTIzNDwvbWFyazpyZWZOdW0+PG1hcms6cHJvRGF0ZT4y
+MDAwLTAxLTAxVDAwOjAwOjAwLjAwMFo8L21hcms6cHJvRGF0ZT48bWFyazp0aXRsZT5NdXNpY2Fs
+IGluc3RydW1lbnRzPC9tYXJrOnRpdGxlPjxtYXJrOmV4ZWNEYXRlPjIwMTMtMDItMDJUMDA6MDA6
+MDAuMDAwWjwvbWFyazpleGVjRGF0ZT48L21hcms6dHJlYXR5T3JTdGF0dXRlPjwvbWFyazptYXJr
+PjxkczpTaWduYXR1cmUgeG1sbnM6ZHM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1sZHNp
+ZyMiIElkPSJfZDg1ZGY2MzUtZGMxOC00OTE0LThiZDUtOGY5ZjExNjY1MDAxIj48ZHM6U2lnbmVk
+SW5mbz48ZHM6Q2Fub25pY2FsaXphdGlvbk1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMu
+b3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjxkczpTaWduYXR1cmVNZXRob2QgQWxnb3JpdGht
+PSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGRzaWctbW9yZSNyc2Etc2hhMjU2Ii8+PGRz
+OlJlZmVyZW5jZSBVUkk9IiNfNGEwZTc1MDEtMWJiZi00ODcyLWJhODItZWYwOWE0NTg4YmI0Ij48
+ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcv
+MjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48ZHM6VHJhbnNmb3JtIEFsZ29y
+aXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFu
+c2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAx
+LzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+YVhsSUdzTTIwZDk4blJNK3U5VTR0
+V09pOExucXBNM3BQNzAyUktsSXQwTT08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNlPjxk
+czpSZWZlcmVuY2UgVVJJPSIjX2IyMWE2NjJkLTI1OWMtNGUzMi05NGNmLWExNDZmMDk4NjczNSI+
+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3Jn
+LzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6RGlnZXN0TWV0aG9k
+IEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxlbmMjc2hhMjU2Ii8+PGRz
+OkRpZ2VzdFZhbHVlPmVUUkZCc29UV2Z4L3k5UlVPZzdObDY2bUN0YTVac2xxZFZXTC92elpwL1E9
+PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48L2RzOlNpZ25lZEluZm8+PGRzOlNpZ25h
+dHVyZVZhbHVlIElkPSJfMGIxNzJkZjYtZGIwMC00NDBlLTljNGQtNzZhYTU5YTczNTkyIj5GZ2Zy
+bEVCMURBK1dpVWZMTDFnbWVsbisvcnA5U3hKMFVFdVhFVjZqczJRWUhQWFZzWTlmbUpXbTVKdy9p
+SXREc0E5dE93ZFRabURSJiMxMzsKbjkyamRuZTQ2RnB3WUkzanBDa3JFQjg0cE9MU1FpQVVkYlFZ
+SDFCVEUyQU1wOU0reDljeGF1Zi9kcld3Y2ZmRkNYNThsVmdqV3lwTCYjMTM7Cjd5eGRkNGVFQnFU
+U2ZYMW94VDhFZkVpVXJWdVo4bGRWNGpLRTZwWTMzQkIvLzl1Tmc3SzFjNWtWYkJZQ3VJdklVcVJ5
+bHk4ZkxJSDImIzEzOwp3cXFjRU5Idm0wdU1Sdm9uWmtzYjNpdHhybEdQMDRYN0NBNFJaZW1GU3Ex
+RzIrUGl5MEFhSnppU3A0elBUWmt5TndQb0ZBRFQ1TWN3JiMxMzsKMGFIa0pBWUduTnpuQndwbWNh
+RGVtZnBQc3Q3aFFQTU55Wlp2QUU0d3kzTWxLK2JIaVRvUEVVMWFDbmtxMzB5MFdZSTR1NFcxSXRL
+ZyYjMTM7CkhDeGluRkZrMks3ckswWUE4VjJKNDdZa1YzVXI0S2lVdkx5T1lCUGsrMisxaFREUDZx
+R0F3bFBTR2FrbnBSaGxTNWlSVHpIZ2JKWlcmIzEzOwpxdFVhdjFMQmxtaGRuMFB1Z1ZWWlR1VUps
+NWovRXdodWJiaGdBQW8xUHJzaGNqaGpYaXphMm1oRmdDeXpHSE1HenB5WWZrTldDSzZoJiMxMzsK
+Y2szT1kzTThJeDVOTmJqNjNWeWhVbEIzeEs4WE1yUnlkUzhKRy9EaVRWYWQ2WkkyZlZEY2IrcUhF
+S3pxV05wQ2pmRStxZ0dmMkIxNCYjMTM7CnB4MzQrVVhtUlJYUjduVlpVZElCRlBJNWQ1QjBMbDdw
+U0lNL096VHNOUUY4ZzdOOTl5dmM3QkZzTXhGT0dKQXhQSCtnTHV4aG1Qaz08L2RzOlNpZ25hdHVy
+ZVZhbHVlPjxkczpLZXlJbmZvIElkPSJfYjIxYTY2MmQtMjU5Yy00ZTMyLTk0Y2YtYTE0NmYwOTg2
+NzM1Ij48ZHM6WDUwOURhdGE+PGRzOlg1MDlDZXJ0aWZpY2F0ZT5NSUlIWHpDQ0JVZWdBd0lCQWdJ
+VVhxSS92ZDE4Q2FnOThvTnBkelY3Qml5LzZFQXdEUVlKS29aSWh2Y05BUUVOQlFBd2ZERUxNQWtH
+JiMxMzsKQTFVRUJoTUNWVk14UERBNkJnTlZCQW9NTTBsdWRHVnlibVYwSUVOdmNuQnZjbUYwYVc5
+dUlHWnZjaUJCYzNOcFoyNWxaQ0JPWVcxbCYjMTM7CmN5QmhibVFnVG5WdFltVnljekV2TUMwR0Ex
+VUVBd3dtU1VOQlRrNGdWSEpoWkdWdFlYSnJJRU5zWldGeWFXNW5hRzkxYzJVZ1VHbHMmIzEzOwpi
+M1FnUTBFd0hoY05Nakl4TVRFMk1UTXlPRFU1V2hjTk1qY3hNVEUxTVRNeU9EVTVXakNCMERFTE1B
+a0dBMVVFQmhNQ1FrVXhFVEFQJiMxMzsKQmdOVkJBZ1RDRUp5ZFhOelpXeHpNUkl3RUFZRFZRUUhF
+d2xXYVd4MmIyOXlaR1V4TXpBeEJnTlZCQW9US2tSbGJHOXBkSFJsSUVOdiYjMTM7CmJuTjFiSFJw
+Ym1jZ1lXNWtJRUZrZG1semIzSjVJRU5XUWtFdlUwTlNUREUrTUR3R0ExVUVBeE0xU1VOQlRrNGdW
+RTFEU0NCQmRYUm8mIzEzOwpiM0pwZW1Wa0lGUnlZV1JsYldGeWF5QlFhV3h2ZENCV1lXeHBaR0Yw
+YjNJZ1ZtRnNhV1F4SlRBakJna3Foa2lHOXcwQkNRRVdGbUpsJiMxMzsKZEcxamFITnRaRUJrWld4
+dmFYUjBaUzVqYjIwd2dnSWlNQTBHQ1NxR1NJYjNEUUVCQVFVQUE0SUNEd0F3Z2dJS0FvSUNBUUM2
+Rkp3eiYjMTM7CktxUVZYNmZHMy9FTFJTR1dWOUdyS2FGTUttaFdJeGVwd1JaTjZNeE1xa2Q1RG5Z
+ZmlUK1dwOThqRWtxZ1R4MlVNYjlxdWdjR05WNmcmIzEzOwozNS9DclFiL0YvbXozQzRzZkxOdURw
+U3FLOVFGOCtwYVRINmhRbXJPcHFWK1VUdmRqOVNNZ0tHeUZpelM4OENEV014NHczaTRGQUtlJiMx
+MzsKNk5Sc0pSR1RBdEtEdU1IY0E0c2owOEdqZTNsUFdjZ0Z2Y1FORFZlRUJUdU9IQkcrUmhqN1Yx
+SmlOR1AvNGVwVFhURlhnUEZEZ2V6MyYjMTM7CllBZnhxcGJ1TzRUWDZiYllkazJudk1MRnZMRU5r
+Q0ZZdWxuWVB6Z25FQkdTTUtJYUFJbGIrc2NIQ3ZXZ1dqMlRMZ3doMkdKTmN6Vk0mIzEzOwoxTFBN
+cUdTK1VraTlNaDc5ODIyL3hvYXI0OTh4RHgyWXgvOHN3Z0VOTFNnQ3NRQVc4bk1nd1duNkFiWWwy
+UkFCWHVyYXlGc240UDFSJiMxMzsKdVFObVVwL3FyUktSdlNKcjFPTGtIWmZGVGNTWVFhVml1TVlQ
+WHpHejh0bU1MbG1JL0I2QUNINEF3Uk1kbll2Rk8zS0kxUkJuUEtJZCYjMTM7Cnd3ZlVwWjVJVElw
+YkE3Q0dnVHgxcXh0TTF3SVVyN3BIZUtQNmpWZTNrZERMZysvQloyeE1FdEJrNWE4WTdCNHYzeHdI
+WEdUdlY4bU4mIzEzOwowQWcvU3lUL1FVeUVSaFhVeUFOMitFd1orU1FDVXlOZnppb1dRODc4ZUd5
+a1UrNDYrQmJnSTNJSXIzNlhLUHdtenQwU1orS0kzdG5GJiMxMzsKVGxuOW1YMEtDMGlkb2o1eWt6
+UG9DL01JZWQwc3A0VGlneEViV054N0VGODBQdlIvRERFd1ZQRUVra2p5NjNYRnVseGlDUUlEQVFB
+QiYjMTM7Cm80SUJnakNDQVg0d0RBWURWUjBUQVFIL0JBSXdBREFPQmdOVkhROEJBZjhFQkFNQ0I0
+QXdIUVlEVlIwT0JCWUVGSG45czBERWEya3YmIzEzOwpnRS9lSU9Uc3FvVzg1TVhGTUlHNkJnTlZI
+U01FZ2JJd2dhK0FGRWQ3VDY1NlVaRzEwYitkTnVtR2Z6WVdCS2xGb1lHQXBINHdmREVMJiMxMzsK
+TUFrR0ExVUVCaE1DVlZNeFBEQTZCZ05WQkFvTU0wbHVkR1Z5Ym1WMElFTnZjbkJ2Y21GMGFXOXVJ
+R1p2Y2lCQmMzTnBaMjVsWkNCTyYjMTM7CllXMWxjeUJoYm1RZ1RuVnRZbVZ5Y3pFdk1DMEdBMVVF
+QXd3bVNVTkJUazRnVkhKaFpHVnRZWEpySUVOc1pXRnlhVzVuYUc5MWMyVWcmIzEzOwpVR2xzYjNR
+Z1EwR0NGSHBxYlRGZUpjUHRVQzlYdXVQS1BzTHdEUitNTURRR0ExVWRId1F0TUNzd0thQW5vQ1dH
+STJoMGRIQTZMeTlqJiMxMzsKY213dWFXTmhibTR1YjNKbkwzUnRZMmhmY0dsc2IzUXVZM0pzTUV3
+R0ExVWRJQVJGTUVNd0VBWU9Ld1lCQkFHQ3lSc0JCWU03REFvdyYjMTM7Ckx3WUlLd1lCQlFVSEFn
+RXdJekFoQmdnckJnRUZCUWNDQVJZVmFIUjBjSE02THk5amNITXVhV05oYm00dWIzSm5NQTBHQ1Nx
+R1NJYjMmIzEzOwpEUUVCRFFVQUE0SUNBUUJkU2F0NTZ1ZWpMbkFqRklGOTVkallXSTZzLy9ONllY
+eHNyck1rR0JQOEVlelB5aExoNmF3UDR6N1E5UUFJJiMxMzsKUVprWW94cmwvMXkwK2J5VjJxblRV
+VUNMUnBLL0JEcC9oY2Z3UGZLQ0EvMlJRQ0hKcmI2K3owZW5EUEZSSzBOS213T2NkbEd0VWswbSYj
+MTM7ClBnV0dTS3R1d1ZzUEFoVERKdWhvc1pPaGtOZituU09PSHJRT24xRTJyek9yZC9rUWxxaUN3
+Ukg5Nzk2TnBUQStIU01mT29iSkVFUHEmIzEzOwp0cEY3UDVxYnd0bDk1VWE1T3A0QWhhNzBISGZV
+RlM0Qk9RS0xCVmZNWmRPUitpUG9oNU93QUsraHRZa0ZDRzlQMldIdTd3ZjhFQytXJiMxMzsKN2s5
+Nmd2VGQ4eEU3b3VvYWJUMng2WWZZcUVsUEhpVS9JTTlnVnpXV0wvc3ZZRHlTVnVvRndCakROTjFj
+ZHEwcU9ZUjF5dVMxYy85RCYjMTM7CkZSN2VvN0dGRUN5K1RCZDdJaUtSZkJWZVlHT09QTW5vRmZ4
+UkxXcnBzV05ud0Q3bGtQa0xDZ0ZDays4eUVjT1JnNjI1bW82NXo0eTYmIzEzOwpKNEs4Zm9kYTdx
+d21YTlAzUlMxOG9uNkJIdDhsUStiWGdPSG14SUhrMGFPMHFORHFndkxyMkZseUxHSkdpRU1ScURN
+TVI2L2EwNmJ0JiMxMzsKa25VTUhsN0NxTWZqSWtqUDRWTk55R1BkSmd3Vmsya2ViOXVORnZKQ3hU
+K00yZkdYUTFOYkpOZnR2NU1nU3NwOU4xeSt4NmdBM0VodyYjMTM7CnlIbG1KQjRZTXRvOHRUVjFp
+ODR4UFh4aTJDQWVEYUdEdXdvc3Q4WVVDU2pxN1JDSzh0R2NhQVlya1hRWTJ5UWZYM2N3RHNFeFJx
+VlcmIzEzOwp5cmp5UnQrTjZtSzk5UT09PC9kczpYNTA5Q2VydGlmaWNhdGU+PC9kczpYNTA5RGF0
+YT48L2RzOktleUluZm8+PC9kczpTaWduYXR1cmU+PC9zbWQ6c2lnbmVkTWFyaz4K
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Holder-English/TreatyStatute-Holder-English-Revoked.smd b/core/src/test/resources/google/registry/tmch/idn/Holder-English/TreatyStatute-Holder-English-Revoked.smd
new file mode 100644
index 000000000..3a8d00307
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Holder-English/TreatyStatute-Holder-English-Revoked.smd
@@ -0,0 +1,121 @@
+Marks: Test & Validate
+smdID: 000000551669081780286-65535
+U-labels: test---validate, test--validate, test-and-validate, test-andvalidate, test-validate, testand-validate, testandvalidate, testvalidate
+notBefore: 2022-11-22T01:49:40.286Z
+notAfter: 2027-10-21T08:12:19.525Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il9mMGE0
+OTA0MS1iMzRhLTQ1NGItYjQwOC02Yjg4MGZiYmNlOGUiPjxzbWQ6aWQ+MDAwMDAwNTUxNjY5MDgx
+NzgwMjg2LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMTo0OTo0MC4yODZaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0yMVQwODoxMjoxOS41MjVaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
+cmVhdHlPclN0YXR1dGU+PG1hcms6aWQ+MDAwMTM2MTUwMzA1NzMwNTE1MDMwNTczMDUtMTwvbWFy
+azppZD48bWFyazptYXJrTmFtZT5UZXN0ICZhbXA7IFZhbGlkYXRlPC9tYXJrOm1hcmtOYW1lPjxt
+YXJrOmhvbGRlciBlbnRpdGxlbWVudD0ib3duZXIiPjxtYXJrOm5hbWU+RnJhbmsgV2hpdGU8L21h
+cms6bmFtZT48bWFyazpvcmc+VGVzdCBPcmdhbml6YXRpb248L21hcms6b3JnPjxtYXJrOmFkZHI+
+PG1hcms6c3RyZWV0Pldlc3QgQXJxdWVzIEF2ZW51ZSAxMDEgPC9tYXJrOnN0cmVldD48bWFyazpj
+aXR5PlN1bm55dmFsZTwvbWFyazpjaXR5PjxtYXJrOnNwPkNBPC9tYXJrOnNwPjxtYXJrOnBjPjEw
+MDIzLTMyNDE8L21hcms6cGM+PG1hcms6Y2M+VVM8L21hcms6Y2M+PC9tYXJrOmFkZHI+PG1hcms6
+dm9pY2U+KzEuMzAxNDU1NjYwMDwvbWFyazp2b2ljZT48bWFyazpmYXg+KzEuMzAxNDU1NjYwMTwv
+bWFyazpmYXg+PG1hcms6ZW1haWw+aW5mb0BleGFtcGxlLmV4YW1wbGU8L21hcms6ZW1haWw+PC9t
+YXJrOmhvbGRlcj48bWFyazpwcm90ZWN0aW9uPjxtYXJrOmNjPlVTPC9tYXJrOmNjPjxtYXJrOnJ1
+bGluZz5VUzwvbWFyazpydWxpbmc+PC9tYXJrOnByb3RlY3Rpb24+PG1hcms6bGFiZWw+dGVzdC0t
+LXZhbGlkYXRlPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnRlc3QtLXZhbGlkYXRlPC9tYXJrOmxh
+YmVsPjxtYXJrOmxhYmVsPnRlc3QtYW5kLXZhbGlkYXRlPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVs
+PnRlc3QtYW5kdmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+dGVzdC12YWxpZGF0ZTwv
+bWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0YW5kLXZhbGlkYXRlPC9tYXJrOmxhYmVsPjxtYXJr
+OmxhYmVsPnRlc3RhbmR2YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0dmFsaWRh
+dGU8L21hcms6bGFiZWw+PG1hcms6Z29vZHNBbmRTZXJ2aWNlcz5ndWl0YXI8L21hcms6Z29vZHNB
+bmRTZXJ2aWNlcz48bWFyazpyZWZOdW0+MTIzNDwvbWFyazpyZWZOdW0+PG1hcms6cHJvRGF0ZT4y
+MDAwLTAxLTAxVDAwOjAwOjAwLjAwMFo8L21hcms6cHJvRGF0ZT48bWFyazp0aXRsZT5NdXNpY2Fs
+IGluc3RydW1lbnRzPC9tYXJrOnRpdGxlPjxtYXJrOmV4ZWNEYXRlPjIwMTMtMDItMDJUMDA6MDA6
+MDAuMDAwWjwvbWFyazpleGVjRGF0ZT48L21hcms6dHJlYXR5T3JTdGF0dXRlPjwvbWFyazptYXJr
+PjxkczpTaWduYXR1cmUgeG1sbnM6ZHM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1sZHNp
+ZyMiIElkPSJfOTI1ZjVhNDEtMTI3YS00ODhlLWI0ODctNTRhNGViNzM1ZGNlIj48ZHM6U2lnbmVk
+SW5mbz48ZHM6Q2Fub25pY2FsaXphdGlvbk1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMu
+b3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjxkczpTaWduYXR1cmVNZXRob2QgQWxnb3JpdGht
+PSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGRzaWctbW9yZSNyc2Etc2hhMjU2Ii8+PGRz
+OlJlZmVyZW5jZSBVUkk9IiNfZjBhNDkwNDEtYjM0YS00NTRiLWI0MDgtNmI4ODBmYmJjZThlIj48
+ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcv
+MjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48ZHM6VHJhbnNmb3JtIEFsZ29y
+aXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFu
+c2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAx
+LzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+R1kxL0luRGVrN2hVTml3cVRLc3lG
+dkJyUnczVzIwUDZqVlF5QlZobm5ZWT08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNlPjxk
+czpSZWZlcmVuY2UgVVJJPSIjXzM4YjIyMTA2LTA4NGEtNDhjZi1hMzU1LWM4YTg3YjU4OTg3YSI+
+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3Jn
+LzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6RGlnZXN0TWV0aG9k
+IEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxlbmMjc2hhMjU2Ii8+PGRz
+OkRpZ2VzdFZhbHVlPnNoMGh6ZkZkQTFENnBrcFEyMHFXR082cjN0S05iZUQ2T3U0UHRCK0pSYkE9
+PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48L2RzOlNpZ25lZEluZm8+PGRzOlNpZ25h
+dHVyZVZhbHVlIElkPSJfNjg3OTA5Y2QtN2FjNS00ODZjLTgwNmItZWY2YjFiNGMzODY5Ij5LVkZI
+SEU5V2NDblczTHdPYVBVMEd4K2RML0IrOGIrNlFWRkthUXBvckVTTjBSTFEwZlF0ODM4K0FyT2Np
+TXJHYThTcUZ5TEpPYmdUJiMxMzsKWlFVTGpianRPZkdSQ3R2KzdKUjN3ME5OaThMelBIWFd0cXBL
+Zkp2amNVM0xUWWEyOHZCdmtteklzY0NuNVU3RGJRZDN4SUJXRGc2WSYjMTM7Ck5KL3RyTGRxRkow
+eWFGNEdBMm9wUUM0b2E0SUlTS3ZuUFdmb29sZWswbEFVYXpMT0R5VXUzN0x4N1pseG5XQUtYN2U4
+N1htK2NyS0QmIzEzOwpXWXo4WmRGVU1ELzFZdnZ1RUhmRDNvZldqTk5udFlFZWFtbDRRNzRpVmVM
+bjBVZnQybXl3OVA2ZEFETXovOW9BMWxaN1kwSyswdC9LJiMxMzsKK2w0S3VZdlZyV0MvZDZyVDVa
+NjZkSHNuZVNJbTk4NDh2eVlOeUNTSldtVzVtUnRwQUlvYkdvZUg4RFZ4SzYxZVF6SW5FT1Qzcksr
+VCYjMTM7CjlYdVpKOGZJcURpaGxvcXBnZTFqSEdHTnpyUGhDUDUrM0p5MjFHSjJ2Wm42R21WdE4v
+b205NzB5RXl3SmVxaW5weEdvbHVkMnYvRk0mIzEzOwpZWE1QS0lsQXZyUUxNMWZtSzlSaUFQYTVR
+dTk5ZEdPMGlpcVZ2TGUrekFidUx2YnZPOVlTYi8wVVZ6cGk5N01BQmdodTV0NXJpVUthJiMxMzsK
+ZnROVVV0QXpLNVNuK3dBWUd6L2l6YmlDdm5MVjJLQmFzSGwvYURVNmNnZ0hSNVNreXRqL1RWNDZ6
+cWVmZWtheHlnb2tNNHd4ZWxEUCYjMTM7ClI1MHAvK2FyUE42VE9KWFVoRXpHV2p2bGN6OTdiSmU5
+NnkxUnFnYjArNm9JQ1UvNU9jMWtCZmlrSUp3Y3Vra1ZvOGZtNDN6SHphTT08L2RzOlNpZ25hdHVy
+ZVZhbHVlPjxkczpLZXlJbmZvIElkPSJfMzhiMjIxMDYtMDg0YS00OGNmLWEzNTUtYzhhODdiNTg5
+ODdhIj48ZHM6WDUwOURhdGE+PGRzOlg1MDlDZXJ0aWZpY2F0ZT5NSUlIWHpDQ0JVZWdBd0lCQWdJ
+VVhxSS92ZDE4Q2FnOThvTnBkelY3Qml5LzZFQXdEUVlKS29aSWh2Y05BUUVOQlFBd2ZERUxNQWtH
+JiMxMzsKQTFVRUJoTUNWVk14UERBNkJnTlZCQW9NTTBsdWRHVnlibVYwSUVOdmNuQnZjbUYwYVc5
+dUlHWnZjaUJCYzNOcFoyNWxaQ0JPWVcxbCYjMTM7CmN5QmhibVFnVG5WdFltVnljekV2TUMwR0Ex
+VUVBd3dtU1VOQlRrNGdWSEpoWkdWdFlYSnJJRU5zWldGeWFXNW5hRzkxYzJVZ1VHbHMmIzEzOwpi
+M1FnUTBFd0hoY05Nakl4TVRFMk1UTXlPRFU1V2hjTk1qY3hNVEUxTVRNeU9EVTVXakNCMERFTE1B
+a0dBMVVFQmhNQ1FrVXhFVEFQJiMxMzsKQmdOVkJBZ1RDRUp5ZFhOelpXeHpNUkl3RUFZRFZRUUhF
+d2xXYVd4MmIyOXlaR1V4TXpBeEJnTlZCQW9US2tSbGJHOXBkSFJsSUVOdiYjMTM7CmJuTjFiSFJw
+Ym1jZ1lXNWtJRUZrZG1semIzSjVJRU5XUWtFdlUwTlNUREUrTUR3R0ExVUVBeE0xU1VOQlRrNGdW
+RTFEU0NCQmRYUm8mIzEzOwpiM0pwZW1Wa0lGUnlZV1JsYldGeWF5QlFhV3h2ZENCV1lXeHBaR0Yw
+YjNJZ1ZtRnNhV1F4SlRBakJna3Foa2lHOXcwQkNRRVdGbUpsJiMxMzsKZEcxamFITnRaRUJrWld4
+dmFYUjBaUzVqYjIwd2dnSWlNQTBHQ1NxR1NJYjNEUUVCQVFVQUE0SUNEd0F3Z2dJS0FvSUNBUUM2
+Rkp3eiYjMTM7CktxUVZYNmZHMy9FTFJTR1dWOUdyS2FGTUttaFdJeGVwd1JaTjZNeE1xa2Q1RG5Z
+ZmlUK1dwOThqRWtxZ1R4MlVNYjlxdWdjR05WNmcmIzEzOwozNS9DclFiL0YvbXozQzRzZkxOdURw
+U3FLOVFGOCtwYVRINmhRbXJPcHFWK1VUdmRqOVNNZ0tHeUZpelM4OENEV014NHczaTRGQUtlJiMx
+MzsKNk5Sc0pSR1RBdEtEdU1IY0E0c2owOEdqZTNsUFdjZ0Z2Y1FORFZlRUJUdU9IQkcrUmhqN1Yx
+SmlOR1AvNGVwVFhURlhnUEZEZ2V6MyYjMTM7CllBZnhxcGJ1TzRUWDZiYllkazJudk1MRnZMRU5r
+Q0ZZdWxuWVB6Z25FQkdTTUtJYUFJbGIrc2NIQ3ZXZ1dqMlRMZ3doMkdKTmN6Vk0mIzEzOwoxTFBN
+cUdTK1VraTlNaDc5ODIyL3hvYXI0OTh4RHgyWXgvOHN3Z0VOTFNnQ3NRQVc4bk1nd1duNkFiWWwy
+UkFCWHVyYXlGc240UDFSJiMxMzsKdVFObVVwL3FyUktSdlNKcjFPTGtIWmZGVGNTWVFhVml1TVlQ
+WHpHejh0bU1MbG1JL0I2QUNINEF3Uk1kbll2Rk8zS0kxUkJuUEtJZCYjMTM7Cnd3ZlVwWjVJVElw
+YkE3Q0dnVHgxcXh0TTF3SVVyN3BIZUtQNmpWZTNrZERMZysvQloyeE1FdEJrNWE4WTdCNHYzeHdI
+WEdUdlY4bU4mIzEzOwowQWcvU3lUL1FVeUVSaFhVeUFOMitFd1orU1FDVXlOZnppb1dRODc4ZUd5
+a1UrNDYrQmJnSTNJSXIzNlhLUHdtenQwU1orS0kzdG5GJiMxMzsKVGxuOW1YMEtDMGlkb2o1eWt6
+UG9DL01JZWQwc3A0VGlneEViV054N0VGODBQdlIvRERFd1ZQRUVra2p5NjNYRnVseGlDUUlEQVFB
+QiYjMTM7Cm80SUJnakNDQVg0d0RBWURWUjBUQVFIL0JBSXdBREFPQmdOVkhROEJBZjhFQkFNQ0I0
+QXdIUVlEVlIwT0JCWUVGSG45czBERWEya3YmIzEzOwpnRS9lSU9Uc3FvVzg1TVhGTUlHNkJnTlZI
+U01FZ2JJd2dhK0FGRWQ3VDY1NlVaRzEwYitkTnVtR2Z6WVdCS2xGb1lHQXBINHdmREVMJiMxMzsK
+TUFrR0ExVUVCaE1DVlZNeFBEQTZCZ05WQkFvTU0wbHVkR1Z5Ym1WMElFTnZjbkJ2Y21GMGFXOXVJ
+R1p2Y2lCQmMzTnBaMjVsWkNCTyYjMTM7CllXMWxjeUJoYm1RZ1RuVnRZbVZ5Y3pFdk1DMEdBMVVF
+QXd3bVNVTkJUazRnVkhKaFpHVnRZWEpySUVOc1pXRnlhVzVuYUc5MWMyVWcmIzEzOwpVR2xzYjNR
+Z1EwR0NGSHBxYlRGZUpjUHRVQzlYdXVQS1BzTHdEUitNTURRR0ExVWRId1F0TUNzd0thQW5vQ1dH
+STJoMGRIQTZMeTlqJiMxMzsKY213dWFXTmhibTR1YjNKbkwzUnRZMmhmY0dsc2IzUXVZM0pzTUV3
+R0ExVWRJQVJGTUVNd0VBWU9Ld1lCQkFHQ3lSc0JCWU03REFvdyYjMTM7Ckx3WUlLd1lCQlFVSEFn
+RXdJekFoQmdnckJnRUZCUWNDQVJZVmFIUjBjSE02THk5amNITXVhV05oYm00dWIzSm5NQTBHQ1Nx
+R1NJYjMmIzEzOwpEUUVCRFFVQUE0SUNBUUJkU2F0NTZ1ZWpMbkFqRklGOTVkallXSTZzLy9ONllY
+eHNyck1rR0JQOEVlelB5aExoNmF3UDR6N1E5UUFJJiMxMzsKUVprWW94cmwvMXkwK2J5VjJxblRV
+VUNMUnBLL0JEcC9oY2Z3UGZLQ0EvMlJRQ0hKcmI2K3owZW5EUEZSSzBOS213T2NkbEd0VWswbSYj
+MTM7ClBnV0dTS3R1d1ZzUEFoVERKdWhvc1pPaGtOZituU09PSHJRT24xRTJyek9yZC9rUWxxaUN3
+Ukg5Nzk2TnBUQStIU01mT29iSkVFUHEmIzEzOwp0cEY3UDVxYnd0bDk1VWE1T3A0QWhhNzBISGZV
+RlM0Qk9RS0xCVmZNWmRPUitpUG9oNU93QUsraHRZa0ZDRzlQMldIdTd3ZjhFQytXJiMxMzsKN2s5
+Nmd2VGQ4eEU3b3VvYWJUMng2WWZZcUVsUEhpVS9JTTlnVnpXV0wvc3ZZRHlTVnVvRndCakROTjFj
+ZHEwcU9ZUjF5dVMxYy85RCYjMTM7CkZSN2VvN0dGRUN5K1RCZDdJaUtSZkJWZVlHT09QTW5vRmZ4
+UkxXcnBzV05ud0Q3bGtQa0xDZ0ZDays4eUVjT1JnNjI1bW82NXo0eTYmIzEzOwpKNEs4Zm9kYTdx
+d21YTlAzUlMxOG9uNkJIdDhsUStiWGdPSG14SUhrMGFPMHFORHFndkxyMkZseUxHSkdpRU1ScURN
+TVI2L2EwNmJ0JiMxMzsKa25VTUhsN0NxTWZqSWtqUDRWTk55R1BkSmd3Vmsya2ViOXVORnZKQ3hU
+K00yZkdYUTFOYkpOZnR2NU1nU3NwOU4xeSt4NmdBM0VodyYjMTM7CnlIbG1KQjRZTXRvOHRUVjFp
+ODR4UFh4aTJDQWVEYUdEdXdvc3Q4WVVDU2pxN1JDSzh0R2NhQVlya1hRWTJ5UWZYM2N3RHNFeFJx
+VlcmIzEzOwp5cmp5UnQrTjZtSzk5UT09PC9kczpYNTA5Q2VydGlmaWNhdGU+PC9kczpYNTA5RGF0
+YT48L2RzOktleUluZm8+PC9kczpTaWduYXR1cmU+PC9zbWQ6c2lnbmVkTWFyaz4K
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Holder-French/Court-Holder-French-Active.smd b/core/src/test/resources/google/registry/tmch/idn/Holder-French/Court-Holder-French-Active.smd
new file mode 100644
index 000000000..59aaa3ab7
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Holder-French/Court-Holder-French-Active.smd
@@ -0,0 +1,121 @@
+Marks: Essai & évaluation
+smdID: 000000631669081980674-65535
+U-labels: xn--essai---valuation-itb, xn--essai--valuation-hqb, xn--essai-and-valuation-kzb, xn--essai-andvaluation-jwb, xn--essai-valuation-gnb, xn--essaiand-valuation-jwb, xn--essaiandvaluation-itb, xn--essaiet-valuation-itb, xn--essaietvaluation-hqb, xn--essaivaluation-fkb
+notBefore: 2022-11-22T01:53:00.674Z
+notAfter: 2027-10-21T08:12:14.116Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il9kMTI0
+YjY2My0zN2UwLTQ4ZTAtOTQ2ZS1lMzQwNzMwYjQ3NTkiPjxzbWQ6aWQ+MDAwMDAwNjMxNjY5MDgx
+OTgwNjc0LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMTo1MzowMC42NzRaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0yMVQwODoxMjoxNC4xMTZaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazpj
+b3VydD48bWFyazppZD4wMDAxMzgxNTAzMDYwNDk2MTUwMzA2MDQ5Ni0xPC9tYXJrOmlkPjxtYXJr
+Om1hcmtOYW1lPkVzc2FpICZhbXA7IMOpdmFsdWF0aW9uPC9tYXJrOm1hcmtOYW1lPjxtYXJrOmhv
+bGRlciBlbnRpdGxlbWVudD0ib3duZXIiPjxtYXJrOm5hbWU+SmVhbiBMZWJsYW5jPC9tYXJrOm5h
+bWU+PG1hcms6b3JnPk9yYW5pc2F0aW9uIGRlIHRlc3Q8L21hcms6b3JnPjxtYXJrOmFkZHI+PG1h
+cms6c3RyZWV0PlJVRSBST0dORSA0MCA8L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+QVJUT0lTPC9t
+YXJrOmNpdHk+PG1hcms6cGM+MjEzMDE8L21hcms6cGM+PG1hcms6Y2M+RlI8L21hcms6Y2M+PC9t
+YXJrOmFkZHI+PG1hcms6dm9pY2U+KzMzLjI2NDk5NTAzMjwvbWFyazp2b2ljZT48bWFyazpmYXg+
+KzMzLjI2NDk5NTAzMzwvbWFyazpmYXg+PG1hcms6ZW1haWw+aW5mb0BleGFtcGxlLmV4YW1wbGU8
+L21hcms6ZW1haWw+PC9tYXJrOmhvbGRlcj48bWFyazpsYWJlbD54bi0tZXNzYWktLS12YWx1YXRp
+b24taXRiPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1lc3NhaS0tdmFsdWF0aW9uLWhxYjwv
+bWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tZXNzYWktYW5kLXZhbHVhdGlvbi1remI8L21hcms6
+bGFiZWw+PG1hcms6bGFiZWw+eG4tLWVzc2FpLWFuZHZhbHVhdGlvbi1qd2I8L21hcms6bGFiZWw+
+PG1hcms6bGFiZWw+eG4tLWVzc2FpLXZhbHVhdGlvbi1nbmI8L21hcms6bGFiZWw+PG1hcms6bGFi
+ZWw+eG4tLWVzc2FpYW5kLXZhbHVhdGlvbi1qd2I8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4t
+LWVzc2FpYW5kdmFsdWF0aW9uLWl0YjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tZXNzYWll
+dC12YWx1YXRpb24taXRiPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1lc3NhaWV0dmFsdWF0
+aW9uLWhxYjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tZXNzYWl2YWx1YXRpb24tZmtiPC9t
+YXJrOmxhYmVsPjxtYXJrOmdvb2RzQW5kU2VydmljZXM+Z3VpdGFyZTwvbWFyazpnb29kc0FuZFNl
+cnZpY2VzPjxtYXJrOnJlZk51bT4xMjM0PC9tYXJrOnJlZk51bT48bWFyazpwcm9EYXRlPjIwMTMt
+MDEtMDFUMDA6MDA6MDAuMDAwWjwvbWFyazpwcm9EYXRlPjxtYXJrOmNjPlVTPC9tYXJrOmNjPjxt
+YXJrOmNvdXJ0TmFtZT5Ib3ZlPC9tYXJrOmNvdXJ0TmFtZT48L21hcms6Y291cnQ+PC9tYXJrOm1h
+cms+PGRzOlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxk
+c2lnIyIgSWQ9Il8yMDhhOThhYS01YTk1LTRhYjEtYTUzNi0wYzA5YTU4ZmJmMzAiPjxkczpTaWdu
+ZWRJbmZvPjxkczpDYW5vbmljYWxpemF0aW9uTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53
+My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PGRzOlNpZ25hdHVyZU1ldGhvZCBBbGdvcml0
+aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZHNpZy1tb3JlI3JzYS1zaGEyNTYiLz48
+ZHM6UmVmZXJlbmNlIFVSST0iI19kMTI0YjY2My0zN2UwLTQ4ZTAtOTQ2ZS1lMzQwNzMwYjQ3NTki
+PjxkczpUcmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9y
+Zy8yMDAwLzA5L3htbGRzaWcjZW52ZWxvcGVkLXNpZ25hdHVyZSIvPjxkczpUcmFuc2Zvcm0gQWxn
+b3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRy
+YW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIw
+MDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1ZT5yaC9OWnVwVDQ5NVE0a2hqL3lm
+Q01vZXg4V0pmRmkyd09ET0s1OXFVajQ0PTwvZHM6RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+
+PGRzOlJlZmVyZW5jZSBVUkk9IiNfNTJlMjBkODgtMzZmNC00MTVlLThjM2UtMTNkYTBiOGRiM2Qz
+Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5v
+cmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRo
+b2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48
+ZHM6RGlnZXN0VmFsdWU+U21GWmVpUk1nZDdqeFZjdUhQMjhEUVNOaXlwRXpIZlB1T3RUdHgwcGt4
+VT08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNlPjwvZHM6U2lnbmVkSW5mbz48ZHM6U2ln
+bmF0dXJlVmFsdWUgSWQ9Il9kNTZmOWIxNS0zZGM4LTRhM2QtYWZlMS0yZGU2ZjBkNGRmYmUiPk1o
+S091ektoTnNob01rbnVSU25NRWlpVk1SbzR5eHhrdXVuclpvRkozeDZjaHlvOUd1SEVhVXVoRVFm
+YmRVUmNNcm1sbGwrYjJxS0UmIzEzOwpLc3ZKaUk5aVRBUGtnYXpVYkVkT2hoOTdQdUZtWk02YndE
+Y3pjU1Fnc0RsdkhYSFBxVDE4NHlrL2Y4S2ExY24vWUg2eitXdzVzTEtPJiMxMzsKazcxQ1BJUE55
+cG52R2Z5cXNPWkU3WmZuTmZFUjExOHlvQ3ppVXhLSSttMlFwQkVDNENHdmVSQkJqN3J3N3NHUkJ1
+Y3d0Z2xaZDdzdCYjMTM7CnJMYXMxY2dKR3YrdTR5RDBoU1JwYjFIOEFxbmtXM3FRY015SWhWSkJU
+Y1JlcTUvSy9hVW5wMFhrdWxhcWNnSHZYeVhFc3hIT2lWZWcmIzEzOwpXS0FOWVRwOC9yZ0hpdGs4
+Rk1oM0tNQmZvWHRyaHR5Tllub0RlMGNkRFFCVWNVRU51VHJGS0VPUG9GY2loWC91UHI5anRGUXRG
+SnpXJiMxMzsKaHJsaU1GWmVaQkNBNjBVMVJDMTFnb3VVbzdKRUVCRE9nazk1NlNSWFQvbmQxN0h5
+QjU5bVllUHJaVm1XUGIzVjZIOUpRNURKTVVnUyYjMTM7CnBTcFU3bmx2SFEzVHVscmM4MzB6eVhK
+SVhJSUFyQ0tHN2lhbVVNeUhrTm5VTkk4REE0bVB1KzRJL1Z2Z290a0MwakdJN25wMkRHOTMmIzEz
+OwphekpLclBLUmNhNENDYnZ6SzIwNUxjeVNQTi8zMEJHS0xRZWpMcnNsblFqbVh0eVEyeDg0K3k5
+RnlVY0NLK05FVXJXMGJzUnQyRnlxJiMxMzsKS2pZTE1PaHNxVWpCb3pUZ21MUUYyRHc1QVMwdDZ2
+UytnRGh1ZFhNVElnejBuaWlFSG1mQXdXbkpHb0lreFFtQ1NqYVYwU1RUNHU0PTwvZHM6U2lnbmF0
+dXJlVmFsdWU+PGRzOktleUluZm8gSWQ9Il81MmUyMGQ4OC0zNmY0LTQxNWUtOGMzZS0xM2RhMGI4
+ZGIzZDMiPjxkczpYNTA5RGF0YT48ZHM6WDUwOUNlcnRpZmljYXRlPk1JSUhYekNDQlVlZ0F3SUJB
+Z0lVWHFJL3ZkMThDYWc5OG9OcGR6VjdCaXkvNkVBd0RRWUpLb1pJaHZjTkFRRU5CUUF3ZkRFTE1B
+a0cmIzEzOwpBMVVFQmhNQ1ZWTXhQREE2QmdOVkJBb01NMGx1ZEdWeWJtVjBJRU52Y25CdmNtRjBh
+Vzl1SUdadmNpQkJjM05wWjI1bFpDQk9ZVzFsJiMxMzsKY3lCaGJtUWdUblZ0WW1WeWN6RXZNQzBH
+QTFVRUF3d21TVU5CVGs0Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5YVc1bmFHOTFjMlVnVUdscyYjMTM7
+CmIzUWdRMEV3SGhjTk1qSXhNVEUyTVRNeU9EVTVXaGNOTWpjeE1URTFNVE15T0RVNVdqQ0IwREVM
+TUFrR0ExVUVCaE1DUWtVeEVUQVAmIzEzOwpCZ05WQkFnVENFSnlkWE56Wld4ek1SSXdFQVlEVlFR
+SEV3bFdhV3gyYjI5eVpHVXhNekF4QmdOVkJBb1RLa1JsYkc5cGRIUmxJRU52JiMxMzsKYm5OMWJI
+UnBibWNnWVc1a0lFRmtkbWx6YjNKNUlFTldRa0V2VTBOU1RERStNRHdHQTFVRUF4TTFTVU5CVGs0
+Z1ZFMURTQ0JCZFhSbyYjMTM7CmIzSnBlbVZrSUZSeVlXUmxiV0Z5YXlCUWFXeHZkQ0JXWVd4cFpH
+RjBiM0lnVm1Gc2FXUXhKVEFqQmdrcWhraUc5dzBCQ1FFV0ZtSmwmIzEzOwpkRzFqYUhOdFpFQmta
+V3h2YVhSMFpTNWpiMjB3Z2dJaU1BMEdDU3FHU0liM0RRRUJBUVVBQTRJQ0R3QXdnZ0lLQW9JQ0FR
+QzZGSnd6JiMxMzsKS3FRVlg2ZkczL0VMUlNHV1Y5R3JLYUZNS21oV0l4ZXB3UlpONk14TXFrZDVE
+bllmaVQrV3A5OGpFa3FnVHgyVU1iOXF1Z2NHTlY2ZyYjMTM7CjM1L0NyUWIvRi9tejNDNHNmTE51
+RHBTcUs5UUY4K3BhVEg2aFFtck9wcVYrVVR2ZGo5U01nS0d5Rml6Uzg4Q0RXTXg0dzNpNEZBS2Um
+IzEzOwo2TlJzSlJHVEF0S0R1TUhjQTRzajA4R2plM2xQV2NnRnZjUU5EVmVFQlR1T0hCRytSaGo3
+VjFKaU5HUC80ZXBUWFRGWGdQRkRnZXozJiMxMzsKWUFmeHFwYnVPNFRYNmJiWWRrMm52TUxGdkxF
+TmtDRll1bG5ZUHpnbkVCR1NNS0lhQUlsYitzY0hDdldnV2oyVExnd2gyR0pOY3pWTSYjMTM7CjFM
+UE1xR1MrVWtpOU1oNzk4MjIveG9hcjQ5OHhEeDJZeC84c3dnRU5MU2dDc1FBVzhuTWd3V242QWJZ
+bDJSQUJYdXJheUZzbjRQMVImIzEzOwp1UU5tVXAvcXJSS1J2U0pyMU9Ma0haZkZUY1NZUWFWaXVN
+WVBYekd6OHRtTUxsbUkvQjZBQ0g0QXdSTWRuWXZGTzNLSTFSQm5QS0lkJiMxMzsKd3dmVXBaNUlU
+SXBiQTdDR2dUeDFxeHRNMXdJVXI3cEhlS1A2alZlM2tkRExnKy9CWjJ4TUV0Qms1YThZN0I0djN4
+d0hYR1R2VjhtTiYjMTM7CjBBZy9TeVQvUVV5RVJoWFV5QU4yK0V3WitTUUNVeU5memlvV1E4Nzhl
+R3lrVSs0NitCYmdJM0lJcjM2WEtQd216dDBTWitLSTN0bkYmIzEzOwpUbG45bVgwS0MwaWRvajV5
+a3pQb0MvTUllZDBzcDRUaWd4RWJXTng3RUY4MFB2Ui9EREV3VlBFRWtrank2M1hGdWx4aUNRSURB
+UUFCJiMxMzsKbzRJQmdqQ0NBWDR3REFZRFZSMFRBUUgvQkFJd0FEQU9CZ05WSFE4QkFmOEVCQU1D
+QjRBd0hRWURWUjBPQkJZRUZIbjlzMERFYTJrdiYjMTM7CmdFL2VJT1RzcW9XODVNWEZNSUc2QmdO
+VkhTTUVnYkl3Z2ErQUZFZDdUNjU2VVpHMTBiK2ROdW1HZnpZV0JLbEZvWUdBcEg0d2ZERUwmIzEz
+OwpNQWtHQTFVRUJoTUNWVk14UERBNkJnTlZCQW9NTTBsdWRHVnlibVYwSUVOdmNuQnZjbUYwYVc5
+dUlHWnZjaUJCYzNOcFoyNWxaQ0JPJiMxMzsKWVcxbGN5QmhibVFnVG5WdFltVnljekV2TUMwR0Ex
+VUVBd3dtU1VOQlRrNGdWSEpoWkdWdFlYSnJJRU5zWldGeWFXNW5hRzkxYzJVZyYjMTM7ClVHbHNi
+M1FnUTBHQ0ZIcHFiVEZlSmNQdFVDOVh1dVBLUHNMd0RSK01NRFFHQTFVZEh3UXRNQ3N3S2FBbm9D
+V0dJMmgwZEhBNkx5OWomIzEzOwpjbXd1YVdOaGJtNHViM0puTDNSdFkyaGZjR2xzYjNRdVkzSnNN
+RXdHQTFVZElBUkZNRU13RUFZT0t3WUJCQUdDeVJzQkJZTTdEQW93JiMxMzsKTHdZSUt3WUJCUVVI
+QWdFd0l6QWhCZ2dyQmdFRkJRY0NBUllWYUhSMGNITTZMeTlqY0hNdWFXTmhibTR1YjNKbk1BMEdD
+U3FHU0liMyYjMTM7CkRRRUJEUVVBQTRJQ0FRQmRTYXQ1NnVlakxuQWpGSUY5NWRqWVdJNnMvL042
+WVh4c3JyTWtHQlA4RWV6UHloTGg2YXdQNHo3UTlRQUkmIzEzOwpRWmtZb3hybC8xeTArYnlWMnFu
+VFVVQ0xScEsvQkRwL2hjZndQZktDQS8yUlFDSEpyYjYrejBlbkRQRlJLME5LbXdPY2RsR3RVazBt
+JiMxMzsKUGdXR1NLdHV3VnNQQWhUREp1aG9zWk9oa05mK25TT09IclFPbjFFMnJ6T3JkL2tRbHFp
+Q3dSSDk3OTZOcFRBK0hTTWZPb2JKRUVQcSYjMTM7CnRwRjdQNXFid3RsOTVVYTVPcDRBaGE3MEhI
+ZlVGUzRCT1FLTEJWZk1aZE9SK2lQb2g1T3dBSytodFlrRkNHOVAyV0h1N3dmOEVDK1cmIzEzOwo3
+azk2Z3ZUZDh4RTdvdW9hYlQyeDZZZllxRWxQSGlVL0lNOWdWeldXTC9zdllEeVNWdW9Gd0JqRE5O
+MWNkcTBxT1lSMXl1UzFjLzlEJiMxMzsKRlI3ZW83R0ZFQ3krVEJkN0lpS1JmQlZlWUdPT1BNbm9G
+ZnhSTFdycHNXTm53RDdsa1BrTENnRkNrKzh5RWNPUmc2MjVtbzY1ejR5NiYjMTM7Cko0Szhmb2Rh
+N3F3bVhOUDNSUzE4b242Qkh0OGxRK2JYZ09IbXhJSGswYU8wcU5EcWd2THIyRmx5TEdKR2lFTVJx
+RE1NUjYvYTA2YnQmIzEzOwprblVNSGw3Q3FNZmpJa2pQNFZOTnlHUGRKZ3dWazJrZWI5dU5GdkpD
+eFQrTTJmR1hRMU5iSk5mdHY1TWdTc3A5TjF5K3g2Z0EzRWh3JiMxMzsKeUhsbUpCNFlNdG84dFRW
+MWk4NHhQWHhpMkNBZURhR0R1d29zdDhZVUNTanE3UkNLOHRHY2FBWXJrWFFZMnlRZlgzY3dEc0V4
+UnFWVyYjMTM7CnlyanlSdCtONm1LOTlRPT08L2RzOlg1MDlDZXJ0aWZpY2F0ZT48L2RzOlg1MDlE
+YXRhPjwvZHM6S2V5SW5mbz48L2RzOlNpZ25hdHVyZT48L3NtZDpzaWduZWRNYXJrPgo=
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Holder-French/Court-Holder-French-Revoked.smd b/core/src/test/resources/google/registry/tmch/idn/Holder-French/Court-Holder-French-Revoked.smd
new file mode 100644
index 000000000..625a7e418
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Holder-French/Court-Holder-French-Revoked.smd
@@ -0,0 +1,121 @@
+Marks: Essai & évaluation
+smdID: 000000631669081892159-65535
+U-labels: xn--essai---valuation-itb, xn--essai--valuation-hqb, xn--essai-and-valuation-kzb, xn--essai-andvaluation-jwb, xn--essai-valuation-gnb, xn--essaiand-valuation-jwb, xn--essaiandvaluation-itb, xn--essaiet-valuation-itb, xn--essaietvaluation-hqb, xn--essaivaluation-fkb
+notBefore: 2022-11-22T01:51:32.159Z
+notAfter: 2027-10-21T08:12:14.116Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il9hNDI5
+ZWY3MC04ZDJjLTQwM2ItYjVkMi1lMDY1YzVjNDFlNTEiPjxzbWQ6aWQ+MDAwMDAwNjMxNjY5MDgx
+ODkyMTU5LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMTo1MTozMi4xNTlaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0yMVQwODoxMjoxNC4xMTZaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazpj
+b3VydD48bWFyazppZD4wMDAxMzgxNTAzMDYwNDk2MTUwMzA2MDQ5Ni0xPC9tYXJrOmlkPjxtYXJr
+Om1hcmtOYW1lPkVzc2FpICZhbXA7IMOpdmFsdWF0aW9uPC9tYXJrOm1hcmtOYW1lPjxtYXJrOmhv
+bGRlciBlbnRpdGxlbWVudD0ib3duZXIiPjxtYXJrOm5hbWU+SmVhbiBMZWJsYW5jPC9tYXJrOm5h
+bWU+PG1hcms6b3JnPk9yYW5pc2F0aW9uIGRlIHRlc3Q8L21hcms6b3JnPjxtYXJrOmFkZHI+PG1h
+cms6c3RyZWV0PlJVRSBST0dORSA0MCA8L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+QVJUT0lTPC9t
+YXJrOmNpdHk+PG1hcms6cGM+MjEzMDE8L21hcms6cGM+PG1hcms6Y2M+RlI8L21hcms6Y2M+PC9t
+YXJrOmFkZHI+PG1hcms6dm9pY2U+KzMzLjI2NDk5NTAzMjwvbWFyazp2b2ljZT48bWFyazpmYXg+
+KzMzLjI2NDk5NTAzMzwvbWFyazpmYXg+PG1hcms6ZW1haWw+aW5mb0BleGFtcGxlLmV4YW1wbGU8
+L21hcms6ZW1haWw+PC9tYXJrOmhvbGRlcj48bWFyazpsYWJlbD54bi0tZXNzYWktLS12YWx1YXRp
+b24taXRiPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1lc3NhaS0tdmFsdWF0aW9uLWhxYjwv
+bWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tZXNzYWktYW5kLXZhbHVhdGlvbi1remI8L21hcms6
+bGFiZWw+PG1hcms6bGFiZWw+eG4tLWVzc2FpLWFuZHZhbHVhdGlvbi1qd2I8L21hcms6bGFiZWw+
+PG1hcms6bGFiZWw+eG4tLWVzc2FpLXZhbHVhdGlvbi1nbmI8L21hcms6bGFiZWw+PG1hcms6bGFi
+ZWw+eG4tLWVzc2FpYW5kLXZhbHVhdGlvbi1qd2I8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4t
+LWVzc2FpYW5kdmFsdWF0aW9uLWl0YjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tZXNzYWll
+dC12YWx1YXRpb24taXRiPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1lc3NhaWV0dmFsdWF0
+aW9uLWhxYjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tZXNzYWl2YWx1YXRpb24tZmtiPC9t
+YXJrOmxhYmVsPjxtYXJrOmdvb2RzQW5kU2VydmljZXM+Z3VpdGFyZTwvbWFyazpnb29kc0FuZFNl
+cnZpY2VzPjxtYXJrOnJlZk51bT4xMjM0PC9tYXJrOnJlZk51bT48bWFyazpwcm9EYXRlPjIwMTMt
+MDEtMDFUMDA6MDA6MDAuMDAwWjwvbWFyazpwcm9EYXRlPjxtYXJrOmNjPlVTPC9tYXJrOmNjPjxt
+YXJrOmNvdXJ0TmFtZT5Ib3ZlPC9tYXJrOmNvdXJ0TmFtZT48L21hcms6Y291cnQ+PC9tYXJrOm1h
+cms+PGRzOlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxk
+c2lnIyIgSWQ9Il9lNDcwMTdjNC05MmE3LTRiYmQtOTlkNC1kZjU4NDlhZmJkZDciPjxkczpTaWdu
+ZWRJbmZvPjxkczpDYW5vbmljYWxpemF0aW9uTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53
+My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PGRzOlNpZ25hdHVyZU1ldGhvZCBBbGdvcml0
+aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZHNpZy1tb3JlI3JzYS1zaGEyNTYiLz48
+ZHM6UmVmZXJlbmNlIFVSST0iI19hNDI5ZWY3MC04ZDJjLTQwM2ItYjVkMi1lMDY1YzVjNDFlNTEi
+PjxkczpUcmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9y
+Zy8yMDAwLzA5L3htbGRzaWcjZW52ZWxvcGVkLXNpZ25hdHVyZSIvPjxkczpUcmFuc2Zvcm0gQWxn
+b3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRy
+YW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIw
+MDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1ZT5EWXBzdHk3K28vTXh3SEZMeXVV
+dmVqN0hBYUU1eFRuK1U2b0tzYU1zVDVNPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+
+PGRzOlJlZmVyZW5jZSBVUkk9IiNfZTUwMTI5Y2ItYzJjZC00MzBhLTkwYjEtMzU3YWNhMTc2NDEw
+Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5v
+cmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRo
+b2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48
+ZHM6RGlnZXN0VmFsdWU+Q1kvalRVa2NUMnd4YldVZGYxRDd0ZGRVYjZZSmoyZkxTMXZUMC9MOWVk
+ND08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNlPjwvZHM6U2lnbmVkSW5mbz48ZHM6U2ln
+bmF0dXJlVmFsdWUgSWQ9Il9kMGJmNTQ4OC1hZWEzLTQ3MDktODYwMi1iMDYwMDlmMTVjNmYiPkxS
+cHlzUHlEaWJ2TjVMcWJpSER5dlFienhQYitwbVloNjA2V2kzOVlhQk4xclZvNTB3MjJTRVkrazBI
+YXZvVWlmMmhlWDAvcTZWS2ImIzEzOwpHR1pwQzZkallEQXFRL1pqUVdjaXdJUmZCOGpnMUY4VXdP
+NkFsR0R2d3dOeDEvVzJXMDZGNERQeVpDdUlwcTdrVFBubTVWYmtsbWJEJiMxMzsKb0Jlb1hDbFVj
+ZFNnT0Zsb3R4K3pSTzEzMWwvRUhBbGc0RHBzZGZrZXZwWVAwM0dvdy82ZUJYSXhrNys2L0F1MzJ6
+U000Y3lEOURnbSYjMTM7CkpoZllrRG1OU3lkaHBreDFITy85bEl4N1F2SnhBcm5HbnErNFRGWFpo
+eDQzRlBHU0UwNkExTHpJcjlwd1pPSFhJaGx5WDZIOWxUUUwmIzEzOwoxUVplZ0FCeXE2M1hTbHJp
+SW53enFFMkd6NEwybHVhMFkwYndCdklmREVRUWZNRlJvdHdvMzZXSWZXTGRGSHFqN3N0eGdoZWhK
+VWxVJiMxMzsKdDJBSGg2NDZPeHcvYkQxM2k4OTFFR0RCTi9HZlZjODNFbUxyOGN2RGdNUjhMK0xv
+NlFXRVpyN3BZc3M2eDFDS2hqT1NrSnJGbHVLTyYjMTM7ClJ5dmJ6bVRpLzRIaVpEbmxtWVAzZUxX
+U0JObTVueW1FNlFiRlB2WHJYU0sybThoS0pFZ3FPcDNIWnFhblJZZERzN3g3TytodmJhRjEmIzEz
+OwpiTzIyRHVTN0FGSGlxbHhYbDMwRFYzZnlVTW0rYzhwZm9hNVo0NFJ3OGg4Z3pUcFVLWUVZa0NB
+L3FVbytsR0U1WUhZbGdDVmhzRWtUJiMxMzsKSEliRS9rem5UL0c1RG1GdWppQjhLRDUzZWNVT2JF
+eC9zbzZ5eDNrQ1BWRkxmWjdwbzU3ZTM1KzJSUWhjMEVwM1RMWWVPUXZWUG1VPTwvZHM6U2lnbmF0
+dXJlVmFsdWU+PGRzOktleUluZm8gSWQ9Il9lNTAxMjljYi1jMmNkLTQzMGEtOTBiMS0zNTdhY2Ex
+NzY0MTAiPjxkczpYNTA5RGF0YT48ZHM6WDUwOUNlcnRpZmljYXRlPk1JSUhYekNDQlVlZ0F3SUJB
+Z0lVWHFJL3ZkMThDYWc5OG9OcGR6VjdCaXkvNkVBd0RRWUpLb1pJaHZjTkFRRU5CUUF3ZkRFTE1B
+a0cmIzEzOwpBMVVFQmhNQ1ZWTXhQREE2QmdOVkJBb01NMGx1ZEdWeWJtVjBJRU52Y25CdmNtRjBh
+Vzl1SUdadmNpQkJjM05wWjI1bFpDQk9ZVzFsJiMxMzsKY3lCaGJtUWdUblZ0WW1WeWN6RXZNQzBH
+QTFVRUF3d21TVU5CVGs0Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5YVc1bmFHOTFjMlVnVUdscyYjMTM7
+CmIzUWdRMEV3SGhjTk1qSXhNVEUyTVRNeU9EVTVXaGNOTWpjeE1URTFNVE15T0RVNVdqQ0IwREVM
+TUFrR0ExVUVCaE1DUWtVeEVUQVAmIzEzOwpCZ05WQkFnVENFSnlkWE56Wld4ek1SSXdFQVlEVlFR
+SEV3bFdhV3gyYjI5eVpHVXhNekF4QmdOVkJBb1RLa1JsYkc5cGRIUmxJRU52JiMxMzsKYm5OMWJI
+UnBibWNnWVc1a0lFRmtkbWx6YjNKNUlFTldRa0V2VTBOU1RERStNRHdHQTFVRUF4TTFTVU5CVGs0
+Z1ZFMURTQ0JCZFhSbyYjMTM7CmIzSnBlbVZrSUZSeVlXUmxiV0Z5YXlCUWFXeHZkQ0JXWVd4cFpH
+RjBiM0lnVm1Gc2FXUXhKVEFqQmdrcWhraUc5dzBCQ1FFV0ZtSmwmIzEzOwpkRzFqYUhOdFpFQmta
+V3h2YVhSMFpTNWpiMjB3Z2dJaU1BMEdDU3FHU0liM0RRRUJBUVVBQTRJQ0R3QXdnZ0lLQW9JQ0FR
+QzZGSnd6JiMxMzsKS3FRVlg2ZkczL0VMUlNHV1Y5R3JLYUZNS21oV0l4ZXB3UlpONk14TXFrZDVE
+bllmaVQrV3A5OGpFa3FnVHgyVU1iOXF1Z2NHTlY2ZyYjMTM7CjM1L0NyUWIvRi9tejNDNHNmTE51
+RHBTcUs5UUY4K3BhVEg2aFFtck9wcVYrVVR2ZGo5U01nS0d5Rml6Uzg4Q0RXTXg0dzNpNEZBS2Um
+IzEzOwo2TlJzSlJHVEF0S0R1TUhjQTRzajA4R2plM2xQV2NnRnZjUU5EVmVFQlR1T0hCRytSaGo3
+VjFKaU5HUC80ZXBUWFRGWGdQRkRnZXozJiMxMzsKWUFmeHFwYnVPNFRYNmJiWWRrMm52TUxGdkxF
+TmtDRll1bG5ZUHpnbkVCR1NNS0lhQUlsYitzY0hDdldnV2oyVExnd2gyR0pOY3pWTSYjMTM7CjFM
+UE1xR1MrVWtpOU1oNzk4MjIveG9hcjQ5OHhEeDJZeC84c3dnRU5MU2dDc1FBVzhuTWd3V242QWJZ
+bDJSQUJYdXJheUZzbjRQMVImIzEzOwp1UU5tVXAvcXJSS1J2U0pyMU9Ma0haZkZUY1NZUWFWaXVN
+WVBYekd6OHRtTUxsbUkvQjZBQ0g0QXdSTWRuWXZGTzNLSTFSQm5QS0lkJiMxMzsKd3dmVXBaNUlU
+SXBiQTdDR2dUeDFxeHRNMXdJVXI3cEhlS1A2alZlM2tkRExnKy9CWjJ4TUV0Qms1YThZN0I0djN4
+d0hYR1R2VjhtTiYjMTM7CjBBZy9TeVQvUVV5RVJoWFV5QU4yK0V3WitTUUNVeU5memlvV1E4Nzhl
+R3lrVSs0NitCYmdJM0lJcjM2WEtQd216dDBTWitLSTN0bkYmIzEzOwpUbG45bVgwS0MwaWRvajV5
+a3pQb0MvTUllZDBzcDRUaWd4RWJXTng3RUY4MFB2Ui9EREV3VlBFRWtrank2M1hGdWx4aUNRSURB
+UUFCJiMxMzsKbzRJQmdqQ0NBWDR3REFZRFZSMFRBUUgvQkFJd0FEQU9CZ05WSFE4QkFmOEVCQU1D
+QjRBd0hRWURWUjBPQkJZRUZIbjlzMERFYTJrdiYjMTM7CmdFL2VJT1RzcW9XODVNWEZNSUc2QmdO
+VkhTTUVnYkl3Z2ErQUZFZDdUNjU2VVpHMTBiK2ROdW1HZnpZV0JLbEZvWUdBcEg0d2ZERUwmIzEz
+OwpNQWtHQTFVRUJoTUNWVk14UERBNkJnTlZCQW9NTTBsdWRHVnlibVYwSUVOdmNuQnZjbUYwYVc5
+dUlHWnZjaUJCYzNOcFoyNWxaQ0JPJiMxMzsKWVcxbGN5QmhibVFnVG5WdFltVnljekV2TUMwR0Ex
+VUVBd3dtU1VOQlRrNGdWSEpoWkdWdFlYSnJJRU5zWldGeWFXNW5hRzkxYzJVZyYjMTM7ClVHbHNi
+M1FnUTBHQ0ZIcHFiVEZlSmNQdFVDOVh1dVBLUHNMd0RSK01NRFFHQTFVZEh3UXRNQ3N3S2FBbm9D
+V0dJMmgwZEhBNkx5OWomIzEzOwpjbXd1YVdOaGJtNHViM0puTDNSdFkyaGZjR2xzYjNRdVkzSnNN
+RXdHQTFVZElBUkZNRU13RUFZT0t3WUJCQUdDeVJzQkJZTTdEQW93JiMxMzsKTHdZSUt3WUJCUVVI
+QWdFd0l6QWhCZ2dyQmdFRkJRY0NBUllWYUhSMGNITTZMeTlqY0hNdWFXTmhibTR1YjNKbk1BMEdD
+U3FHU0liMyYjMTM7CkRRRUJEUVVBQTRJQ0FRQmRTYXQ1NnVlakxuQWpGSUY5NWRqWVdJNnMvL042
+WVh4c3JyTWtHQlA4RWV6UHloTGg2YXdQNHo3UTlRQUkmIzEzOwpRWmtZb3hybC8xeTArYnlWMnFu
+VFVVQ0xScEsvQkRwL2hjZndQZktDQS8yUlFDSEpyYjYrejBlbkRQRlJLME5LbXdPY2RsR3RVazBt
+JiMxMzsKUGdXR1NLdHV3VnNQQWhUREp1aG9zWk9oa05mK25TT09IclFPbjFFMnJ6T3JkL2tRbHFp
+Q3dSSDk3OTZOcFRBK0hTTWZPb2JKRUVQcSYjMTM7CnRwRjdQNXFid3RsOTVVYTVPcDRBaGE3MEhI
+ZlVGUzRCT1FLTEJWZk1aZE9SK2lQb2g1T3dBSytodFlrRkNHOVAyV0h1N3dmOEVDK1cmIzEzOwo3
+azk2Z3ZUZDh4RTdvdW9hYlQyeDZZZllxRWxQSGlVL0lNOWdWeldXTC9zdllEeVNWdW9Gd0JqRE5O
+MWNkcTBxT1lSMXl1UzFjLzlEJiMxMzsKRlI3ZW83R0ZFQ3krVEJkN0lpS1JmQlZlWUdPT1BNbm9G
+ZnhSTFdycHNXTm53RDdsa1BrTENnRkNrKzh5RWNPUmc2MjVtbzY1ejR5NiYjMTM7Cko0Szhmb2Rh
+N3F3bVhOUDNSUzE4b242Qkh0OGxRK2JYZ09IbXhJSGswYU8wcU5EcWd2THIyRmx5TEdKR2lFTVJx
+RE1NUjYvYTA2YnQmIzEzOwprblVNSGw3Q3FNZmpJa2pQNFZOTnlHUGRKZ3dWazJrZWI5dU5GdkpD
+eFQrTTJmR1hRMU5iSk5mdHY1TWdTc3A5TjF5K3g2Z0EzRWh3JiMxMzsKeUhsbUpCNFlNdG84dFRW
+MWk4NHhQWHhpMkNBZURhR0R1d29zdDhZVUNTanE3UkNLOHRHY2FBWXJrWFFZMnlRZlgzY3dEc0V4
+UnFWVyYjMTM7CnlyanlSdCtONm1LOTlRPT08L2RzOlg1MDlDZXJ0aWZpY2F0ZT48L2RzOlg1MDlE
+YXRhPjwvZHM6S2V5SW5mbz48L2RzOlNpZ25hdHVyZT48L3NtZDpzaWduZWRNYXJrPgo=
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Holder-French/Trademark-Holder-French-Active.smd b/core/src/test/resources/google/registry/tmch/idn/Holder-French/Trademark-Holder-French-Active.smd
new file mode 100644
index 000000000..585ea43a3
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Holder-French/Trademark-Holder-French-Active.smd
@@ -0,0 +1,122 @@
+Marks: Essai & évaluation
+smdID: 000000651669081984394-65535
+U-labels: xn--essai---valuation-itb, xn--essai--valuation-hqb, xn--essai-and-valuation-kzb, xn--essai-andvaluation-jwb, xn--essai-valuation-gnb, xn--essaiand-valuation-jwb, xn--essaiandvaluation-itb, xn--essaiet-valuation-itb, xn--essaietvaluation-hqb, xn--essaivaluation-fkb
+notBefore: 2022-11-22T01:53:04.394Z
+notAfter: 2027-10-21T08:12:14.116Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il83NzU0
+NTBhNy0xMmUyLTRhNTItOTlkNy1kMTIwYWYxNGVhMGEiPjxzbWQ6aWQ+MDAwMDAwNjUxNjY5MDgx
+OTg0Mzk0LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMTo1MzowNC4zOTRaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0yMVQwODoxMjoxNC4xMTZaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
+cmFkZW1hcms+PG1hcms6aWQ+MDAwMTM4MTUwMzA2MDc4MjE1MDMwNjA3ODItMTwvbWFyazppZD48
+bWFyazptYXJrTmFtZT5Fc3NhaSAmYW1wOyDDqXZhbHVhdGlvbjwvbWFyazptYXJrTmFtZT48bWFy
+azpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpuYW1lPkplYW4gTGVibGFuYzwvbWFy
+azpuYW1lPjxtYXJrOm9yZz5PcmFuaXNhdGlvbiBkZSB0ZXN0PC9tYXJrOm9yZz48bWFyazphZGRy
+PjxtYXJrOnN0cmVldD5SVUUgUk9HTkUgNDAgPC9tYXJrOnN0cmVldD48bWFyazpjaXR5PkFSVE9J
+UzwvbWFyazpjaXR5PjxtYXJrOnBjPjIxMzAxPC9tYXJrOnBjPjxtYXJrOmNjPkZSPC9tYXJrOmNj
+PjwvbWFyazphZGRyPjxtYXJrOnZvaWNlPiszMy4yNjQ5OTUwMzI8L21hcms6dm9pY2U+PG1hcms6
+ZmF4PiszMy4yNjQ5OTUwMzM8L21hcms6ZmF4PjxtYXJrOmVtYWlsPmluZm9AZXhhbXBsZS5leGFt
+cGxlPC9tYXJrOmVtYWlsPjwvbWFyazpob2xkZXI+PG1hcms6anVyaXNkaWN0aW9uPlVTPC9tYXJr
+Omp1cmlzZGljdGlvbj48bWFyazpjbGFzcz4xNTwvbWFyazpjbGFzcz48bWFyazpsYWJlbD54bi0t
+ZXNzYWktLS12YWx1YXRpb24taXRiPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1lc3NhaS0t
+dmFsdWF0aW9uLWhxYjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tZXNzYWktYW5kLXZhbHVh
+dGlvbi1remI8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLWVzc2FpLWFuZHZhbHVhdGlvbi1q
+d2I8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLWVzc2FpLXZhbHVhdGlvbi1nbmI8L21hcms6
+bGFiZWw+PG1hcms6bGFiZWw+eG4tLWVzc2FpYW5kLXZhbHVhdGlvbi1qd2I8L21hcms6bGFiZWw+
+PG1hcms6bGFiZWw+eG4tLWVzc2FpYW5kdmFsdWF0aW9uLWl0YjwvbWFyazpsYWJlbD48bWFyazps
+YWJlbD54bi0tZXNzYWlldC12YWx1YXRpb24taXRiPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhu
+LS1lc3NhaWV0dmFsdWF0aW9uLWhxYjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tZXNzYWl2
+YWx1YXRpb24tZmtiPC9tYXJrOmxhYmVsPjxtYXJrOmdvb2RzQW5kU2VydmljZXM+Z3VpdGFyZTwv
+bWFyazpnb29kc0FuZFNlcnZpY2VzPjxtYXJrOnJlZ051bT4xMjM0PC9tYXJrOnJlZ051bT48bWFy
+azpyZWdEYXRlPjIwMTMtMDEtMDFUMDA6MDA6MDAuMDAwWjwvbWFyazpyZWdEYXRlPjwvbWFyazp0
+cmFkZW1hcms+PC9tYXJrOm1hcms+PGRzOlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0cDovL3d3dy53
+My5vcmcvMjAwMC8wOS94bWxkc2lnIyIgSWQ9Il9kNThmYmE2MS0zNDcyLTRjNmYtYjFiYi1lODU4
+ZGY3YTY1M2IiPjxkczpTaWduZWRJbmZvPjxkczpDYW5vbmljYWxpemF0aW9uTWV0aG9kIEFsZ29y
+aXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PGRzOlNpZ25h
+dHVyZU1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZHNpZy1t
+b3JlI3JzYS1zaGEyNTYiLz48ZHM6UmVmZXJlbmNlIFVSST0iI183NzU0NTBhNy0xMmUyLTRhNTIt
+OTlkNy1kMTIwYWYxNGVhMGEiPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGht
+PSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjZW52ZWxvcGVkLXNpZ25hdHVyZSIv
+PjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1l
+eGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0
+dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1ZT5m
+RXBRMlVKMGY4U2lVOFBxbVF4K3E5UGltYUN1T0swNU50eWN0ZHREMmFjPTwvZHM6RGlnZXN0VmFs
+dWU+PC9kczpSZWZlcmVuY2U+PGRzOlJlZmVyZW5jZSBVUkk9IiNfMmE3ZDg0MzYtNmM5OS00Y2Ex
+LThkNDUtMWYxMDIwNGMxNmExIj48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRo
+bT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zv
+cm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0
+L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+MmovZUlGQWNISnlGK3NYT0FQWDFpbkVN
+RHhmS3RkNHFXZHRTRlBZam1kRT08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNlPjwvZHM6
+U2lnbmVkSW5mbz48ZHM6U2lnbmF0dXJlVmFsdWUgSWQ9Il8xYmE3NzA1Yi1mNjliLTRhYjItYjJh
+OS1jNDYzZDEwYjBlNTciPkRaTGhiaTIwWnp0eXRQYnZ5cTUxa2dTYlpOY09yNEtqZlkwRithM3dk
+d3hQc0Vvc2FkbVN3eXNDUFlIM2Y1c2pyenpjQkdNOUFhODEmIzEzOwp4alhtQnAyOXJmNFlWQWty
+NVZHWWZNT1dnRUxlY1NYd002TnQ1L2FOMWtkK3Niak1LUGxQM0hoRFlTK3FZaHdmWHZZcEJCUkM2
+aDFxJiMxMzsKc0JyRDZJY21Lc0tjdWQ0R2JOTDBEeDRDQmFaRTU4NlVQNmlCSTVmWVBCNnRIak0w
+SS92Umg5VDU3M0JJMjNoWHhYM3poSmY4Mlp3WSYjMTM7ClpqdU1VSit0Smk4KzNzOUoyQThDYjQz
+eERoOExKdTBveGhKL0Vza0RCdEc5YVNMTUtrY1RVUmRQd2RxbHpIWWJjNlNXZTE3M0dvZ2gmIzEz
+OwpRVy9ZUHpGenlURVJhK2NRNjdTaXp3QzAycXZJbWVsTWtwTmV5M1ZTNHNHZmRPTzM5VmFtT3Nn
+RjRPeThXTTRWSHNZUys1bWpuZTMyJiMxMzsKN2pLZXdCOTF3NWJvcjQzS2RNODg2Q3l0dk5ObzB2
+MUt1Q1lLQlJKdmNlTkhTYnM2S2RNZmVOVE0wY3o4bjkwaGRRb3VwSENzdS83VSYjMTM7CjhwVFlj
+V2dTTXZKTysyZnk5Z2UxT1RhNUlzWlllc0N5MjdqYk1WZ0dkcGcwMkJjbHU5ZmJTY250WmtzL3Ji
+S3JvaGM1WGNLZ2RaZGMmIzEzOwpHMDlOVUVybktYSlVrWEt5YlU1aGo1cnlXTTJrS3Bsb1ZiaXBh
+MHN6R1NpdWFjNDRyK01GcXZPUXpDdzlSTTlDb2pSYmZBY2RWdC9iJiMxMzsKN1RFUWtQK1lYODNn
+ZUxWNlFuWkxUVXpHKzNUY0diL2MzY3VpRXRqenIrTUluYzJQNGR3M0VCR1duU3F6OENDTThybnIz
+NEQyYnJ3PTwvZHM6U2lnbmF0dXJlVmFsdWU+PGRzOktleUluZm8gSWQ9Il8yYTdkODQzNi02Yzk5
+LTRjYTEtOGQ0NS0xZjEwMjA0YzE2YTEiPjxkczpYNTA5RGF0YT48ZHM6WDUwOUNlcnRpZmljYXRl
+Pk1JSUhYekNDQlVlZ0F3SUJBZ0lVWHFJL3ZkMThDYWc5OG9OcGR6VjdCaXkvNkVBd0RRWUpLb1pJ
+aHZjTkFRRU5CUUF3ZkRFTE1Ba0cmIzEzOwpBMVVFQmhNQ1ZWTXhQREE2QmdOVkJBb01NMGx1ZEdW
+eWJtVjBJRU52Y25CdmNtRjBhVzl1SUdadmNpQkJjM05wWjI1bFpDQk9ZVzFsJiMxMzsKY3lCaGJt
+UWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF3d21TVU5CVGs0Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5YVc1
+bmFHOTFjMlVnVUdscyYjMTM7CmIzUWdRMEV3SGhjTk1qSXhNVEUyTVRNeU9EVTVXaGNOTWpjeE1U
+RTFNVE15T0RVNVdqQ0IwREVMTUFrR0ExVUVCaE1DUWtVeEVUQVAmIzEzOwpCZ05WQkFnVENFSnlk
+WE56Wld4ek1SSXdFQVlEVlFRSEV3bFdhV3gyYjI5eVpHVXhNekF4QmdOVkJBb1RLa1JsYkc5cGRI
+UmxJRU52JiMxMzsKYm5OMWJIUnBibWNnWVc1a0lFRmtkbWx6YjNKNUlFTldRa0V2VTBOU1RERStN
+RHdHQTFVRUF4TTFTVU5CVGs0Z1ZFMURTQ0JCZFhSbyYjMTM7CmIzSnBlbVZrSUZSeVlXUmxiV0Z5
+YXlCUWFXeHZkQ0JXWVd4cFpHRjBiM0lnVm1Gc2FXUXhKVEFqQmdrcWhraUc5dzBCQ1FFV0ZtSmwm
+IzEzOwpkRzFqYUhOdFpFQmtaV3h2YVhSMFpTNWpiMjB3Z2dJaU1BMEdDU3FHU0liM0RRRUJBUVVB
+QTRJQ0R3QXdnZ0lLQW9JQ0FRQzZGSnd6JiMxMzsKS3FRVlg2ZkczL0VMUlNHV1Y5R3JLYUZNS21o
+V0l4ZXB3UlpONk14TXFrZDVEbllmaVQrV3A5OGpFa3FnVHgyVU1iOXF1Z2NHTlY2ZyYjMTM7CjM1
+L0NyUWIvRi9tejNDNHNmTE51RHBTcUs5UUY4K3BhVEg2aFFtck9wcVYrVVR2ZGo5U01nS0d5Rml6
+Uzg4Q0RXTXg0dzNpNEZBS2UmIzEzOwo2TlJzSlJHVEF0S0R1TUhjQTRzajA4R2plM2xQV2NnRnZj
+UU5EVmVFQlR1T0hCRytSaGo3VjFKaU5HUC80ZXBUWFRGWGdQRkRnZXozJiMxMzsKWUFmeHFwYnVP
+NFRYNmJiWWRrMm52TUxGdkxFTmtDRll1bG5ZUHpnbkVCR1NNS0lhQUlsYitzY0hDdldnV2oyVExn
+d2gyR0pOY3pWTSYjMTM7CjFMUE1xR1MrVWtpOU1oNzk4MjIveG9hcjQ5OHhEeDJZeC84c3dnRU5M
+U2dDc1FBVzhuTWd3V242QWJZbDJSQUJYdXJheUZzbjRQMVImIzEzOwp1UU5tVXAvcXJSS1J2U0py
+MU9Ma0haZkZUY1NZUWFWaXVNWVBYekd6OHRtTUxsbUkvQjZBQ0g0QXdSTWRuWXZGTzNLSTFSQm5Q
+S0lkJiMxMzsKd3dmVXBaNUlUSXBiQTdDR2dUeDFxeHRNMXdJVXI3cEhlS1A2alZlM2tkRExnKy9C
+WjJ4TUV0Qms1YThZN0I0djN4d0hYR1R2VjhtTiYjMTM7CjBBZy9TeVQvUVV5RVJoWFV5QU4yK0V3
+WitTUUNVeU5memlvV1E4NzhlR3lrVSs0NitCYmdJM0lJcjM2WEtQd216dDBTWitLSTN0bkYmIzEz
+OwpUbG45bVgwS0MwaWRvajV5a3pQb0MvTUllZDBzcDRUaWd4RWJXTng3RUY4MFB2Ui9EREV3VlBF
+RWtrank2M1hGdWx4aUNRSURBUUFCJiMxMzsKbzRJQmdqQ0NBWDR3REFZRFZSMFRBUUgvQkFJd0FE
+QU9CZ05WSFE4QkFmOEVCQU1DQjRBd0hRWURWUjBPQkJZRUZIbjlzMERFYTJrdiYjMTM7CmdFL2VJ
+T1RzcW9XODVNWEZNSUc2QmdOVkhTTUVnYkl3Z2ErQUZFZDdUNjU2VVpHMTBiK2ROdW1HZnpZV0JL
+bEZvWUdBcEg0d2ZERUwmIzEzOwpNQWtHQTFVRUJoTUNWVk14UERBNkJnTlZCQW9NTTBsdWRHVnli
+bVYwSUVOdmNuQnZjbUYwYVc5dUlHWnZjaUJCYzNOcFoyNWxaQ0JPJiMxMzsKWVcxbGN5QmhibVFn
+VG5WdFltVnljekV2TUMwR0ExVUVBd3dtU1VOQlRrNGdWSEpoWkdWdFlYSnJJRU5zWldGeWFXNW5h
+RzkxYzJVZyYjMTM7ClVHbHNiM1FnUTBHQ0ZIcHFiVEZlSmNQdFVDOVh1dVBLUHNMd0RSK01NRFFH
+QTFVZEh3UXRNQ3N3S2FBbm9DV0dJMmgwZEhBNkx5OWomIzEzOwpjbXd1YVdOaGJtNHViM0puTDNS
+dFkyaGZjR2xzYjNRdVkzSnNNRXdHQTFVZElBUkZNRU13RUFZT0t3WUJCQUdDeVJzQkJZTTdEQW93
+JiMxMzsKTHdZSUt3WUJCUVVIQWdFd0l6QWhCZ2dyQmdFRkJRY0NBUllWYUhSMGNITTZMeTlqY0hN
+dWFXTmhibTR1YjNKbk1BMEdDU3FHU0liMyYjMTM7CkRRRUJEUVVBQTRJQ0FRQmRTYXQ1NnVlakxu
+QWpGSUY5NWRqWVdJNnMvL042WVh4c3JyTWtHQlA4RWV6UHloTGg2YXdQNHo3UTlRQUkmIzEzOwpR
+WmtZb3hybC8xeTArYnlWMnFuVFVVQ0xScEsvQkRwL2hjZndQZktDQS8yUlFDSEpyYjYrejBlbkRQ
+RlJLME5LbXdPY2RsR3RVazBtJiMxMzsKUGdXR1NLdHV3VnNQQWhUREp1aG9zWk9oa05mK25TT09I
+clFPbjFFMnJ6T3JkL2tRbHFpQ3dSSDk3OTZOcFRBK0hTTWZPb2JKRUVQcSYjMTM7CnRwRjdQNXFi
+d3RsOTVVYTVPcDRBaGE3MEhIZlVGUzRCT1FLTEJWZk1aZE9SK2lQb2g1T3dBSytodFlrRkNHOVAy
+V0h1N3dmOEVDK1cmIzEzOwo3azk2Z3ZUZDh4RTdvdW9hYlQyeDZZZllxRWxQSGlVL0lNOWdWeldX
+TC9zdllEeVNWdW9Gd0JqRE5OMWNkcTBxT1lSMXl1UzFjLzlEJiMxMzsKRlI3ZW83R0ZFQ3krVEJk
+N0lpS1JmQlZlWUdPT1BNbm9GZnhSTFdycHNXTm53RDdsa1BrTENnRkNrKzh5RWNPUmc2MjVtbzY1
+ejR5NiYjMTM7Cko0Szhmb2RhN3F3bVhOUDNSUzE4b242Qkh0OGxRK2JYZ09IbXhJSGswYU8wcU5E
+cWd2THIyRmx5TEdKR2lFTVJxRE1NUjYvYTA2YnQmIzEzOwprblVNSGw3Q3FNZmpJa2pQNFZOTnlH
+UGRKZ3dWazJrZWI5dU5GdkpDeFQrTTJmR1hRMU5iSk5mdHY1TWdTc3A5TjF5K3g2Z0EzRWh3JiMx
+MzsKeUhsbUpCNFlNdG84dFRWMWk4NHhQWHhpMkNBZURhR0R1d29zdDhZVUNTanE3UkNLOHRHY2FB
+WXJrWFFZMnlRZlgzY3dEc0V4UnFWVyYjMTM7CnlyanlSdCtONm1LOTlRPT08L2RzOlg1MDlDZXJ0
+aWZpY2F0ZT48L2RzOlg1MDlEYXRhPjwvZHM6S2V5SW5mbz48L2RzOlNpZ25hdHVyZT48L3NtZDpz
+aWduZWRNYXJrPgo=
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Holder-French/Trademark-Holder-French-Revoked.smd b/core/src/test/resources/google/registry/tmch/idn/Holder-French/Trademark-Holder-French-Revoked.smd
new file mode 100644
index 000000000..fd217701e
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Holder-French/Trademark-Holder-French-Revoked.smd
@@ -0,0 +1,122 @@
+Marks: Essai & évaluation
+smdID: 000000651669081895880-65535
+U-labels: xn--essai---valuation-itb, xn--essai--valuation-hqb, xn--essai-and-valuation-kzb, xn--essai-andvaluation-jwb, xn--essai-valuation-gnb, xn--essaiand-valuation-jwb, xn--essaiandvaluation-itb, xn--essaiet-valuation-itb, xn--essaietvaluation-hqb, xn--essaivaluation-fkb
+notBefore: 2022-11-22T01:51:35.880Z
+notAfter: 2027-10-21T08:12:14.116Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il8wMDQy
+NWU1ZS1iOTc4LTQ1MmItOTJiMy00NmJhODMxOWJmNWQiPjxzbWQ6aWQ+MDAwMDAwNjUxNjY5MDgx
+ODk1ODgwLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMTo1MTozNS44ODBaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0yMVQwODoxMjoxNC4xMTZaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
+cmFkZW1hcms+PG1hcms6aWQ+MDAwMTM4MTUwMzA2MDc4MjE1MDMwNjA3ODItMTwvbWFyazppZD48
+bWFyazptYXJrTmFtZT5Fc3NhaSAmYW1wOyDDqXZhbHVhdGlvbjwvbWFyazptYXJrTmFtZT48bWFy
+azpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpuYW1lPkplYW4gTGVibGFuYzwvbWFy
+azpuYW1lPjxtYXJrOm9yZz5PcmFuaXNhdGlvbiBkZSB0ZXN0PC9tYXJrOm9yZz48bWFyazphZGRy
+PjxtYXJrOnN0cmVldD5SVUUgUk9HTkUgNDAgPC9tYXJrOnN0cmVldD48bWFyazpjaXR5PkFSVE9J
+UzwvbWFyazpjaXR5PjxtYXJrOnBjPjIxMzAxPC9tYXJrOnBjPjxtYXJrOmNjPkZSPC9tYXJrOmNj
+PjwvbWFyazphZGRyPjxtYXJrOnZvaWNlPiszMy4yNjQ5OTUwMzI8L21hcms6dm9pY2U+PG1hcms6
+ZmF4PiszMy4yNjQ5OTUwMzM8L21hcms6ZmF4PjxtYXJrOmVtYWlsPmluZm9AZXhhbXBsZS5leGFt
+cGxlPC9tYXJrOmVtYWlsPjwvbWFyazpob2xkZXI+PG1hcms6anVyaXNkaWN0aW9uPlVTPC9tYXJr
+Omp1cmlzZGljdGlvbj48bWFyazpjbGFzcz4xNTwvbWFyazpjbGFzcz48bWFyazpsYWJlbD54bi0t
+ZXNzYWktLS12YWx1YXRpb24taXRiPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1lc3NhaS0t
+dmFsdWF0aW9uLWhxYjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tZXNzYWktYW5kLXZhbHVh
+dGlvbi1remI8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLWVzc2FpLWFuZHZhbHVhdGlvbi1q
+d2I8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLWVzc2FpLXZhbHVhdGlvbi1nbmI8L21hcms6
+bGFiZWw+PG1hcms6bGFiZWw+eG4tLWVzc2FpYW5kLXZhbHVhdGlvbi1qd2I8L21hcms6bGFiZWw+
+PG1hcms6bGFiZWw+eG4tLWVzc2FpYW5kdmFsdWF0aW9uLWl0YjwvbWFyazpsYWJlbD48bWFyazps
+YWJlbD54bi0tZXNzYWlldC12YWx1YXRpb24taXRiPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhu
+LS1lc3NhaWV0dmFsdWF0aW9uLWhxYjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tZXNzYWl2
+YWx1YXRpb24tZmtiPC9tYXJrOmxhYmVsPjxtYXJrOmdvb2RzQW5kU2VydmljZXM+Z3VpdGFyZTwv
+bWFyazpnb29kc0FuZFNlcnZpY2VzPjxtYXJrOnJlZ051bT4xMjM0PC9tYXJrOnJlZ051bT48bWFy
+azpyZWdEYXRlPjIwMTMtMDEtMDFUMDA6MDA6MDAuMDAwWjwvbWFyazpyZWdEYXRlPjwvbWFyazp0
+cmFkZW1hcms+PC9tYXJrOm1hcms+PGRzOlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0cDovL3d3dy53
+My5vcmcvMjAwMC8wOS94bWxkc2lnIyIgSWQ9Il81NjY2YTJhZC01NzAzLTRiMjItYWU0Yy1lNzIz
+YmQ5NzRkNTYiPjxkczpTaWduZWRJbmZvPjxkczpDYW5vbmljYWxpemF0aW9uTWV0aG9kIEFsZ29y
+aXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PGRzOlNpZ25h
+dHVyZU1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZHNpZy1t
+b3JlI3JzYS1zaGEyNTYiLz48ZHM6UmVmZXJlbmNlIFVSST0iI18wMDQyNWU1ZS1iOTc4LTQ1MmIt
+OTJiMy00NmJhODMxOWJmNWQiPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGht
+PSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjZW52ZWxvcGVkLXNpZ25hdHVyZSIv
+PjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1l
+eGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0
+dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1ZT42
+U1RiZk11V0w5NGVXT2ViQlJScmhwME1ZTGRqUC9LMG9RTUVMOXpnRW9JPTwvZHM6RGlnZXN0VmFs
+dWU+PC9kczpSZWZlcmVuY2U+PGRzOlJlZmVyZW5jZSBVUkk9IiNfNTM1MDNhNDMtNGJjMi00YmJi
+LWIwODAtOTNmNzg0NzgxNzRlIj48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRo
+bT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zv
+cm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0
+L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+WTF6TzVOeEpVVUhCQnpBa2pvakpweEZP
+TTc0bkQxNjUwdnA3LzQrUjZnVT08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNlPjwvZHM6
+U2lnbmVkSW5mbz48ZHM6U2lnbmF0dXJlVmFsdWUgSWQ9Il9mNTBhNDUyMC1iOWZhLTRlOWQtODlk
+NS1kZGQwNWVhODQ4ZjkiPlpya1piSHlOMnJnUnBNK3pJZG1BY0hJVlc0OEQyV2FhQXUvOTVicmQ0
+QzdvRXlrOUFaUHl2MnMzM1NuQ3ZZZnZrVG1BL09qdElnZEImIzEzOwo3aFBCSkZ6WkJlbzNXV0Zz
+bCt1MEdONUpFVk5Dc3ZHTWVKNmh0dnF0ODJ2QVg0cENuVXg0bVhKaHhtQ0czOFBRRS9ZWjh0aU9t
+MzNWJiMxMzsKajNaODhveC9HdE9mQ25PRzFyZ3hiVzdMeEpQNVFPbWE2K1pOYXRDMGJ6VWhMKzNN
+MWpUblZNcjZxbEp0YVNqbWpwV3BtN0hHLzlVNCYjMTM7CndzVzVydTREb1NHcUpKYWJDbm1BeFIz
+OXpUa0lha0ZCd2p0cStvTkFsZnRXVitPSzh0d0JxU1lsSHZGZy8yaXBwZm5lNHNJb05aRWkmIzEz
+OwpIUnZ6UzRWVkplekJZT0FUT0VGdDduSjZGRnYzdDFZcGV0K1EzMm0zaVN0b3ArWGx1cDNXMk03
+dEhPVW5rMjVJZ2thbDQzUUFkL2VwJiMxMzsKV013S1FubHBFM1FvMm92d2ROYjh4cUttZ201ck80
+QzdZTnpGWTBZWWtENFUwZ1NUcFVCMi84bDIyOHRxdnhyMm8rM2RQV3RIbWM1ViYjMTM7ClVROGdT
+MTFEcXIvditwOVE0L2ZKdU5UYVJSSTI1VzR6R3NFb2x6M0R6WWRlOEFPejF5QitBUEJPRTI2Qm5J
+a29mLzFoSEd5Y0IrWk8mIzEzOwp1ZzVVWGRFbHNlTER0NE9zengwYVgwN1d6V1k0R2xzV1EyRGdm
+alRtTVVXdnh5YktLSEpRMWM3QWNQMGtVL3Q4SThBUmlUcXZmaDRnJiMxMzsKWlprc1QwR1lXM0dB
+K0RzTEpQcU4ra0czK2lUZGh0Nzk5S2Z3bE85djg2UktlMklHVFp0Z05sR1ZYY2t4clRLeUROQXVa
+U2NGQUdBPTwvZHM6U2lnbmF0dXJlVmFsdWU+PGRzOktleUluZm8gSWQ9Il81MzUwM2E0My00YmMy
+LTRiYmItYjA4MC05M2Y3ODQ3ODE3NGUiPjxkczpYNTA5RGF0YT48ZHM6WDUwOUNlcnRpZmljYXRl
+Pk1JSUhYekNDQlVlZ0F3SUJBZ0lVWHFJL3ZkMThDYWc5OG9OcGR6VjdCaXkvNkVBd0RRWUpLb1pJ
+aHZjTkFRRU5CUUF3ZkRFTE1Ba0cmIzEzOwpBMVVFQmhNQ1ZWTXhQREE2QmdOVkJBb01NMGx1ZEdW
+eWJtVjBJRU52Y25CdmNtRjBhVzl1SUdadmNpQkJjM05wWjI1bFpDQk9ZVzFsJiMxMzsKY3lCaGJt
+UWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF3d21TVU5CVGs0Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5YVc1
+bmFHOTFjMlVnVUdscyYjMTM7CmIzUWdRMEV3SGhjTk1qSXhNVEUyTVRNeU9EVTVXaGNOTWpjeE1U
+RTFNVE15T0RVNVdqQ0IwREVMTUFrR0ExVUVCaE1DUWtVeEVUQVAmIzEzOwpCZ05WQkFnVENFSnlk
+WE56Wld4ek1SSXdFQVlEVlFRSEV3bFdhV3gyYjI5eVpHVXhNekF4QmdOVkJBb1RLa1JsYkc5cGRI
+UmxJRU52JiMxMzsKYm5OMWJIUnBibWNnWVc1a0lFRmtkbWx6YjNKNUlFTldRa0V2VTBOU1RERStN
+RHdHQTFVRUF4TTFTVU5CVGs0Z1ZFMURTQ0JCZFhSbyYjMTM7CmIzSnBlbVZrSUZSeVlXUmxiV0Z5
+YXlCUWFXeHZkQ0JXWVd4cFpHRjBiM0lnVm1Gc2FXUXhKVEFqQmdrcWhraUc5dzBCQ1FFV0ZtSmwm
+IzEzOwpkRzFqYUhOdFpFQmtaV3h2YVhSMFpTNWpiMjB3Z2dJaU1BMEdDU3FHU0liM0RRRUJBUVVB
+QTRJQ0R3QXdnZ0lLQW9JQ0FRQzZGSnd6JiMxMzsKS3FRVlg2ZkczL0VMUlNHV1Y5R3JLYUZNS21o
+V0l4ZXB3UlpONk14TXFrZDVEbllmaVQrV3A5OGpFa3FnVHgyVU1iOXF1Z2NHTlY2ZyYjMTM7CjM1
+L0NyUWIvRi9tejNDNHNmTE51RHBTcUs5UUY4K3BhVEg2aFFtck9wcVYrVVR2ZGo5U01nS0d5Rml6
+Uzg4Q0RXTXg0dzNpNEZBS2UmIzEzOwo2TlJzSlJHVEF0S0R1TUhjQTRzajA4R2plM2xQV2NnRnZj
+UU5EVmVFQlR1T0hCRytSaGo3VjFKaU5HUC80ZXBUWFRGWGdQRkRnZXozJiMxMzsKWUFmeHFwYnVP
+NFRYNmJiWWRrMm52TUxGdkxFTmtDRll1bG5ZUHpnbkVCR1NNS0lhQUlsYitzY0hDdldnV2oyVExn
+d2gyR0pOY3pWTSYjMTM7CjFMUE1xR1MrVWtpOU1oNzk4MjIveG9hcjQ5OHhEeDJZeC84c3dnRU5M
+U2dDc1FBVzhuTWd3V242QWJZbDJSQUJYdXJheUZzbjRQMVImIzEzOwp1UU5tVXAvcXJSS1J2U0py
+MU9Ma0haZkZUY1NZUWFWaXVNWVBYekd6OHRtTUxsbUkvQjZBQ0g0QXdSTWRuWXZGTzNLSTFSQm5Q
+S0lkJiMxMzsKd3dmVXBaNUlUSXBiQTdDR2dUeDFxeHRNMXdJVXI3cEhlS1A2alZlM2tkRExnKy9C
+WjJ4TUV0Qms1YThZN0I0djN4d0hYR1R2VjhtTiYjMTM7CjBBZy9TeVQvUVV5RVJoWFV5QU4yK0V3
+WitTUUNVeU5memlvV1E4NzhlR3lrVSs0NitCYmdJM0lJcjM2WEtQd216dDBTWitLSTN0bkYmIzEz
+OwpUbG45bVgwS0MwaWRvajV5a3pQb0MvTUllZDBzcDRUaWd4RWJXTng3RUY4MFB2Ui9EREV3VlBF
+RWtrank2M1hGdWx4aUNRSURBUUFCJiMxMzsKbzRJQmdqQ0NBWDR3REFZRFZSMFRBUUgvQkFJd0FE
+QU9CZ05WSFE4QkFmOEVCQU1DQjRBd0hRWURWUjBPQkJZRUZIbjlzMERFYTJrdiYjMTM7CmdFL2VJ
+T1RzcW9XODVNWEZNSUc2QmdOVkhTTUVnYkl3Z2ErQUZFZDdUNjU2VVpHMTBiK2ROdW1HZnpZV0JL
+bEZvWUdBcEg0d2ZERUwmIzEzOwpNQWtHQTFVRUJoTUNWVk14UERBNkJnTlZCQW9NTTBsdWRHVnli
+bVYwSUVOdmNuQnZjbUYwYVc5dUlHWnZjaUJCYzNOcFoyNWxaQ0JPJiMxMzsKWVcxbGN5QmhibVFn
+VG5WdFltVnljekV2TUMwR0ExVUVBd3dtU1VOQlRrNGdWSEpoWkdWdFlYSnJJRU5zWldGeWFXNW5h
+RzkxYzJVZyYjMTM7ClVHbHNiM1FnUTBHQ0ZIcHFiVEZlSmNQdFVDOVh1dVBLUHNMd0RSK01NRFFH
+QTFVZEh3UXRNQ3N3S2FBbm9DV0dJMmgwZEhBNkx5OWomIzEzOwpjbXd1YVdOaGJtNHViM0puTDNS
+dFkyaGZjR2xzYjNRdVkzSnNNRXdHQTFVZElBUkZNRU13RUFZT0t3WUJCQUdDeVJzQkJZTTdEQW93
+JiMxMzsKTHdZSUt3WUJCUVVIQWdFd0l6QWhCZ2dyQmdFRkJRY0NBUllWYUhSMGNITTZMeTlqY0hN
+dWFXTmhibTR1YjNKbk1BMEdDU3FHU0liMyYjMTM7CkRRRUJEUVVBQTRJQ0FRQmRTYXQ1NnVlakxu
+QWpGSUY5NWRqWVdJNnMvL042WVh4c3JyTWtHQlA4RWV6UHloTGg2YXdQNHo3UTlRQUkmIzEzOwpR
+WmtZb3hybC8xeTArYnlWMnFuVFVVQ0xScEsvQkRwL2hjZndQZktDQS8yUlFDSEpyYjYrejBlbkRQ
+RlJLME5LbXdPY2RsR3RVazBtJiMxMzsKUGdXR1NLdHV3VnNQQWhUREp1aG9zWk9oa05mK25TT09I
+clFPbjFFMnJ6T3JkL2tRbHFpQ3dSSDk3OTZOcFRBK0hTTWZPb2JKRUVQcSYjMTM7CnRwRjdQNXFi
+d3RsOTVVYTVPcDRBaGE3MEhIZlVGUzRCT1FLTEJWZk1aZE9SK2lQb2g1T3dBSytodFlrRkNHOVAy
+V0h1N3dmOEVDK1cmIzEzOwo3azk2Z3ZUZDh4RTdvdW9hYlQyeDZZZllxRWxQSGlVL0lNOWdWeldX
+TC9zdllEeVNWdW9Gd0JqRE5OMWNkcTBxT1lSMXl1UzFjLzlEJiMxMzsKRlI3ZW83R0ZFQ3krVEJk
+N0lpS1JmQlZlWUdPT1BNbm9GZnhSTFdycHNXTm53RDdsa1BrTENnRkNrKzh5RWNPUmc2MjVtbzY1
+ejR5NiYjMTM7Cko0Szhmb2RhN3F3bVhOUDNSUzE4b242Qkh0OGxRK2JYZ09IbXhJSGswYU8wcU5E
+cWd2THIyRmx5TEdKR2lFTVJxRE1NUjYvYTA2YnQmIzEzOwprblVNSGw3Q3FNZmpJa2pQNFZOTnlH
+UGRKZ3dWazJrZWI5dU5GdkpDeFQrTTJmR1hRMU5iSk5mdHY1TWdTc3A5TjF5K3g2Z0EzRWh3JiMx
+MzsKeUhsbUpCNFlNdG84dFRWMWk4NHhQWHhpMkNBZURhR0R1d29zdDhZVUNTanE3UkNLOHRHY2FB
+WXJrWFFZMnlRZlgzY3dEc0V4UnFWVyYjMTM7CnlyanlSdCtONm1LOTlRPT08L2RzOlg1MDlDZXJ0
+aWZpY2F0ZT48L2RzOlg1MDlEYXRhPjwvZHM6S2V5SW5mbz48L2RzOlNpZ25hdHVyZT48L3NtZDpz
+aWduZWRNYXJrPgo=
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Holder-French/TreatyStatute-Holder-French-Active.smd b/core/src/test/resources/google/registry/tmch/idn/Holder-French/TreatyStatute-Holder-French-Active.smd
new file mode 100644
index 000000000..1a537ed41
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Holder-French/TreatyStatute-Holder-French-Active.smd
@@ -0,0 +1,122 @@
+Marks: Essai & évaluation
+smdID: 000000661669081987707-65535
+U-labels: xn--essai---valuation-itb, xn--essai--valuation-hqb, xn--essai-and-valuation-kzb, xn--essai-andvaluation-jwb, xn--essai-valuation-gnb, xn--essaiand-valuation-jwb, xn--essaiandvaluation-itb, xn--essaivaluation-fkb
+notBefore: 2022-11-22T01:53:07.707Z
+notAfter: 2027-10-21T08:12:14.116Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il9jZGY1
+MWZlMy1jN2ViLTQ5YTYtOTRhOS1kMWQyZjJjMjk1ZGUiPjxzbWQ6aWQ+MDAwMDAwNjYxNjY5MDgx
+OTg3NzA3LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMTo1MzowNy43MDdaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0yMVQwODoxMjoxNC4xMTZaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
+cmVhdHlPclN0YXR1dGU+PG1hcms6aWQ+MDAwMTM4MTUwMzA2MTEzMDE1MDMwNjExMzAtMTwvbWFy
+azppZD48bWFyazptYXJrTmFtZT5Fc3NhaSAmYW1wOyDDqXZhbHVhdGlvbjwvbWFyazptYXJrTmFt
+ZT48bWFyazpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpuYW1lPkplYW4gTGVibGFu
+YzwvbWFyazpuYW1lPjxtYXJrOm9yZz5PcmFuaXNhdGlvbiBkZSB0ZXN0PC9tYXJrOm9yZz48bWFy
+azphZGRyPjxtYXJrOnN0cmVldD5SVUUgUk9HTkUgNDAgPC9tYXJrOnN0cmVldD48bWFyazpjaXR5
+PkFSVE9JUzwvbWFyazpjaXR5PjxtYXJrOnBjPjIxMzAxPC9tYXJrOnBjPjxtYXJrOmNjPkZSPC9t
+YXJrOmNjPjwvbWFyazphZGRyPjxtYXJrOnZvaWNlPiszMy4yNjQ5OTUwMzI8L21hcms6dm9pY2U+
+PG1hcms6ZmF4PiszMy4yNjQ5OTUwMzM8L21hcms6ZmF4PjxtYXJrOmVtYWlsPmluZm9AZXhhbXBs
+ZS5leGFtcGxlPC9tYXJrOmVtYWlsPjwvbWFyazpob2xkZXI+PG1hcms6cHJvdGVjdGlvbj48bWFy
+azpjYz5VUzwvbWFyazpjYz48bWFyazpydWxpbmc+RlI8L21hcms6cnVsaW5nPjwvbWFyazpwcm90
+ZWN0aW9uPjxtYXJrOmxhYmVsPnhuLS1lc3NhaS0tLXZhbHVhdGlvbi1pdGI8L21hcms6bGFiZWw+
+PG1hcms6bGFiZWw+eG4tLWVzc2FpLS12YWx1YXRpb24taHFiPC9tYXJrOmxhYmVsPjxtYXJrOmxh
+YmVsPnhuLS1lc3NhaS1hbmQtdmFsdWF0aW9uLWt6YjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54
+bi0tZXNzYWktYW5kdmFsdWF0aW9uLWp3YjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tZXNz
+YWktdmFsdWF0aW9uLWduYjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tZXNzYWlhbmQtdmFs
+dWF0aW9uLWp3YjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tZXNzYWlhbmR2YWx1YXRpb24t
+aXRiPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1lc3NhaXZhbHVhdGlvbi1ma2I8L21hcms6
+bGFiZWw+PG1hcms6Z29vZHNBbmRTZXJ2aWNlcz5ndWl0YXJlPC9tYXJrOmdvb2RzQW5kU2Vydmlj
+ZXM+PG1hcms6cmVmTnVtPkVzc2FpICZhbXA7IMOpdmFsdWF0aW9uPC9tYXJrOnJlZk51bT48bWFy
+azpwcm9EYXRlPjIwMDAtMDEtMDFUMDA6MDA6MDAuMDAwWjwvbWFyazpwcm9EYXRlPjxtYXJrOnRp
+dGxlPjEyMzQ8L21hcms6dGl0bGU+PG1hcms6ZXhlY0RhdGU+MjAxMy0wMi0wMlQwMDowMDowMC4w
+MDBaPC9tYXJrOmV4ZWNEYXRlPjwvbWFyazp0cmVhdHlPclN0YXR1dGU+PC9tYXJrOm1hcms+PGRz
+OlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyIg
+SWQ9Il80NTc0Mjk2MC0wNDUzLTQ4ZWUtODhlOS04NjBlYTliNWQ5Y2IiPjxkczpTaWduZWRJbmZv
+PjxkczpDYW5vbmljYWxpemF0aW9uTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcv
+MjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PGRzOlNpZ25hdHVyZU1ldGhvZCBBbGdvcml0aG09Imh0
+dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZHNpZy1tb3JlI3JzYS1zaGEyNTYiLz48ZHM6UmVm
+ZXJlbmNlIFVSST0iI19jZGY1MWZlMy1jN2ViLTQ5YTYtOTRhOS1kMWQyZjJjMjk1ZGUiPjxkczpU
+cmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAw
+LzA5L3htbGRzaWcjZW52ZWxvcGVkLXNpZ25hdHVyZSIvPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGht
+PSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9y
+bXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQv
+eG1sZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1ZT5DVzNINGpiTi8vZWNabDRPWmZCVVhuajBE
+TGs1Q2k2emNmaGllb3FWVWpBPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PGRzOlJl
+ZmVyZW5jZSBVUkk9IiNfMjBkZWY3ZjktMzIyMi00ZThiLWFlY2QtNTA4NTJiYzU4OTY2Ij48ZHM6
+VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAw
+MS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxn
+b3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGln
+ZXN0VmFsdWU+V1pCWm9wcGptZWR3Y1lraGpheFNvNXQvS0FRVkhMaHN4MWlTMVhWNWhwND08L2Rz
+OkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNlPjwvZHM6U2lnbmVkSW5mbz48ZHM6U2lnbmF0dXJl
+VmFsdWUgSWQ9Il9lOGY1ZDQ5Mi0zYjA3LTRhMTAtOGYwNi1lNTI0ZTBlMjY4NTkiPnFXTlFJOGRN
+TVdSRkRmK05XZGVuUDhJSGxlL284WmtVRVpVSXlZVXl1VFJDWmcrSWhQdEt4K1pmL1pDY0VVRzBT
+ckxtbFhtRWpKcnMmIzEzOwp1UHpiTnFGYWdGOS9nWG1EOWl4eVNaODFiZ1RuS2dpS2s1RlAwUC95
+amw3OStYOXlubEJZa01FN0NhTnkrR1U2N3V0QytJVzV3WWZJJiMxMzsKaTEvaDNrdVd1cHFMeXZD
+cTI5K0p4TWF3dkpJYzlMWVRrYzJJR1VPK3h2TkJsQkJoeGhLdHBRUW1sV0ttZFZYM2RPVjNHOTVn
+U1hsUiYjMTM7CllVQ2t1QXVKY0dITVJkUWxtVjE2T3B6QklsWUgyb0ZzNHZ4Z29XRmNKMDl6WDBJ
+M3ZTVXJPS3NsNUJQRndHOVBRem5tWlBza2xhMnkmIzEzOwo4UGswblRkVVNCak53WjdGVU5hMTRR
+aVBXOE1LbTZ6UkY2RGZ0Rkd1WDRsb29XdDg0MnZGUDFrWXZtT2lsQ2NZYisyVmtOZWRXK1dJJiMx
+MzsKRnMvZ0hLNld0NjhIZktFcUpPbkt1T3RBVFVkc1ZCZzgxbnlsc2lUNzAvbEFkbXZtSFR6U1FZ
+bTV5L3E5NjNIVXRuU3R2U1dQbjBoTCYjMTM7CjlvTXpVU1E0SFBZcGlDL0RIQ09NWEl2T21TNVln
+eklLV0l3cXl4b1B0Z3BPSE9qdnZFbXhTVjYyQnprWWxuNlhVamhZaGszQjB4dUkmIzEzOwp4U2dX
+RFJHKzdaOG9JeVZBUFNwbFdabmNUOWJyT0t5dkxia0VUNFdiRGF4R3RiVzJSYlEyenVweVFIZVJS
+N3Nrd1pKMkNZei9qdXB0JiMxMzsKMUtKd3dYL3dpZ3F6Y0JYUHVBRDRwTUZrNENzNU5pZExhZkhS
+bjJCSjRCQjBBTE42bzgweERPS0ltWjNUbjZ5OXQ1R3pPMm50OVk4PTwvZHM6U2lnbmF0dXJlVmFs
+dWU+PGRzOktleUluZm8gSWQ9Il8yMGRlZjdmOS0zMjIyLTRlOGItYWVjZC01MDg1MmJjNTg5NjYi
+PjxkczpYNTA5RGF0YT48ZHM6WDUwOUNlcnRpZmljYXRlPk1JSUhYekNDQlVlZ0F3SUJBZ0lVWHFJ
+L3ZkMThDYWc5OG9OcGR6VjdCaXkvNkVBd0RRWUpLb1pJaHZjTkFRRU5CUUF3ZkRFTE1Ba0cmIzEz
+OwpBMVVFQmhNQ1ZWTXhQREE2QmdOVkJBb01NMGx1ZEdWeWJtVjBJRU52Y25CdmNtRjBhVzl1SUda
+dmNpQkJjM05wWjI1bFpDQk9ZVzFsJiMxMzsKY3lCaGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF3
+d21TVU5CVGs0Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5YVc1bmFHOTFjMlVnVUdscyYjMTM7CmIzUWdR
+MEV3SGhjTk1qSXhNVEUyTVRNeU9EVTVXaGNOTWpjeE1URTFNVE15T0RVNVdqQ0IwREVMTUFrR0Ex
+VUVCaE1DUWtVeEVUQVAmIzEzOwpCZ05WQkFnVENFSnlkWE56Wld4ek1SSXdFQVlEVlFRSEV3bFdh
+V3gyYjI5eVpHVXhNekF4QmdOVkJBb1RLa1JsYkc5cGRIUmxJRU52JiMxMzsKYm5OMWJIUnBibWNn
+WVc1a0lFRmtkbWx6YjNKNUlFTldRa0V2VTBOU1RERStNRHdHQTFVRUF4TTFTVU5CVGs0Z1ZFMURT
+Q0JCZFhSbyYjMTM7CmIzSnBlbVZrSUZSeVlXUmxiV0Z5YXlCUWFXeHZkQ0JXWVd4cFpHRjBiM0ln
+Vm1Gc2FXUXhKVEFqQmdrcWhraUc5dzBCQ1FFV0ZtSmwmIzEzOwpkRzFqYUhOdFpFQmtaV3h2YVhS
+MFpTNWpiMjB3Z2dJaU1BMEdDU3FHU0liM0RRRUJBUVVBQTRJQ0R3QXdnZ0lLQW9JQ0FRQzZGSnd6
+JiMxMzsKS3FRVlg2ZkczL0VMUlNHV1Y5R3JLYUZNS21oV0l4ZXB3UlpONk14TXFrZDVEbllmaVQr
+V3A5OGpFa3FnVHgyVU1iOXF1Z2NHTlY2ZyYjMTM7CjM1L0NyUWIvRi9tejNDNHNmTE51RHBTcUs5
+UUY4K3BhVEg2aFFtck9wcVYrVVR2ZGo5U01nS0d5Rml6Uzg4Q0RXTXg0dzNpNEZBS2UmIzEzOwo2
+TlJzSlJHVEF0S0R1TUhjQTRzajA4R2plM2xQV2NnRnZjUU5EVmVFQlR1T0hCRytSaGo3VjFKaU5H
+UC80ZXBUWFRGWGdQRkRnZXozJiMxMzsKWUFmeHFwYnVPNFRYNmJiWWRrMm52TUxGdkxFTmtDRll1
+bG5ZUHpnbkVCR1NNS0lhQUlsYitzY0hDdldnV2oyVExnd2gyR0pOY3pWTSYjMTM7CjFMUE1xR1Mr
+VWtpOU1oNzk4MjIveG9hcjQ5OHhEeDJZeC84c3dnRU5MU2dDc1FBVzhuTWd3V242QWJZbDJSQUJY
+dXJheUZzbjRQMVImIzEzOwp1UU5tVXAvcXJSS1J2U0pyMU9Ma0haZkZUY1NZUWFWaXVNWVBYekd6
+OHRtTUxsbUkvQjZBQ0g0QXdSTWRuWXZGTzNLSTFSQm5QS0lkJiMxMzsKd3dmVXBaNUlUSXBiQTdD
+R2dUeDFxeHRNMXdJVXI3cEhlS1A2alZlM2tkRExnKy9CWjJ4TUV0Qms1YThZN0I0djN4d0hYR1R2
+VjhtTiYjMTM7CjBBZy9TeVQvUVV5RVJoWFV5QU4yK0V3WitTUUNVeU5memlvV1E4NzhlR3lrVSs0
+NitCYmdJM0lJcjM2WEtQd216dDBTWitLSTN0bkYmIzEzOwpUbG45bVgwS0MwaWRvajV5a3pQb0Mv
+TUllZDBzcDRUaWd4RWJXTng3RUY4MFB2Ui9EREV3VlBFRWtrank2M1hGdWx4aUNRSURBUUFCJiMx
+MzsKbzRJQmdqQ0NBWDR3REFZRFZSMFRBUUgvQkFJd0FEQU9CZ05WSFE4QkFmOEVCQU1DQjRBd0hR
+WURWUjBPQkJZRUZIbjlzMERFYTJrdiYjMTM7CmdFL2VJT1RzcW9XODVNWEZNSUc2QmdOVkhTTUVn
+Ykl3Z2ErQUZFZDdUNjU2VVpHMTBiK2ROdW1HZnpZV0JLbEZvWUdBcEg0d2ZERUwmIzEzOwpNQWtH
+QTFVRUJoTUNWVk14UERBNkJnTlZCQW9NTTBsdWRHVnlibVYwSUVOdmNuQnZjbUYwYVc5dUlHWnZj
+aUJCYzNOcFoyNWxaQ0JPJiMxMzsKWVcxbGN5QmhibVFnVG5WdFltVnljekV2TUMwR0ExVUVBd3dt
+U1VOQlRrNGdWSEpoWkdWdFlYSnJJRU5zWldGeWFXNW5hRzkxYzJVZyYjMTM7ClVHbHNiM1FnUTBH
+Q0ZIcHFiVEZlSmNQdFVDOVh1dVBLUHNMd0RSK01NRFFHQTFVZEh3UXRNQ3N3S2FBbm9DV0dJMmgw
+ZEhBNkx5OWomIzEzOwpjbXd1YVdOaGJtNHViM0puTDNSdFkyaGZjR2xzYjNRdVkzSnNNRXdHQTFV
+ZElBUkZNRU13RUFZT0t3WUJCQUdDeVJzQkJZTTdEQW93JiMxMzsKTHdZSUt3WUJCUVVIQWdFd0l6
+QWhCZ2dyQmdFRkJRY0NBUllWYUhSMGNITTZMeTlqY0hNdWFXTmhibTR1YjNKbk1BMEdDU3FHU0li
+MyYjMTM7CkRRRUJEUVVBQTRJQ0FRQmRTYXQ1NnVlakxuQWpGSUY5NWRqWVdJNnMvL042WVh4c3Jy
+TWtHQlA4RWV6UHloTGg2YXdQNHo3UTlRQUkmIzEzOwpRWmtZb3hybC8xeTArYnlWMnFuVFVVQ0xS
+cEsvQkRwL2hjZndQZktDQS8yUlFDSEpyYjYrejBlbkRQRlJLME5LbXdPY2RsR3RVazBtJiMxMzsK
+UGdXR1NLdHV3VnNQQWhUREp1aG9zWk9oa05mK25TT09IclFPbjFFMnJ6T3JkL2tRbHFpQ3dSSDk3
+OTZOcFRBK0hTTWZPb2JKRUVQcSYjMTM7CnRwRjdQNXFid3RsOTVVYTVPcDRBaGE3MEhIZlVGUzRC
+T1FLTEJWZk1aZE9SK2lQb2g1T3dBSytodFlrRkNHOVAyV0h1N3dmOEVDK1cmIzEzOwo3azk2Z3ZU
+ZDh4RTdvdW9hYlQyeDZZZllxRWxQSGlVL0lNOWdWeldXTC9zdllEeVNWdW9Gd0JqRE5OMWNkcTBx
+T1lSMXl1UzFjLzlEJiMxMzsKRlI3ZW83R0ZFQ3krVEJkN0lpS1JmQlZlWUdPT1BNbm9GZnhSTFdy
+cHNXTm53RDdsa1BrTENnRkNrKzh5RWNPUmc2MjVtbzY1ejR5NiYjMTM7Cko0Szhmb2RhN3F3bVhO
+UDNSUzE4b242Qkh0OGxRK2JYZ09IbXhJSGswYU8wcU5EcWd2THIyRmx5TEdKR2lFTVJxRE1NUjYv
+YTA2YnQmIzEzOwprblVNSGw3Q3FNZmpJa2pQNFZOTnlHUGRKZ3dWazJrZWI5dU5GdkpDeFQrTTJm
+R1hRMU5iSk5mdHY1TWdTc3A5TjF5K3g2Z0EzRWh3JiMxMzsKeUhsbUpCNFlNdG84dFRWMWk4NHhQ
+WHhpMkNBZURhR0R1d29zdDhZVUNTanE3UkNLOHRHY2FBWXJrWFFZMnlRZlgzY3dEc0V4UnFWVyYj
+MTM7CnlyanlSdCtONm1LOTlRPT08L2RzOlg1MDlDZXJ0aWZpY2F0ZT48L2RzOlg1MDlEYXRhPjwv
+ZHM6S2V5SW5mbz48L2RzOlNpZ25hdHVyZT48L3NtZDpzaWduZWRNYXJrPgo=
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Holder-French/TreatyStatute-Holder-French-Revoked.smd b/core/src/test/resources/google/registry/tmch/idn/Holder-French/TreatyStatute-Holder-French-Revoked.smd
new file mode 100644
index 000000000..7ca090e86
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Holder-French/TreatyStatute-Holder-French-Revoked.smd
@@ -0,0 +1,122 @@
+Marks: Essai & évaluation
+smdID: 000000661669081899289-65535
+U-labels: xn--essai---valuation-itb, xn--essai--valuation-hqb, xn--essai-and-valuation-kzb, xn--essai-andvaluation-jwb, xn--essai-valuation-gnb, xn--essaiand-valuation-jwb, xn--essaiandvaluation-itb, xn--essaivaluation-fkb
+notBefore: 2022-11-22T01:51:39.289Z
+notAfter: 2027-10-21T08:12:14.116Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il85NjMy
+ODIyMS1lYmVkLTQ4OGUtYTIxMy1lYjEzNDQ1MGM3MDkiPjxzbWQ6aWQ+MDAwMDAwNjYxNjY5MDgx
+ODk5Mjg5LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMTo1MTozOS4yODlaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0yMVQwODoxMjoxNC4xMTZaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
+cmVhdHlPclN0YXR1dGU+PG1hcms6aWQ+MDAwMTM4MTUwMzA2MTEzMDE1MDMwNjExMzAtMTwvbWFy
+azppZD48bWFyazptYXJrTmFtZT5Fc3NhaSAmYW1wOyDDqXZhbHVhdGlvbjwvbWFyazptYXJrTmFt
+ZT48bWFyazpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpuYW1lPkplYW4gTGVibGFu
+YzwvbWFyazpuYW1lPjxtYXJrOm9yZz5PcmFuaXNhdGlvbiBkZSB0ZXN0PC9tYXJrOm9yZz48bWFy
+azphZGRyPjxtYXJrOnN0cmVldD5SVUUgUk9HTkUgNDAgPC9tYXJrOnN0cmVldD48bWFyazpjaXR5
+PkFSVE9JUzwvbWFyazpjaXR5PjxtYXJrOnBjPjIxMzAxPC9tYXJrOnBjPjxtYXJrOmNjPkZSPC9t
+YXJrOmNjPjwvbWFyazphZGRyPjxtYXJrOnZvaWNlPiszMy4yNjQ5OTUwMzI8L21hcms6dm9pY2U+
+PG1hcms6ZmF4PiszMy4yNjQ5OTUwMzM8L21hcms6ZmF4PjxtYXJrOmVtYWlsPmluZm9AZXhhbXBs
+ZS5leGFtcGxlPC9tYXJrOmVtYWlsPjwvbWFyazpob2xkZXI+PG1hcms6cHJvdGVjdGlvbj48bWFy
+azpjYz5VUzwvbWFyazpjYz48bWFyazpydWxpbmc+RlI8L21hcms6cnVsaW5nPjwvbWFyazpwcm90
+ZWN0aW9uPjxtYXJrOmxhYmVsPnhuLS1lc3NhaS0tLXZhbHVhdGlvbi1pdGI8L21hcms6bGFiZWw+
+PG1hcms6bGFiZWw+eG4tLWVzc2FpLS12YWx1YXRpb24taHFiPC9tYXJrOmxhYmVsPjxtYXJrOmxh
+YmVsPnhuLS1lc3NhaS1hbmQtdmFsdWF0aW9uLWt6YjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54
+bi0tZXNzYWktYW5kdmFsdWF0aW9uLWp3YjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tZXNz
+YWktdmFsdWF0aW9uLWduYjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tZXNzYWlhbmQtdmFs
+dWF0aW9uLWp3YjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tZXNzYWlhbmR2YWx1YXRpb24t
+aXRiPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1lc3NhaXZhbHVhdGlvbi1ma2I8L21hcms6
+bGFiZWw+PG1hcms6Z29vZHNBbmRTZXJ2aWNlcz5ndWl0YXJlPC9tYXJrOmdvb2RzQW5kU2Vydmlj
+ZXM+PG1hcms6cmVmTnVtPkVzc2FpICZhbXA7IMOpdmFsdWF0aW9uPC9tYXJrOnJlZk51bT48bWFy
+azpwcm9EYXRlPjIwMDAtMDEtMDFUMDA6MDA6MDAuMDAwWjwvbWFyazpwcm9EYXRlPjxtYXJrOnRp
+dGxlPjEyMzQ8L21hcms6dGl0bGU+PG1hcms6ZXhlY0RhdGU+MjAxMy0wMi0wMlQwMDowMDowMC4w
+MDBaPC9tYXJrOmV4ZWNEYXRlPjwvbWFyazp0cmVhdHlPclN0YXR1dGU+PC9tYXJrOm1hcms+PGRz
+OlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyIg
+SWQ9Il8zOTdkMzc2Yy0xODNjLTQxOWMtODM4MS0zYTNjNzNlMjFkZDgiPjxkczpTaWduZWRJbmZv
+PjxkczpDYW5vbmljYWxpemF0aW9uTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcv
+MjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PGRzOlNpZ25hdHVyZU1ldGhvZCBBbGdvcml0aG09Imh0
+dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZHNpZy1tb3JlI3JzYS1zaGEyNTYiLz48ZHM6UmVm
+ZXJlbmNlIFVSST0iI185NjMyODIyMS1lYmVkLTQ4OGUtYTIxMy1lYjEzNDQ1MGM3MDkiPjxkczpU
+cmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAw
+LzA5L3htbGRzaWcjZW52ZWxvcGVkLXNpZ25hdHVyZSIvPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGht
+PSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9y
+bXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQv
+eG1sZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1ZT5QeFhERTFCdWxLQU1aQjlUOWgrUjdaTEpY
+Z2pYSUMzakZEek1WL1VFZjBBPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PGRzOlJl
+ZmVyZW5jZSBVUkk9IiNfYjRhZDY1MTQtYWNhNy00NzdmLWIwMDgtMTE3MGI2YzNkODdkIj48ZHM6
+VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAw
+MS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxn
+b3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGln
+ZXN0VmFsdWU+T2REL0dyRCs1S0ordzVWRnN3ZkVqTnQ2Sk1kUG43S1dGcmN0b2U3SG9MUT08L2Rz
+OkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNlPjwvZHM6U2lnbmVkSW5mbz48ZHM6U2lnbmF0dXJl
+VmFsdWUgSWQ9Il9hZTNhOWRjYy1kOTcxLTQ2OWUtYTBiMy01NmQ4MjM4YmRjMzUiPmtTdHZMVWRH
+RzJINThjRGNCNWoyaHhJSUNZWUxFenNlWFNkR0owRWVHUnBoQlB2RzBzQmVyeU12VWh0VGdLUHp2
+OHRJRVdkc1BsMUQmIzEzOwp3Z2Q0Qi9IZmc3c2N2eXpGbFZBQm9kbnFuSGgrbldoS2M4Q1hFbFY4
+ZXpVN3czZ0VYaWxmZ1l5T0ZJc2laaDdPWWtmWG5qbUFjVG1pJiMxMzsKQXhBY3BkYWV1NHhDdnor
+aFdJQVRUYWF6NGtBd1lyZ01uL1YrZE5VY0FWa05ISG4rVlhoYXpUZGk2YXNEbGNwa0xCTW82UGwx
+UWh1RSYjMTM7ClQ0K1NtOEJrOFAyeU9ZSk1lY29JQWtoOEVFcVdFZzdWSHdadjhGMnNXRDFxZUtU
+UjA0bXNibEJBM3hYcGdBYUZCRFgxbkNCQWF2MGcmIzEzOwptYzQwZ21VUnZzdFQvWUJXYVg4VFNa
+ZVUyT1FoQ2ZsTmYySEdhTzF6MWk4d2xwc0tLeExsWUs3R0ZmSmJjTWdSa3dUQ3BzeG1Na3dKJiMx
+MzsKb0U0MlR2TDMrcXZSRVZTSE9xNVAramZrdVhnSkUxZ0lBWGVBNUYxa0c1UzRJZC9wUXpzNVk3
+RE5yTVN3d1JsUDhwVGZFOG55UnV0RiYjMTM7CmxYaDVZQnBhNEgwWFFLZXdLUzNRd1pSVHlrRXY0
+STVPczhkTVJOUVFmSUtLaHhsK2VIMHJ4eHQ0d1N3dEtaL0dWbEU4cXE1UHRRWFImIzEzOwp4M2k2
+K0JKRmNqTVdLbXZCOUFxbkgzcGlZR1hzUTM3K2lEUldGYm9iYm9vYklpdmd6dUU4dnhDdEs1UUVi
+MzkxMVZGbmNEMnlFaEk3JiMxMzsKZFNrU0s0eDlWK0F4Q0FCaFJ3WnVVb1VVNGJWeDhJcjMrU3lE
+K0swNEJTNElkRmJ6Q2dnNVJpaUdIdkx2Y0pYVmY3K0hySWQvdVBFPTwvZHM6U2lnbmF0dXJlVmFs
+dWU+PGRzOktleUluZm8gSWQ9Il9iNGFkNjUxNC1hY2E3LTQ3N2YtYjAwOC0xMTcwYjZjM2Q4N2Qi
+PjxkczpYNTA5RGF0YT48ZHM6WDUwOUNlcnRpZmljYXRlPk1JSUhYekNDQlVlZ0F3SUJBZ0lVWHFJ
+L3ZkMThDYWc5OG9OcGR6VjdCaXkvNkVBd0RRWUpLb1pJaHZjTkFRRU5CUUF3ZkRFTE1Ba0cmIzEz
+OwpBMVVFQmhNQ1ZWTXhQREE2QmdOVkJBb01NMGx1ZEdWeWJtVjBJRU52Y25CdmNtRjBhVzl1SUda
+dmNpQkJjM05wWjI1bFpDQk9ZVzFsJiMxMzsKY3lCaGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF3
+d21TVU5CVGs0Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5YVc1bmFHOTFjMlVnVUdscyYjMTM7CmIzUWdR
+MEV3SGhjTk1qSXhNVEUyTVRNeU9EVTVXaGNOTWpjeE1URTFNVE15T0RVNVdqQ0IwREVMTUFrR0Ex
+VUVCaE1DUWtVeEVUQVAmIzEzOwpCZ05WQkFnVENFSnlkWE56Wld4ek1SSXdFQVlEVlFRSEV3bFdh
+V3gyYjI5eVpHVXhNekF4QmdOVkJBb1RLa1JsYkc5cGRIUmxJRU52JiMxMzsKYm5OMWJIUnBibWNn
+WVc1a0lFRmtkbWx6YjNKNUlFTldRa0V2VTBOU1RERStNRHdHQTFVRUF4TTFTVU5CVGs0Z1ZFMURT
+Q0JCZFhSbyYjMTM7CmIzSnBlbVZrSUZSeVlXUmxiV0Z5YXlCUWFXeHZkQ0JXWVd4cFpHRjBiM0ln
+Vm1Gc2FXUXhKVEFqQmdrcWhraUc5dzBCQ1FFV0ZtSmwmIzEzOwpkRzFqYUhOdFpFQmtaV3h2YVhS
+MFpTNWpiMjB3Z2dJaU1BMEdDU3FHU0liM0RRRUJBUVVBQTRJQ0R3QXdnZ0lLQW9JQ0FRQzZGSnd6
+JiMxMzsKS3FRVlg2ZkczL0VMUlNHV1Y5R3JLYUZNS21oV0l4ZXB3UlpONk14TXFrZDVEbllmaVQr
+V3A5OGpFa3FnVHgyVU1iOXF1Z2NHTlY2ZyYjMTM7CjM1L0NyUWIvRi9tejNDNHNmTE51RHBTcUs5
+UUY4K3BhVEg2aFFtck9wcVYrVVR2ZGo5U01nS0d5Rml6Uzg4Q0RXTXg0dzNpNEZBS2UmIzEzOwo2
+TlJzSlJHVEF0S0R1TUhjQTRzajA4R2plM2xQV2NnRnZjUU5EVmVFQlR1T0hCRytSaGo3VjFKaU5H
+UC80ZXBUWFRGWGdQRkRnZXozJiMxMzsKWUFmeHFwYnVPNFRYNmJiWWRrMm52TUxGdkxFTmtDRll1
+bG5ZUHpnbkVCR1NNS0lhQUlsYitzY0hDdldnV2oyVExnd2gyR0pOY3pWTSYjMTM7CjFMUE1xR1Mr
+VWtpOU1oNzk4MjIveG9hcjQ5OHhEeDJZeC84c3dnRU5MU2dDc1FBVzhuTWd3V242QWJZbDJSQUJY
+dXJheUZzbjRQMVImIzEzOwp1UU5tVXAvcXJSS1J2U0pyMU9Ma0haZkZUY1NZUWFWaXVNWVBYekd6
+OHRtTUxsbUkvQjZBQ0g0QXdSTWRuWXZGTzNLSTFSQm5QS0lkJiMxMzsKd3dmVXBaNUlUSXBiQTdD
+R2dUeDFxeHRNMXdJVXI3cEhlS1A2alZlM2tkRExnKy9CWjJ4TUV0Qms1YThZN0I0djN4d0hYR1R2
+VjhtTiYjMTM7CjBBZy9TeVQvUVV5RVJoWFV5QU4yK0V3WitTUUNVeU5memlvV1E4NzhlR3lrVSs0
+NitCYmdJM0lJcjM2WEtQd216dDBTWitLSTN0bkYmIzEzOwpUbG45bVgwS0MwaWRvajV5a3pQb0Mv
+TUllZDBzcDRUaWd4RWJXTng3RUY4MFB2Ui9EREV3VlBFRWtrank2M1hGdWx4aUNRSURBUUFCJiMx
+MzsKbzRJQmdqQ0NBWDR3REFZRFZSMFRBUUgvQkFJd0FEQU9CZ05WSFE4QkFmOEVCQU1DQjRBd0hR
+WURWUjBPQkJZRUZIbjlzMERFYTJrdiYjMTM7CmdFL2VJT1RzcW9XODVNWEZNSUc2QmdOVkhTTUVn
+Ykl3Z2ErQUZFZDdUNjU2VVpHMTBiK2ROdW1HZnpZV0JLbEZvWUdBcEg0d2ZERUwmIzEzOwpNQWtH
+QTFVRUJoTUNWVk14UERBNkJnTlZCQW9NTTBsdWRHVnlibVYwSUVOdmNuQnZjbUYwYVc5dUlHWnZj
+aUJCYzNOcFoyNWxaQ0JPJiMxMzsKWVcxbGN5QmhibVFnVG5WdFltVnljekV2TUMwR0ExVUVBd3dt
+U1VOQlRrNGdWSEpoWkdWdFlYSnJJRU5zWldGeWFXNW5hRzkxYzJVZyYjMTM7ClVHbHNiM1FnUTBH
+Q0ZIcHFiVEZlSmNQdFVDOVh1dVBLUHNMd0RSK01NRFFHQTFVZEh3UXRNQ3N3S2FBbm9DV0dJMmgw
+ZEhBNkx5OWomIzEzOwpjbXd1YVdOaGJtNHViM0puTDNSdFkyaGZjR2xzYjNRdVkzSnNNRXdHQTFV
+ZElBUkZNRU13RUFZT0t3WUJCQUdDeVJzQkJZTTdEQW93JiMxMzsKTHdZSUt3WUJCUVVIQWdFd0l6
+QWhCZ2dyQmdFRkJRY0NBUllWYUhSMGNITTZMeTlqY0hNdWFXTmhibTR1YjNKbk1BMEdDU3FHU0li
+MyYjMTM7CkRRRUJEUVVBQTRJQ0FRQmRTYXQ1NnVlakxuQWpGSUY5NWRqWVdJNnMvL042WVh4c3Jy
+TWtHQlA4RWV6UHloTGg2YXdQNHo3UTlRQUkmIzEzOwpRWmtZb3hybC8xeTArYnlWMnFuVFVVQ0xS
+cEsvQkRwL2hjZndQZktDQS8yUlFDSEpyYjYrejBlbkRQRlJLME5LbXdPY2RsR3RVazBtJiMxMzsK
+UGdXR1NLdHV3VnNQQWhUREp1aG9zWk9oa05mK25TT09IclFPbjFFMnJ6T3JkL2tRbHFpQ3dSSDk3
+OTZOcFRBK0hTTWZPb2JKRUVQcSYjMTM7CnRwRjdQNXFid3RsOTVVYTVPcDRBaGE3MEhIZlVGUzRC
+T1FLTEJWZk1aZE9SK2lQb2g1T3dBSytodFlrRkNHOVAyV0h1N3dmOEVDK1cmIzEzOwo3azk2Z3ZU
+ZDh4RTdvdW9hYlQyeDZZZllxRWxQSGlVL0lNOWdWeldXTC9zdllEeVNWdW9Gd0JqRE5OMWNkcTBx
+T1lSMXl1UzFjLzlEJiMxMzsKRlI3ZW83R0ZFQ3krVEJkN0lpS1JmQlZlWUdPT1BNbm9GZnhSTFdy
+cHNXTm53RDdsa1BrTENnRkNrKzh5RWNPUmc2MjVtbzY1ejR5NiYjMTM7Cko0Szhmb2RhN3F3bVhO
+UDNSUzE4b242Qkh0OGxRK2JYZ09IbXhJSGswYU8wcU5EcWd2THIyRmx5TEdKR2lFTVJxRE1NUjYv
+YTA2YnQmIzEzOwprblVNSGw3Q3FNZmpJa2pQNFZOTnlHUGRKZ3dWazJrZWI5dU5GdkpDeFQrTTJm
+R1hRMU5iSk5mdHY1TWdTc3A5TjF5K3g2Z0EzRWh3JiMxMzsKeUhsbUpCNFlNdG84dFRWMWk4NHhQ
+WHhpMkNBZURhR0R1d29zdDhZVUNTanE3UkNLOHRHY2FBWXJrWFFZMnlRZlgzY3dEc0V4UnFWVyYj
+MTM7CnlyanlSdCtONm1LOTlRPT08L2RzOlg1MDlDZXJ0aWZpY2F0ZT48L2RzOlg1MDlEYXRhPjwv
+ZHM6S2V5SW5mbz48L2RzOlNpZ25hdHVyZT48L3NtZDpzaWduZWRNYXJrPgo=
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Holder-Russian/Court-Holder-Russian-Active.smd b/core/src/test/resources/google/registry/tmch/idn/Holder-Russian/Court-Holder-Russian-Active.smd
new file mode 100644
index 000000000..c94c1eedb
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Holder-Russian/Court-Holder-Russian-Active.smd
@@ -0,0 +1,121 @@
+Marks: Сертификация & логотип
+smdID: 000000671669082995997-65535
+U-labels: xn------5cdshvabepr3bbqcpum2a9b4n, xn-----6kcogsabdop0bbpcotl1a7b8m, xn---and--3ve0aj1aabgrv9bbscrwo4a3c9n, xn---and-43dwiyabfqt6bbrcqvn3a1c0o, xn----7sbkfpabcnn7abocnsk0a5bzn, xn--and--43dwiyabfqt6bbrcqvn3a1c0o, xn--and-5cdshvabepr3bbqcpum2a9b4n, xn--80agemabbml4abncmrjz3b2m
+notBefore: 2022-11-22T02:09:55.997Z
+notAfter: 2027-10-21T08:12:08.921Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il82MjMz
+ZDJlNC02YzBlLTRlZGEtYmMyNS03OGI2MjM5YWI0NDciPjxzbWQ6aWQ+MDAwMDAwNjcxNjY5MDgy
+OTk1OTk3LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMjowOTo1NS45OTdaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0yMVQwODoxMjowOC45MjFaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazpj
+b3VydD48bWFyazppZD4wMDAxNDAxNTAzMDYzMjQ3MTUwMzA2MzI0Ny0xPC9tYXJrOmlkPjxtYXJr
+Om1hcmtOYW1lPtCh0LXRgNGC0LjRhNC40LrQsNGG0LjRjyAmYW1wOyDQu9C+0LPQvtGC0LjQvzwv
+bWFyazptYXJrTmFtZT48bWFyazpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpuYW1l
+PtCd0LDRgtCw0LvRjNGPINCQ0L3RgtC+0L3QvtCy0LA8L21hcms6bmFtZT48bWFyazpvcmc+0JDQ
+vdGC0L7QvdC+0LLQsDwvbWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpzdHJlZXQ+0J/RgNC+0YHQ
+v9C10LrRgiDQktC10YDQvdCw0LTRgdC60L7Qs9C+IDE1PC9tYXJrOnN0cmVldD48bWFyazpjaXR5
+PtCc0L7RgdC60LLQsDwvbWFyazpjaXR5PjxtYXJrOnBjPjExNzQ4NTwvbWFyazpwYz48bWFyazpj
+Yz5SVTwvbWFyazpjYz48L21hcms6YWRkcj48bWFyazp2b2ljZT4rNy45MTg4MjIxNjc0PC9tYXJr
+OnZvaWNlPjxtYXJrOmVtYWlsPmluZm9AZXhhbXBsZS5leGFtcGxlPC9tYXJrOmVtYWlsPjwvbWFy
+azpob2xkZXI+PG1hcms6bGFiZWw+eG4tLS0tLS01Y2RzaHZhYmVwcjNiYnFjcHVtMmE5YjRuPC9t
+YXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS0tLS02a2NvZ3NhYmRvcDBiYnBjb3RsMWE3YjhtPC9t
+YXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS0tYW5kLS0zdmUwYWoxYWFiZ3J2OWJic2Nyd280YTNj
+OW48L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLS1hbmQtNDNkd2l5YWJmcXQ2YmJyY3F2bjNh
+MWMwbzwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tLS03c2JrZnBhYmNubjdhYm9jbnNrMGE1
+YnpuPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1hbmQtLTQzZHdpeWFiZnF0NmJicmNxdm4z
+YTFjMG88L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLWFuZC01Y2RzaHZhYmVwcjNiYnFjcHVt
+MmE5YjRuPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS04MGFnZW1hYmJtbDRhYm5jbXJqejNi
+Mm08L21hcms6bGFiZWw+PG1hcms6Z29vZHNBbmRTZXJ2aWNlcz5ndWl0YXI8L21hcms6Z29vZHNB
+bmRTZXJ2aWNlcz48bWFyazpyZWZOdW0+MTIzNDwvbWFyazpyZWZOdW0+PG1hcms6cHJvRGF0ZT4y
+MDEzLTAxLTAxVDAwOjAwOjAwLjAwMFo8L21hcms6cHJvRGF0ZT48bWFyazpjYz5VUzwvbWFyazpj
+Yz48bWFyazpjb3VydE5hbWU+SG92ZTwvbWFyazpjb3VydE5hbWU+PC9tYXJrOmNvdXJ0PjwvbWFy
+azptYXJrPjxkczpTaWduYXR1cmUgeG1sbnM6ZHM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkv
+eG1sZHNpZyMiIElkPSJfZjc3YmE3NTgtNmY3Yi00NDYxLTlhNDctMmNjMjU2ZmY0ZmU3Ij48ZHM6
+U2lnbmVkSW5mbz48ZHM6Q2Fub25pY2FsaXphdGlvbk1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93
+d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjxkczpTaWduYXR1cmVNZXRob2QgQWxn
+b3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGRzaWctbW9yZSNyc2Etc2hhMjU2
+Ii8+PGRzOlJlZmVyZW5jZSBVUkk9IiNfNjIzM2QyZTQtNmMwZS00ZWRhLWJjMjUtNzhiNjIzOWFi
+NDQ3Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53
+My5vcmcvMjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48ZHM6VHJhbnNmb3Jt
+IEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9k
+czpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9y
+Zy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+RlBnNWxsT3VCYnU1RmlF
+SkdWak5vdi9nZ3VOcUJGeDMwb3BVekxqSXdmMD08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJl
+bmNlPjxkczpSZWZlcmVuY2UgVVJJPSIjXzAyMWI5YWIzLTZmNTgtNDg0OC1hMzk5LTczNDdmMTJj
+NzhhMyI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cu
+dzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6RGlnZXN0
+TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxlbmMjc2hhMjU2
+Ii8+PGRzOkRpZ2VzdFZhbHVlPkhZN1dhRlNmSTRPMTNQVkVja2F6ZFJHbnl4Ry9Ea3czWDhlRjgz
+Y3IxKzg9PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48L2RzOlNpZ25lZEluZm8+PGRz
+OlNpZ25hdHVyZVZhbHVlIElkPSJfNTRlMWIyN2EtN2ZjMS00OTVjLWEyNTUtZTExMzc5ODlkMTUx
+Ij5heWJhUURpYkxFRDdRdGpvc055NU1DaDQ3aFpvVE1MN2V4V0dBQTliUlRuNmFGL3U2YTRCaG1t
+cFpacDQrMU9iRmlndit2SkVhNGxBJiMxMzsKaUN4UmxldktMWVlVSUIzdHFSa1kyRVE3SHlPdjFS
+N0ZDbytpREl1bzhFN3dBZjJybFJOckhCS1FSeTFVbEFyNlBRYTh2ZENhelR1diYjMTM7Ckc1Qi9a
+QXUwck1NVllzeXBxVS80bkhWT0NtaTBoOTNsS3NGbVNWY3B4cjZiQUV1TCtpc0pybUlFRE5RMU1H
+M0dXb05yNW1NcVpXaVImIzEzOwpBRWtLQTFiZG9HYlR0ODNkcENNby9ZbDBta1RLU3RwUUdCcTFR
+eE52L0tISUg4SkpOU3hxMHVUWXdoMG94WXpiUjVHL3lFUmdRYm1BJiMxMzsKMDg2Ui9EOWlCbkdh
+U1ZSbytaNk9LRThldmtZRGU1YWZ0SjhzRWh0UjBJTjJDVk4wWWdNTnllUmJ1UDdBeDFmUGJnbGUv
+cWNobXVHWiYjMTM7ClNrdlFFVWVHZlB4c2crUFowMWNKbFoxUDhRQmhiOGtnQmNnQnVwSUliUUNG
+d1FnRzI5VmY1dUZPdktYZjN2ZlY5U2NPTEw2U2lFVzMmIzEzOwpnclA0Z2NzVVJ5U29jMXpTTjk4
+S043WUhuUUJGbTRpQjRXczk2NEgrK0JJWjJqM2pYZDU5YSt0c3RoQlo2cVRuazd1SFhTZk43Z2dy
+JiMxMzsKT1NqU3ZDUW1NcUVKSkpqaWdCWEF2OGFPUFFuc08yVVVFNVRUbnVHSEcxSDlnd2lnaURu
+NldWRmdIV1hpeTcrL2ZtZklVQ211U3RZYyYjMTM7ClpKbkNHRER4WDFscXl6NFBsZWxjekp6TjJz
+YkIxc3dRYVJJOEp4WDFReWxEZ0s4R3ZFSVRQS3VNRTFyMXc3R1pUQVhCWVFrbEpQMD08L2RzOlNp
+Z25hdHVyZVZhbHVlPjxkczpLZXlJbmZvIElkPSJfMDIxYjlhYjMtNmY1OC00ODQ4LWEzOTktNzM0
+N2YxMmM3OGEzIj48ZHM6WDUwOURhdGE+PGRzOlg1MDlDZXJ0aWZpY2F0ZT5NSUlIWHpDQ0JVZWdB
+d0lCQWdJVVhxSS92ZDE4Q2FnOThvTnBkelY3Qml5LzZFQXdEUVlKS29aSWh2Y05BUUVOQlFBd2ZE
+RUxNQWtHJiMxMzsKQTFVRUJoTUNWVk14UERBNkJnTlZCQW9NTTBsdWRHVnlibVYwSUVOdmNuQnZj
+bUYwYVc5dUlHWnZjaUJCYzNOcFoyNWxaQ0JPWVcxbCYjMTM7CmN5QmhibVFnVG5WdFltVnljekV2
+TUMwR0ExVUVBd3dtU1VOQlRrNGdWSEpoWkdWdFlYSnJJRU5zWldGeWFXNW5hRzkxYzJVZ1VHbHMm
+IzEzOwpiM1FnUTBFd0hoY05Nakl4TVRFMk1UTXlPRFU1V2hjTk1qY3hNVEUxTVRNeU9EVTVXakNC
+MERFTE1Ba0dBMVVFQmhNQ1FrVXhFVEFQJiMxMzsKQmdOVkJBZ1RDRUp5ZFhOelpXeHpNUkl3RUFZ
+RFZRUUhFd2xXYVd4MmIyOXlaR1V4TXpBeEJnTlZCQW9US2tSbGJHOXBkSFJsSUVOdiYjMTM7CmJu
+TjFiSFJwYm1jZ1lXNWtJRUZrZG1semIzSjVJRU5XUWtFdlUwTlNUREUrTUR3R0ExVUVBeE0xU1VO
+QlRrNGdWRTFEU0NCQmRYUm8mIzEzOwpiM0pwZW1Wa0lGUnlZV1JsYldGeWF5QlFhV3h2ZENCV1lX
+eHBaR0YwYjNJZ1ZtRnNhV1F4SlRBakJna3Foa2lHOXcwQkNRRVdGbUpsJiMxMzsKZEcxamFITnRa
+RUJrWld4dmFYUjBaUzVqYjIwd2dnSWlNQTBHQ1NxR1NJYjNEUUVCQVFVQUE0SUNEd0F3Z2dJS0Fv
+SUNBUUM2Rkp3eiYjMTM7CktxUVZYNmZHMy9FTFJTR1dWOUdyS2FGTUttaFdJeGVwd1JaTjZNeE1x
+a2Q1RG5ZZmlUK1dwOThqRWtxZ1R4MlVNYjlxdWdjR05WNmcmIzEzOwozNS9DclFiL0YvbXozQzRz
+ZkxOdURwU3FLOVFGOCtwYVRINmhRbXJPcHFWK1VUdmRqOVNNZ0tHeUZpelM4OENEV014NHczaTRG
+QUtlJiMxMzsKNk5Sc0pSR1RBdEtEdU1IY0E0c2owOEdqZTNsUFdjZ0Z2Y1FORFZlRUJUdU9IQkcr
+UmhqN1YxSmlOR1AvNGVwVFhURlhnUEZEZ2V6MyYjMTM7CllBZnhxcGJ1TzRUWDZiYllkazJudk1M
+RnZMRU5rQ0ZZdWxuWVB6Z25FQkdTTUtJYUFJbGIrc2NIQ3ZXZ1dqMlRMZ3doMkdKTmN6Vk0mIzEz
+OwoxTFBNcUdTK1VraTlNaDc5ODIyL3hvYXI0OTh4RHgyWXgvOHN3Z0VOTFNnQ3NRQVc4bk1nd1du
+NkFiWWwyUkFCWHVyYXlGc240UDFSJiMxMzsKdVFObVVwL3FyUktSdlNKcjFPTGtIWmZGVGNTWVFh
+Vml1TVlQWHpHejh0bU1MbG1JL0I2QUNINEF3Uk1kbll2Rk8zS0kxUkJuUEtJZCYjMTM7Cnd3ZlVw
+WjVJVElwYkE3Q0dnVHgxcXh0TTF3SVVyN3BIZUtQNmpWZTNrZERMZysvQloyeE1FdEJrNWE4WTdC
+NHYzeHdIWEdUdlY4bU4mIzEzOwowQWcvU3lUL1FVeUVSaFhVeUFOMitFd1orU1FDVXlOZnppb1dR
+ODc4ZUd5a1UrNDYrQmJnSTNJSXIzNlhLUHdtenQwU1orS0kzdG5GJiMxMzsKVGxuOW1YMEtDMGlk
+b2o1eWt6UG9DL01JZWQwc3A0VGlneEViV054N0VGODBQdlIvRERFd1ZQRUVra2p5NjNYRnVseGlD
+UUlEQVFBQiYjMTM7Cm80SUJnakNDQVg0d0RBWURWUjBUQVFIL0JBSXdBREFPQmdOVkhROEJBZjhF
+QkFNQ0I0QXdIUVlEVlIwT0JCWUVGSG45czBERWEya3YmIzEzOwpnRS9lSU9Uc3FvVzg1TVhGTUlH
+NkJnTlZIU01FZ2JJd2dhK0FGRWQ3VDY1NlVaRzEwYitkTnVtR2Z6WVdCS2xGb1lHQXBINHdmREVM
+JiMxMzsKTUFrR0ExVUVCaE1DVlZNeFBEQTZCZ05WQkFvTU0wbHVkR1Z5Ym1WMElFTnZjbkJ2Y21G
+MGFXOXVJR1p2Y2lCQmMzTnBaMjVsWkNCTyYjMTM7CllXMWxjeUJoYm1RZ1RuVnRZbVZ5Y3pFdk1D
+MEdBMVVFQXd3bVNVTkJUazRnVkhKaFpHVnRZWEpySUVOc1pXRnlhVzVuYUc5MWMyVWcmIzEzOwpV
+R2xzYjNRZ1EwR0NGSHBxYlRGZUpjUHRVQzlYdXVQS1BzTHdEUitNTURRR0ExVWRId1F0TUNzd0th
+QW5vQ1dHSTJoMGRIQTZMeTlqJiMxMzsKY213dWFXTmhibTR1YjNKbkwzUnRZMmhmY0dsc2IzUXVZ
+M0pzTUV3R0ExVWRJQVJGTUVNd0VBWU9Ld1lCQkFHQ3lSc0JCWU03REFvdyYjMTM7Ckx3WUlLd1lC
+QlFVSEFnRXdJekFoQmdnckJnRUZCUWNDQVJZVmFIUjBjSE02THk5amNITXVhV05oYm00dWIzSm5N
+QTBHQ1NxR1NJYjMmIzEzOwpEUUVCRFFVQUE0SUNBUUJkU2F0NTZ1ZWpMbkFqRklGOTVkallXSTZz
+Ly9ONllYeHNyck1rR0JQOEVlelB5aExoNmF3UDR6N1E5UUFJJiMxMzsKUVprWW94cmwvMXkwK2J5
+VjJxblRVVUNMUnBLL0JEcC9oY2Z3UGZLQ0EvMlJRQ0hKcmI2K3owZW5EUEZSSzBOS213T2NkbEd0
+VWswbSYjMTM7ClBnV0dTS3R1d1ZzUEFoVERKdWhvc1pPaGtOZituU09PSHJRT24xRTJyek9yZC9r
+UWxxaUN3Ukg5Nzk2TnBUQStIU01mT29iSkVFUHEmIzEzOwp0cEY3UDVxYnd0bDk1VWE1T3A0QWhh
+NzBISGZVRlM0Qk9RS0xCVmZNWmRPUitpUG9oNU93QUsraHRZa0ZDRzlQMldIdTd3ZjhFQytXJiMx
+MzsKN2s5Nmd2VGQ4eEU3b3VvYWJUMng2WWZZcUVsUEhpVS9JTTlnVnpXV0wvc3ZZRHlTVnVvRndC
+akROTjFjZHEwcU9ZUjF5dVMxYy85RCYjMTM7CkZSN2VvN0dGRUN5K1RCZDdJaUtSZkJWZVlHT09Q
+TW5vRmZ4UkxXcnBzV05ud0Q3bGtQa0xDZ0ZDays4eUVjT1JnNjI1bW82NXo0eTYmIzEzOwpKNEs4
+Zm9kYTdxd21YTlAzUlMxOG9uNkJIdDhsUStiWGdPSG14SUhrMGFPMHFORHFndkxyMkZseUxHSkdp
+RU1ScURNTVI2L2EwNmJ0JiMxMzsKa25VTUhsN0NxTWZqSWtqUDRWTk55R1BkSmd3Vmsya2ViOXVO
+RnZKQ3hUK00yZkdYUTFOYkpOZnR2NU1nU3NwOU4xeSt4NmdBM0VodyYjMTM7CnlIbG1KQjRZTXRv
+OHRUVjFpODR4UFh4aTJDQWVEYUdEdXdvc3Q4WVVDU2pxN1JDSzh0R2NhQVlya1hRWTJ5UWZYM2N3
+RHNFeFJxVlcmIzEzOwp5cmp5UnQrTjZtSzk5UT09PC9kczpYNTA5Q2VydGlmaWNhdGU+PC9kczpY
+NTA5RGF0YT48L2RzOktleUluZm8+PC9kczpTaWduYXR1cmU+PC9zbWQ6c2lnbmVkTWFyaz4K
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Holder-Russian/Court-Holder-Russian-Revoked.smd b/core/src/test/resources/google/registry/tmch/idn/Holder-Russian/Court-Holder-Russian-Revoked.smd
new file mode 100644
index 000000000..5fd614f28
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Holder-Russian/Court-Holder-Russian-Revoked.smd
@@ -0,0 +1,121 @@
+Marks: Сертификация & логотип
+smdID: 000000671669082937593-65535
+U-labels: xn------5cdshvabepr3bbqcpum2a9b4n, xn-----6kcogsabdop0bbpcotl1a7b8m, xn---and--3ve0aj1aabgrv9bbscrwo4a3c9n, xn---and-43dwiyabfqt6bbrcqvn3a1c0o, xn----7sbkfpabcnn7abocnsk0a5bzn, xn--and--43dwiyabfqt6bbrcqvn3a1c0o, xn--and-5cdshvabepr3bbqcpum2a9b4n, xn--80agemabbml4abncmrjz3b2m
+notBefore: 2022-11-22T02:08:57.593Z
+notAfter: 2027-10-21T08:12:08.921Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il82YzQw
+MGUxMS1mYTBlLTQ2ZjctODg2Yy1hOWM4OTA3NjVlNWIiPjxzbWQ6aWQ+MDAwMDAwNjcxNjY5MDgy
+OTM3NTkzLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMjowODo1Ny41OTNaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0yMVQwODoxMjowOC45MjFaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazpj
+b3VydD48bWFyazppZD4wMDAxNDAxNTAzMDYzMjQ3MTUwMzA2MzI0Ny0xPC9tYXJrOmlkPjxtYXJr
+Om1hcmtOYW1lPtCh0LXRgNGC0LjRhNC40LrQsNGG0LjRjyAmYW1wOyDQu9C+0LPQvtGC0LjQvzwv
+bWFyazptYXJrTmFtZT48bWFyazpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpuYW1l
+PtCd0LDRgtCw0LvRjNGPINCQ0L3RgtC+0L3QvtCy0LA8L21hcms6bmFtZT48bWFyazpvcmc+0JDQ
+vdGC0L7QvdC+0LLQsDwvbWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpzdHJlZXQ+0J/RgNC+0YHQ
+v9C10LrRgiDQktC10YDQvdCw0LTRgdC60L7Qs9C+IDE1PC9tYXJrOnN0cmVldD48bWFyazpjaXR5
+PtCc0L7RgdC60LLQsDwvbWFyazpjaXR5PjxtYXJrOnBjPjExNzQ4NTwvbWFyazpwYz48bWFyazpj
+Yz5SVTwvbWFyazpjYz48L21hcms6YWRkcj48bWFyazp2b2ljZT4rNy45MTg4MjIxNjc0PC9tYXJr
+OnZvaWNlPjxtYXJrOmVtYWlsPmluZm9AZXhhbXBsZS5leGFtcGxlPC9tYXJrOmVtYWlsPjwvbWFy
+azpob2xkZXI+PG1hcms6bGFiZWw+eG4tLS0tLS01Y2RzaHZhYmVwcjNiYnFjcHVtMmE5YjRuPC9t
+YXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS0tLS02a2NvZ3NhYmRvcDBiYnBjb3RsMWE3YjhtPC9t
+YXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS0tYW5kLS0zdmUwYWoxYWFiZ3J2OWJic2Nyd280YTNj
+OW48L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLS1hbmQtNDNkd2l5YWJmcXQ2YmJyY3F2bjNh
+MWMwbzwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tLS03c2JrZnBhYmNubjdhYm9jbnNrMGE1
+YnpuPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1hbmQtLTQzZHdpeWFiZnF0NmJicmNxdm4z
+YTFjMG88L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLWFuZC01Y2RzaHZhYmVwcjNiYnFjcHVt
+MmE5YjRuPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS04MGFnZW1hYmJtbDRhYm5jbXJqejNi
+Mm08L21hcms6bGFiZWw+PG1hcms6Z29vZHNBbmRTZXJ2aWNlcz5ndWl0YXI8L21hcms6Z29vZHNB
+bmRTZXJ2aWNlcz48bWFyazpyZWZOdW0+MTIzNDwvbWFyazpyZWZOdW0+PG1hcms6cHJvRGF0ZT4y
+MDEzLTAxLTAxVDAwOjAwOjAwLjAwMFo8L21hcms6cHJvRGF0ZT48bWFyazpjYz5VUzwvbWFyazpj
+Yz48bWFyazpjb3VydE5hbWU+SG92ZTwvbWFyazpjb3VydE5hbWU+PC9tYXJrOmNvdXJ0PjwvbWFy
+azptYXJrPjxkczpTaWduYXR1cmUgeG1sbnM6ZHM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkv
+eG1sZHNpZyMiIElkPSJfNTI4MjJkZjQtYmY5Ny00MzdiLWE4ZTctYWM5M2I4OWRmNmNmIj48ZHM6
+U2lnbmVkSW5mbz48ZHM6Q2Fub25pY2FsaXphdGlvbk1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93
+d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjxkczpTaWduYXR1cmVNZXRob2QgQWxn
+b3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGRzaWctbW9yZSNyc2Etc2hhMjU2
+Ii8+PGRzOlJlZmVyZW5jZSBVUkk9IiNfNmM0MDBlMTEtZmEwZS00NmY3LTg4NmMtYTljODkwNzY1
+ZTViIj48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53
+My5vcmcvMjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48ZHM6VHJhbnNmb3Jt
+IEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9k
+czpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9y
+Zy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+WS81aUF3ak81b1ZrRStw
+bmc4ajBvWUhUK0szTkQ3UXIyOGU3TWE0Ylkvdz08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJl
+bmNlPjxkczpSZWZlcmVuY2UgVVJJPSIjXzAwMGU1MTVhLWI5YmItNDQ5OC1hMThlLWFlNzJlN2Ji
+MTgwNyI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cu
+dzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6RGlnZXN0
+TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxlbmMjc2hhMjU2
+Ii8+PGRzOkRpZ2VzdFZhbHVlPlpmRzdjQVZPU1REc2V2Z3czZ28vQnR3cEtyckJSMWlQMytIVU1R
+eWd6cTA9PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48L2RzOlNpZ25lZEluZm8+PGRz
+OlNpZ25hdHVyZVZhbHVlIElkPSJfN2U5OTIyNGYtMjNmMy00ODViLWFlZDktYTk5ZTk1NzMwMGRm
+Ij5WK2l0TjNiam1oSk02aFBsQ1FMZm9pcUFFVEVWdVhYTm91UDhSeG9ORlMvbnExNTRYS0tLa1Vi
+dFBXY1ozaUxRUEQ0emtIYkJEWDN5JiMxMzsKSHdvd1FuTDhVcTYrOERvS2ZjQnhxSjMwTDNEQ3p2
+YTJ0d0pwNkVzRk5TcHdHQnZWaFpSTzhjS2hpeDNOZ1JnQjVVTERRTXhNcE5oUyYjMTM7CmZjYkV1
+Ym1lQThzY2RWNmJvUUQzZngvU3lIZW1zVmM4YnRTektwUklocTVnMmRSZkhFcHRaQng2UGYxakdO
+Nmt0aDF2UWNteHY1WjQmIzEzOwp6emNMQ0NhUmxJdk1xRUhGVzV0empucE1INVhRKzk3eFIrNCtt
+QWYzUkFrd1JyZGQ3eWxpYXZUZDNOQVhZVWhOQlZTWFUvSmFJZHkvJiMxMzsKSlBCdXRlUVZxRktV
+NXFKRG16dmFNVENTVHQ2ZDR4d2dBSUdmKzdtS3JMRFl4NnJmeXVGcUphUHB1a2xFcjdDalEwbnNT
+WHViNmJuTCYjMTM7CkVQZDA4NHFmSlZ2Mk9ycC8vZlZUUUU1b0w4bU5EQmsyd2xPeThXbnVoNVpi
+V01GQkNJc0dlTG14OC9Wa0RtbFdPRXhNRTRHQ04wVVcmIzEzOwozSVhqZnA4RmVlb241VnJTTzNa
+OFBKT2hld1pOR2JyQjZjei9lb2NEL2ppZWQrRTB4dFpTNFlIV0dLTjA3aE1xZFVRVG5SOFJObmdQ
+JiMxMzsKT1lJMld0VFhwVHBkMEVrOXFaSm1KUWplbDRUQzQ1VW4rbVB3RTk0WXMzNFdjNmdTdWN6
+TXY4aXRzZWFkaFhHQmJ6dlVOQ2tsdytPVCYjMTM7ClUvY0tLazlZa09mZzdPcS9TMVZRMjQxSU02
+OER5Y3VGbWxQWkhpdHkxeklKSnEvOHlHTTNiNzdVV2I2UXZRQlpTeWNGWDVSSUZLOD08L2RzOlNp
+Z25hdHVyZVZhbHVlPjxkczpLZXlJbmZvIElkPSJfMDAwZTUxNWEtYjliYi00NDk4LWExOGUtYWU3
+MmU3YmIxODA3Ij48ZHM6WDUwOURhdGE+PGRzOlg1MDlDZXJ0aWZpY2F0ZT5NSUlIWHpDQ0JVZWdB
+d0lCQWdJVVhxSS92ZDE4Q2FnOThvTnBkelY3Qml5LzZFQXdEUVlKS29aSWh2Y05BUUVOQlFBd2ZE
+RUxNQWtHJiMxMzsKQTFVRUJoTUNWVk14UERBNkJnTlZCQW9NTTBsdWRHVnlibVYwSUVOdmNuQnZj
+bUYwYVc5dUlHWnZjaUJCYzNOcFoyNWxaQ0JPWVcxbCYjMTM7CmN5QmhibVFnVG5WdFltVnljekV2
+TUMwR0ExVUVBd3dtU1VOQlRrNGdWSEpoWkdWdFlYSnJJRU5zWldGeWFXNW5hRzkxYzJVZ1VHbHMm
+IzEzOwpiM1FnUTBFd0hoY05Nakl4TVRFMk1UTXlPRFU1V2hjTk1qY3hNVEUxTVRNeU9EVTVXakNC
+MERFTE1Ba0dBMVVFQmhNQ1FrVXhFVEFQJiMxMzsKQmdOVkJBZ1RDRUp5ZFhOelpXeHpNUkl3RUFZ
+RFZRUUhFd2xXYVd4MmIyOXlaR1V4TXpBeEJnTlZCQW9US2tSbGJHOXBkSFJsSUVOdiYjMTM7CmJu
+TjFiSFJwYm1jZ1lXNWtJRUZrZG1semIzSjVJRU5XUWtFdlUwTlNUREUrTUR3R0ExVUVBeE0xU1VO
+QlRrNGdWRTFEU0NCQmRYUm8mIzEzOwpiM0pwZW1Wa0lGUnlZV1JsYldGeWF5QlFhV3h2ZENCV1lX
+eHBaR0YwYjNJZ1ZtRnNhV1F4SlRBakJna3Foa2lHOXcwQkNRRVdGbUpsJiMxMzsKZEcxamFITnRa
+RUJrWld4dmFYUjBaUzVqYjIwd2dnSWlNQTBHQ1NxR1NJYjNEUUVCQVFVQUE0SUNEd0F3Z2dJS0Fv
+SUNBUUM2Rkp3eiYjMTM7CktxUVZYNmZHMy9FTFJTR1dWOUdyS2FGTUttaFdJeGVwd1JaTjZNeE1x
+a2Q1RG5ZZmlUK1dwOThqRWtxZ1R4MlVNYjlxdWdjR05WNmcmIzEzOwozNS9DclFiL0YvbXozQzRz
+ZkxOdURwU3FLOVFGOCtwYVRINmhRbXJPcHFWK1VUdmRqOVNNZ0tHeUZpelM4OENEV014NHczaTRG
+QUtlJiMxMzsKNk5Sc0pSR1RBdEtEdU1IY0E0c2owOEdqZTNsUFdjZ0Z2Y1FORFZlRUJUdU9IQkcr
+UmhqN1YxSmlOR1AvNGVwVFhURlhnUEZEZ2V6MyYjMTM7CllBZnhxcGJ1TzRUWDZiYllkazJudk1M
+RnZMRU5rQ0ZZdWxuWVB6Z25FQkdTTUtJYUFJbGIrc2NIQ3ZXZ1dqMlRMZ3doMkdKTmN6Vk0mIzEz
+OwoxTFBNcUdTK1VraTlNaDc5ODIyL3hvYXI0OTh4RHgyWXgvOHN3Z0VOTFNnQ3NRQVc4bk1nd1du
+NkFiWWwyUkFCWHVyYXlGc240UDFSJiMxMzsKdVFObVVwL3FyUktSdlNKcjFPTGtIWmZGVGNTWVFh
+Vml1TVlQWHpHejh0bU1MbG1JL0I2QUNINEF3Uk1kbll2Rk8zS0kxUkJuUEtJZCYjMTM7Cnd3ZlVw
+WjVJVElwYkE3Q0dnVHgxcXh0TTF3SVVyN3BIZUtQNmpWZTNrZERMZysvQloyeE1FdEJrNWE4WTdC
+NHYzeHdIWEdUdlY4bU4mIzEzOwowQWcvU3lUL1FVeUVSaFhVeUFOMitFd1orU1FDVXlOZnppb1dR
+ODc4ZUd5a1UrNDYrQmJnSTNJSXIzNlhLUHdtenQwU1orS0kzdG5GJiMxMzsKVGxuOW1YMEtDMGlk
+b2o1eWt6UG9DL01JZWQwc3A0VGlneEViV054N0VGODBQdlIvRERFd1ZQRUVra2p5NjNYRnVseGlD
+UUlEQVFBQiYjMTM7Cm80SUJnakNDQVg0d0RBWURWUjBUQVFIL0JBSXdBREFPQmdOVkhROEJBZjhF
+QkFNQ0I0QXdIUVlEVlIwT0JCWUVGSG45czBERWEya3YmIzEzOwpnRS9lSU9Uc3FvVzg1TVhGTUlH
+NkJnTlZIU01FZ2JJd2dhK0FGRWQ3VDY1NlVaRzEwYitkTnVtR2Z6WVdCS2xGb1lHQXBINHdmREVM
+JiMxMzsKTUFrR0ExVUVCaE1DVlZNeFBEQTZCZ05WQkFvTU0wbHVkR1Z5Ym1WMElFTnZjbkJ2Y21G
+MGFXOXVJR1p2Y2lCQmMzTnBaMjVsWkNCTyYjMTM7CllXMWxjeUJoYm1RZ1RuVnRZbVZ5Y3pFdk1D
+MEdBMVVFQXd3bVNVTkJUazRnVkhKaFpHVnRZWEpySUVOc1pXRnlhVzVuYUc5MWMyVWcmIzEzOwpV
+R2xzYjNRZ1EwR0NGSHBxYlRGZUpjUHRVQzlYdXVQS1BzTHdEUitNTURRR0ExVWRId1F0TUNzd0th
+QW5vQ1dHSTJoMGRIQTZMeTlqJiMxMzsKY213dWFXTmhibTR1YjNKbkwzUnRZMmhmY0dsc2IzUXVZ
+M0pzTUV3R0ExVWRJQVJGTUVNd0VBWU9Ld1lCQkFHQ3lSc0JCWU03REFvdyYjMTM7Ckx3WUlLd1lC
+QlFVSEFnRXdJekFoQmdnckJnRUZCUWNDQVJZVmFIUjBjSE02THk5amNITXVhV05oYm00dWIzSm5N
+QTBHQ1NxR1NJYjMmIzEzOwpEUUVCRFFVQUE0SUNBUUJkU2F0NTZ1ZWpMbkFqRklGOTVkallXSTZz
+Ly9ONllYeHNyck1rR0JQOEVlelB5aExoNmF3UDR6N1E5UUFJJiMxMzsKUVprWW94cmwvMXkwK2J5
+VjJxblRVVUNMUnBLL0JEcC9oY2Z3UGZLQ0EvMlJRQ0hKcmI2K3owZW5EUEZSSzBOS213T2NkbEd0
+VWswbSYjMTM7ClBnV0dTS3R1d1ZzUEFoVERKdWhvc1pPaGtOZituU09PSHJRT24xRTJyek9yZC9r
+UWxxaUN3Ukg5Nzk2TnBUQStIU01mT29iSkVFUHEmIzEzOwp0cEY3UDVxYnd0bDk1VWE1T3A0QWhh
+NzBISGZVRlM0Qk9RS0xCVmZNWmRPUitpUG9oNU93QUsraHRZa0ZDRzlQMldIdTd3ZjhFQytXJiMx
+MzsKN2s5Nmd2VGQ4eEU3b3VvYWJUMng2WWZZcUVsUEhpVS9JTTlnVnpXV0wvc3ZZRHlTVnVvRndC
+akROTjFjZHEwcU9ZUjF5dVMxYy85RCYjMTM7CkZSN2VvN0dGRUN5K1RCZDdJaUtSZkJWZVlHT09Q
+TW5vRmZ4UkxXcnBzV05ud0Q3bGtQa0xDZ0ZDays4eUVjT1JnNjI1bW82NXo0eTYmIzEzOwpKNEs4
+Zm9kYTdxd21YTlAzUlMxOG9uNkJIdDhsUStiWGdPSG14SUhrMGFPMHFORHFndkxyMkZseUxHSkdp
+RU1ScURNTVI2L2EwNmJ0JiMxMzsKa25VTUhsN0NxTWZqSWtqUDRWTk55R1BkSmd3Vmsya2ViOXVO
+RnZKQ3hUK00yZkdYUTFOYkpOZnR2NU1nU3NwOU4xeSt4NmdBM0VodyYjMTM7CnlIbG1KQjRZTXRv
+OHRUVjFpODR4UFh4aTJDQWVEYUdEdXdvc3Q4WVVDU2pxN1JDSzh0R2NhQVlya1hRWTJ5UWZYM2N3
+RHNFeFJxVlcmIzEzOwp5cmp5UnQrTjZtSzk5UT09PC9kczpYNTA5Q2VydGlmaWNhdGU+PC9kczpY
+NTA5RGF0YT48L2RzOktleUluZm8+PC9kczpTaWduYXR1cmU+PC9zbWQ6c2lnbmVkTWFyaz4K
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Holder-Russian/Trademark-Holder-Russian-Active.smd b/core/src/test/resources/google/registry/tmch/idn/Holder-Russian/Trademark-Holder-Russian-Active.smd
new file mode 100644
index 000000000..1982ccf42
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Holder-Russian/Trademark-Holder-Russian-Active.smd
@@ -0,0 +1,117 @@
+Marks: Тест&случай
+smdID: 000000681669082999834-65535
+U-labels: xn----8sbnsi8abecn8b, xn--and-8cdv2am8bdecr6c, xn--et-8kcrxk3bcecp2c, xn--80ajng3aaecl4b
+notBefore: 2022-11-22T02:09:59.834Z
+notAfter: 2027-10-21T08:12:08.921Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il81MDhl
+ZDQ0NS01OTAyLTQzMjUtYWFmZi1hNzUyY2UyNjFjZjAiPjxzbWQ6aWQ+MDAwMDAwNjgxNjY5MDgy
+OTk5ODM0LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMjowOTo1OS44MzRaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0yMVQwODoxMjowOC45MjFaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
+cmFkZW1hcms+PG1hcms6aWQ+MDAwMTQwMTUwMzA2MzYxMzE1MDMwNjM2MTMtMTwvbWFyazppZD48
+bWFyazptYXJrTmFtZT7QotC10YHRgiZhbXA70YHQu9GD0YfQsNC5PC9tYXJrOm1hcmtOYW1lPjxt
+YXJrOmhvbGRlciBlbnRpdGxlbWVudD0ib3duZXIiPjxtYXJrOm5hbWU+0J3QsNGC0LDQu9GM0Y8g
+0JDQvdGC0L7QvdC+0LLQsDwvbWFyazpuYW1lPjxtYXJrOm9yZz7QkNC90YLQvtC90L7QstCwPC9t
+YXJrOm9yZz48bWFyazphZGRyPjxtYXJrOnN0cmVldD7Qn9GA0L7RgdC/0LXQutGCINCS0LXRgNC9
+0LDQtNGB0LrQvtCz0L4gMTU8L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+0JzQvtGB0LrQstCwPC9t
+YXJrOmNpdHk+PG1hcms6cGM+MTE3NDg1PC9tYXJrOnBjPjxtYXJrOmNjPlJVPC9tYXJrOmNjPjwv
+bWFyazphZGRyPjxtYXJrOnZvaWNlPis3LjkxODgyMjE2NzQ8L21hcms6dm9pY2U+PG1hcms6ZW1h
+aWw+aW5mb0BleGFtcGxlLmV4YW1wbGU8L21hcms6ZW1haWw+PC9tYXJrOmhvbGRlcj48bWFyazpq
+dXJpc2RpY3Rpb24+VVM8L21hcms6anVyaXNkaWN0aW9uPjxtYXJrOmNsYXNzPjE1PC9tYXJrOmNs
+YXNzPjxtYXJrOmxhYmVsPnhuLS0tLThzYm5zaThhYmVjbjhiPC9tYXJrOmxhYmVsPjxtYXJrOmxh
+YmVsPnhuLS1hbmQtOGNkdjJhbThiZGVjcjZjPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1l
+dC04a2NyeGszYmNlY3AyYzwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tODBham5nM2FhZWNs
+NGI8L21hcms6bGFiZWw+PG1hcms6Z29vZHNBbmRTZXJ2aWNlcz7Qs9C40YLQsNGA0LA8L21hcms6
+Z29vZHNBbmRTZXJ2aWNlcz48bWFyazpyZWdOdW0+MTIzNDwvbWFyazpyZWdOdW0+PG1hcms6cmVn
+RGF0ZT4yMDEzLTAxLTAxVDAwOjAwOjAwLjAwMFo8L21hcms6cmVnRGF0ZT48L21hcms6dHJhZGVt
+YXJrPjwvbWFyazptYXJrPjxkczpTaWduYXR1cmUgeG1sbnM6ZHM9Imh0dHA6Ly93d3cudzMub3Jn
+LzIwMDAvMDkveG1sZHNpZyMiIElkPSJfMWYyYTAxNDAtMzI4MC00ODc0LWJmZjktOGIxYTRhNWEw
+ZTAwIj48ZHM6U2lnbmVkSW5mbz48ZHM6Q2Fub25pY2FsaXphdGlvbk1ldGhvZCBBbGdvcml0aG09
+Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjxkczpTaWduYXR1cmVN
+ZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGRzaWctbW9yZSNy
+c2Etc2hhMjU2Ii8+PGRzOlJlZmVyZW5jZSBVUkk9IiNfNTA4ZWQ0NDUtNTkwMi00MzI1LWFhZmYt
+YTc1MmNlMjYxY2YwIj48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0
+cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48ZHM6
+VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMx
+NG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8v
+d3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+MnBzNXpH
+a0lFRHNBbDdSbmJYbUs1V3JDV2FEVEp4eDEyMDhGSXdIVVd6ST08L2RzOkRpZ2VzdFZhbHVlPjwv
+ZHM6UmVmZXJlbmNlPjxkczpSZWZlcmVuY2UgVVJJPSIjX2Y2MzM1YjkwLTQ0NWMtNGMzYi1iZTk3
+LTU5YjdjNGYyYmI0YiI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0
+dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48
+ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxl
+bmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPkxlcHB1anA1YkxDMWd0R0Z3ek1URlB2aWI0MnlV
+bW9idXFZdHh0eCtEZUU9PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48L2RzOlNpZ25l
+ZEluZm8+PGRzOlNpZ25hdHVyZVZhbHVlIElkPSJfNDMzZDE4NTUtZTdiOS00MGU5LTk4YTYtZTQ5
+NmM0M2Y3MDNlIj5NSU5RejlhLzBpenhYRU8yb0kvWittR00zb21mMFh0aFl3aThEWG5qWjBvLzcw
+dWNwU3Q5dVZPck5Bd2dlT3NJU0V4L2hLYTdkSkZUJiMxMzsKanlqMUtlL1JQWmxQcm5DZm54SVVF
+c1lYcU1yUjlkZWF4NlpCanJkbVNjV0s4cU5kUW0rOGx5dk02c3p3NG4vczVvSjNwSWpXM3NCeCYj
+MTM7CjdxR2lxY1hTb3o0ZFhZWDhpNVhWTWpncUw3RFpxdEdJWDZTWnY5SEdCcEZUc001Y2EwZHpv
+NHBEaTNRZ0l6TjlON2UxWWFtcE42bnEmIzEzOwpMWEYzR002Qk5tZHlzOEkrOTFyL2E1Q3NsNW5I
+YmhKYnd1a3NHcUY2WUpJWmx1bzM3STNEQ2FKZTU3MGdkbXJZVy8rQ1IyU0lNQXBKJiMxMzsKUE5C
+a1BJTzgycXpQOHpqc0Fha3lsKzcwWk5MY2hvM0RrTmtUdUNkMU5Jb3RnSC9jZVZxL2JGRy9CWTI5
+Ynk2RnBNY0xGeTFDQldOLyYjMTM7Ck41Q1o5V21TTnNScG1jN3RsTUlWOUZ0UHhENThaaTE5SWJO
+enA0ZXc4YS9CNVVpQ29PZnUvTnpLMXlkY3FXL2ZWbms5Q2ozdS9saU0mIzEzOwo0bStjVjdlR3RD
+Z1g4MVdIZ0o4aXJZWTBFS3E4SHlIWGJscjdlcGRDaDhTWXY2QUxPYlRTTTRDYng3U1ZOV091NnRm
+bi9WSjlsUDVPJiMxMzsKMTQyYkN3NlNTS29yL2xMeDR3NzB4anFTUC9wd0hvVlRQUStiejhsem1W
+QVBlRW5JckRieEhoSXcyTmd2NnJ3TEJqZjRjdENKNXlIZiYjMTM7CmdtbEVqT1JVaFhXZWJNR0RC
+d09vNjd3L3B4UkxxVTkxSnBvY3N1THF6ZHhzTWloYi9QL0xJNVRQV2xFc0p2T2wvc0NZSk5LWnVD
+VT08L2RzOlNpZ25hdHVyZVZhbHVlPjxkczpLZXlJbmZvIElkPSJfZjYzMzViOTAtNDQ1Yy00YzNi
+LWJlOTctNTliN2M0ZjJiYjRiIj48ZHM6WDUwOURhdGE+PGRzOlg1MDlDZXJ0aWZpY2F0ZT5NSUlI
+WHpDQ0JVZWdBd0lCQWdJVVhxSS92ZDE4Q2FnOThvTnBkelY3Qml5LzZFQXdEUVlKS29aSWh2Y05B
+UUVOQlFBd2ZERUxNQWtHJiMxMzsKQTFVRUJoTUNWVk14UERBNkJnTlZCQW9NTTBsdWRHVnlibVYw
+SUVOdmNuQnZjbUYwYVc5dUlHWnZjaUJCYzNOcFoyNWxaQ0JPWVcxbCYjMTM7CmN5QmhibVFnVG5W
+dFltVnljekV2TUMwR0ExVUVBd3dtU1VOQlRrNGdWSEpoWkdWdFlYSnJJRU5zWldGeWFXNW5hRzkx
+YzJVZ1VHbHMmIzEzOwpiM1FnUTBFd0hoY05Nakl4TVRFMk1UTXlPRFU1V2hjTk1qY3hNVEUxTVRN
+eU9EVTVXakNCMERFTE1Ba0dBMVVFQmhNQ1FrVXhFVEFQJiMxMzsKQmdOVkJBZ1RDRUp5ZFhOelpX
+eHpNUkl3RUFZRFZRUUhFd2xXYVd4MmIyOXlaR1V4TXpBeEJnTlZCQW9US2tSbGJHOXBkSFJsSUVO
+diYjMTM7CmJuTjFiSFJwYm1jZ1lXNWtJRUZrZG1semIzSjVJRU5XUWtFdlUwTlNUREUrTUR3R0Ex
+VUVBeE0xU1VOQlRrNGdWRTFEU0NCQmRYUm8mIzEzOwpiM0pwZW1Wa0lGUnlZV1JsYldGeWF5QlFh
+V3h2ZENCV1lXeHBaR0YwYjNJZ1ZtRnNhV1F4SlRBakJna3Foa2lHOXcwQkNRRVdGbUpsJiMxMzsK
+ZEcxamFITnRaRUJrWld4dmFYUjBaUzVqYjIwd2dnSWlNQTBHQ1NxR1NJYjNEUUVCQVFVQUE0SUNE
+d0F3Z2dJS0FvSUNBUUM2Rkp3eiYjMTM7CktxUVZYNmZHMy9FTFJTR1dWOUdyS2FGTUttaFdJeGVw
+d1JaTjZNeE1xa2Q1RG5ZZmlUK1dwOThqRWtxZ1R4MlVNYjlxdWdjR05WNmcmIzEzOwozNS9DclFi
+L0YvbXozQzRzZkxOdURwU3FLOVFGOCtwYVRINmhRbXJPcHFWK1VUdmRqOVNNZ0tHeUZpelM4OENE
+V014NHczaTRGQUtlJiMxMzsKNk5Sc0pSR1RBdEtEdU1IY0E0c2owOEdqZTNsUFdjZ0Z2Y1FORFZl
+RUJUdU9IQkcrUmhqN1YxSmlOR1AvNGVwVFhURlhnUEZEZ2V6MyYjMTM7CllBZnhxcGJ1TzRUWDZi
+YllkazJudk1MRnZMRU5rQ0ZZdWxuWVB6Z25FQkdTTUtJYUFJbGIrc2NIQ3ZXZ1dqMlRMZ3doMkdK
+TmN6Vk0mIzEzOwoxTFBNcUdTK1VraTlNaDc5ODIyL3hvYXI0OTh4RHgyWXgvOHN3Z0VOTFNnQ3NR
+QVc4bk1nd1duNkFiWWwyUkFCWHVyYXlGc240UDFSJiMxMzsKdVFObVVwL3FyUktSdlNKcjFPTGtI
+WmZGVGNTWVFhVml1TVlQWHpHejh0bU1MbG1JL0I2QUNINEF3Uk1kbll2Rk8zS0kxUkJuUEtJZCYj
+MTM7Cnd3ZlVwWjVJVElwYkE3Q0dnVHgxcXh0TTF3SVVyN3BIZUtQNmpWZTNrZERMZysvQloyeE1F
+dEJrNWE4WTdCNHYzeHdIWEdUdlY4bU4mIzEzOwowQWcvU3lUL1FVeUVSaFhVeUFOMitFd1orU1FD
+VXlOZnppb1dRODc4ZUd5a1UrNDYrQmJnSTNJSXIzNlhLUHdtenQwU1orS0kzdG5GJiMxMzsKVGxu
+OW1YMEtDMGlkb2o1eWt6UG9DL01JZWQwc3A0VGlneEViV054N0VGODBQdlIvRERFd1ZQRUVra2p5
+NjNYRnVseGlDUUlEQVFBQiYjMTM7Cm80SUJnakNDQVg0d0RBWURWUjBUQVFIL0JBSXdBREFPQmdO
+VkhROEJBZjhFQkFNQ0I0QXdIUVlEVlIwT0JCWUVGSG45czBERWEya3YmIzEzOwpnRS9lSU9Uc3Fv
+Vzg1TVhGTUlHNkJnTlZIU01FZ2JJd2dhK0FGRWQ3VDY1NlVaRzEwYitkTnVtR2Z6WVdCS2xGb1lH
+QXBINHdmREVMJiMxMzsKTUFrR0ExVUVCaE1DVlZNeFBEQTZCZ05WQkFvTU0wbHVkR1Z5Ym1WMElF
+TnZjbkJ2Y21GMGFXOXVJR1p2Y2lCQmMzTnBaMjVsWkNCTyYjMTM7CllXMWxjeUJoYm1RZ1RuVnRZ
+bVZ5Y3pFdk1DMEdBMVVFQXd3bVNVTkJUazRnVkhKaFpHVnRZWEpySUVOc1pXRnlhVzVuYUc5MWMy
+VWcmIzEzOwpVR2xzYjNRZ1EwR0NGSHBxYlRGZUpjUHRVQzlYdXVQS1BzTHdEUitNTURRR0ExVWRI
+d1F0TUNzd0thQW5vQ1dHSTJoMGRIQTZMeTlqJiMxMzsKY213dWFXTmhibTR1YjNKbkwzUnRZMmhm
+Y0dsc2IzUXVZM0pzTUV3R0ExVWRJQVJGTUVNd0VBWU9Ld1lCQkFHQ3lSc0JCWU03REFvdyYjMTM7
+Ckx3WUlLd1lCQlFVSEFnRXdJekFoQmdnckJnRUZCUWNDQVJZVmFIUjBjSE02THk5amNITXVhV05o
+Ym00dWIzSm5NQTBHQ1NxR1NJYjMmIzEzOwpEUUVCRFFVQUE0SUNBUUJkU2F0NTZ1ZWpMbkFqRklG
+OTVkallXSTZzLy9ONllYeHNyck1rR0JQOEVlelB5aExoNmF3UDR6N1E5UUFJJiMxMzsKUVprWW94
+cmwvMXkwK2J5VjJxblRVVUNMUnBLL0JEcC9oY2Z3UGZLQ0EvMlJRQ0hKcmI2K3owZW5EUEZSSzBO
+S213T2NkbEd0VWswbSYjMTM7ClBnV0dTS3R1d1ZzUEFoVERKdWhvc1pPaGtOZituU09PSHJRT24x
+RTJyek9yZC9rUWxxaUN3Ukg5Nzk2TnBUQStIU01mT29iSkVFUHEmIzEzOwp0cEY3UDVxYnd0bDk1
+VWE1T3A0QWhhNzBISGZVRlM0Qk9RS0xCVmZNWmRPUitpUG9oNU93QUsraHRZa0ZDRzlQMldIdTd3
+ZjhFQytXJiMxMzsKN2s5Nmd2VGQ4eEU3b3VvYWJUMng2WWZZcUVsUEhpVS9JTTlnVnpXV0wvc3ZZ
+RHlTVnVvRndCakROTjFjZHEwcU9ZUjF5dVMxYy85RCYjMTM7CkZSN2VvN0dGRUN5K1RCZDdJaUtS
+ZkJWZVlHT09QTW5vRmZ4UkxXcnBzV05ud0Q3bGtQa0xDZ0ZDays4eUVjT1JnNjI1bW82NXo0eTYm
+IzEzOwpKNEs4Zm9kYTdxd21YTlAzUlMxOG9uNkJIdDhsUStiWGdPSG14SUhrMGFPMHFORHFndkxy
+MkZseUxHSkdpRU1ScURNTVI2L2EwNmJ0JiMxMzsKa25VTUhsN0NxTWZqSWtqUDRWTk55R1BkSmd3
+Vmsya2ViOXVORnZKQ3hUK00yZkdYUTFOYkpOZnR2NU1nU3NwOU4xeSt4NmdBM0VodyYjMTM7CnlI
+bG1KQjRZTXRvOHRUVjFpODR4UFh4aTJDQWVEYUdEdXdvc3Q4WVVDU2pxN1JDSzh0R2NhQVlya1hR
+WTJ5UWZYM2N3RHNFeFJxVlcmIzEzOwp5cmp5UnQrTjZtSzk5UT09PC9kczpYNTA5Q2VydGlmaWNh
+dGU+PC9kczpYNTA5RGF0YT48L2RzOktleUluZm8+PC9kczpTaWduYXR1cmU+PC9zbWQ6c2lnbmVk
+TWFyaz4K
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Holder-Russian/Trademark-Holder-Russian-Revoked.smd b/core/src/test/resources/google/registry/tmch/idn/Holder-Russian/Trademark-Holder-Russian-Revoked.smd
new file mode 100644
index 000000000..5ec08ecf8
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Holder-Russian/Trademark-Holder-Russian-Revoked.smd
@@ -0,0 +1,117 @@
+Marks: Тест&случай
+smdID: 000000681669082941285-65535
+U-labels: xn----8sbnsi8abecn8b, xn--and-8cdv2am8bdecr6c, xn--et-8kcrxk3bcecp2c, xn--80ajng3aaecl4b
+notBefore: 2022-11-22T02:09:01.285Z
+notAfter: 2027-10-21T08:12:08.921Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il9lNjdj
+N2M2OC00ZjUyLTQ1ZTgtYTBiNy0xYTk4YTIzN2JlODYiPjxzbWQ6aWQ+MDAwMDAwNjgxNjY5MDgy
+OTQxMjg1LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMjowOTowMS4yODVaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0yMVQwODoxMjowOC45MjFaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
+cmFkZW1hcms+PG1hcms6aWQ+MDAwMTQwMTUwMzA2MzYxMzE1MDMwNjM2MTMtMTwvbWFyazppZD48
+bWFyazptYXJrTmFtZT7QotC10YHRgiZhbXA70YHQu9GD0YfQsNC5PC9tYXJrOm1hcmtOYW1lPjxt
+YXJrOmhvbGRlciBlbnRpdGxlbWVudD0ib3duZXIiPjxtYXJrOm5hbWU+0J3QsNGC0LDQu9GM0Y8g
+0JDQvdGC0L7QvdC+0LLQsDwvbWFyazpuYW1lPjxtYXJrOm9yZz7QkNC90YLQvtC90L7QstCwPC9t
+YXJrOm9yZz48bWFyazphZGRyPjxtYXJrOnN0cmVldD7Qn9GA0L7RgdC/0LXQutGCINCS0LXRgNC9
+0LDQtNGB0LrQvtCz0L4gMTU8L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+0JzQvtGB0LrQstCwPC9t
+YXJrOmNpdHk+PG1hcms6cGM+MTE3NDg1PC9tYXJrOnBjPjxtYXJrOmNjPlJVPC9tYXJrOmNjPjwv
+bWFyazphZGRyPjxtYXJrOnZvaWNlPis3LjkxODgyMjE2NzQ8L21hcms6dm9pY2U+PG1hcms6ZW1h
+aWw+aW5mb0BleGFtcGxlLmV4YW1wbGU8L21hcms6ZW1haWw+PC9tYXJrOmhvbGRlcj48bWFyazpq
+dXJpc2RpY3Rpb24+VVM8L21hcms6anVyaXNkaWN0aW9uPjxtYXJrOmNsYXNzPjE1PC9tYXJrOmNs
+YXNzPjxtYXJrOmxhYmVsPnhuLS0tLThzYm5zaThhYmVjbjhiPC9tYXJrOmxhYmVsPjxtYXJrOmxh
+YmVsPnhuLS1hbmQtOGNkdjJhbThiZGVjcjZjPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1l
+dC04a2NyeGszYmNlY3AyYzwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tODBham5nM2FhZWNs
+NGI8L21hcms6bGFiZWw+PG1hcms6Z29vZHNBbmRTZXJ2aWNlcz7Qs9C40YLQsNGA0LA8L21hcms6
+Z29vZHNBbmRTZXJ2aWNlcz48bWFyazpyZWdOdW0+MTIzNDwvbWFyazpyZWdOdW0+PG1hcms6cmVn
+RGF0ZT4yMDEzLTAxLTAxVDAwOjAwOjAwLjAwMFo8L21hcms6cmVnRGF0ZT48L21hcms6dHJhZGVt
+YXJrPjwvbWFyazptYXJrPjxkczpTaWduYXR1cmUgeG1sbnM6ZHM9Imh0dHA6Ly93d3cudzMub3Jn
+LzIwMDAvMDkveG1sZHNpZyMiIElkPSJfYzM0YzQ5YmMtZDQwNS00ZDUzLTllZTMtNGU0YjE1NGYz
+ZTg2Ij48ZHM6U2lnbmVkSW5mbz48ZHM6Q2Fub25pY2FsaXphdGlvbk1ldGhvZCBBbGdvcml0aG09
+Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjxkczpTaWduYXR1cmVN
+ZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGRzaWctbW9yZSNy
+c2Etc2hhMjU2Ii8+PGRzOlJlZmVyZW5jZSBVUkk9IiNfZTY3YzdjNjgtNGY1Mi00NWU4LWEwYjct
+MWE5OGEyMzdiZTg2Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0
+cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48ZHM6
+VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMx
+NG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8v
+d3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+NzdXaWVH
+Zk10SFJYZmpwZld1SHg0clVoVFV5UTlMNTJrNlRzaHhTYnNLUT08L2RzOkRpZ2VzdFZhbHVlPjwv
+ZHM6UmVmZXJlbmNlPjxkczpSZWZlcmVuY2UgVVJJPSIjXzM0MGNjMDdhLTBiMGMtNGIzOC04NzAy
+LWYwNjBjM2YzZDdmMyI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0
+dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48
+ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxl
+bmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPlNia0hFM2xzZVhWQ3YwMndXOGl0ZFlSWTJOREJ2
+VSs3di9tS2pqek9nbFE9PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48L2RzOlNpZ25l
+ZEluZm8+PGRzOlNpZ25hdHVyZVZhbHVlIElkPSJfNzE0MjE5MzktOTY1MC00YzYyLTlkZjctZmY5
+NDAzNWE3NmZlIj5DYzRrenVyaitlME5GTVhlUDlzVVFEUzU0bkpCZGhJbExUZUdZcnlNN2ZwMUhk
+Ulp6Rm8vWHVyWkdMNDl3V0xoaUtZS3BZUG5TcXVTJiMxMzsKYUVGNU1VaWYybnJzNHp0TDRlbzUw
+SG0yVnZDRDczcllPZE50bkZNUXhRdUFNdkNmQm1LUUtDeUNPd0Zya1JWQVZHMHEycDJPaGZVayYj
+MTM7CndMN0xSUGpjTkNYYStLSzJRVGxWWFloSCs1VVhTaG90SGV2QS9BRk1oOUhnM2Vld3hoVGZC
+dkRkbVorYTVjM1MxZVgwcTU0ZzI3NEEmIzEzOwpkRjlrelFmakZEWU5kVGN4MktFNllnOEdUdEtI
+enNsTGF0Y05oUFowSlVDU0t0UVU5UUltc0ZqeVNiOHNSOTR2TEdHYWVOaGQ0ZUVZJiMxMzsKVXUz
+TEFyQlAvbTQ5RzVpWmJiKzJPc21TRy9Da1JWUU1HTlJRVTgydE5sVWp5MzNNWGtFRDlhR1AxaEk0
+NHBVVkRDTTRLSlRXQnNVVyYjMTM7CnBHNlJtUTVxb0pJNnNiMXQzTGVRM1dGMVh6Y1FRVlBqcXpi
+MWlRUnhYdW1oYXU4c3F4YlBMVUJZemhETVlRRWIxeDlhcFo1N0xZTk4mIzEzOwphYnJ5aEFPb0kr
+Y2lIN2lZN3FiY0hCNWd1VGx5aHJuRm9pQm5zeWNhU2ZIRjRSNUovR1BXRnAxQTlwMVlvM1hTZlNu
+ZXplUUIvVVBLJiMxMzsKT0NGVWhMTHUrT1A3dHY2NnNWb2tVbnVmQUZpL3NNS1FJSHpzZ0lzeXVH
+TXJTWFd1enZCUmdwc21kRU13UFZEN3FoQnl1akVpMGE2ZSYjMTM7CmpWbE9EY2laUTdmajI1VUdT
+SkpqSWxtTUs1a1ZDL0dRRC82UFpQWVNhSkxqM1k3YW8rSDUxN3lhcU9zeld1b0hCS3N0dzNmcllN
+MD08L2RzOlNpZ25hdHVyZVZhbHVlPjxkczpLZXlJbmZvIElkPSJfMzQwY2MwN2EtMGIwYy00YjM4
+LTg3MDItZjA2MGMzZjNkN2YzIj48ZHM6WDUwOURhdGE+PGRzOlg1MDlDZXJ0aWZpY2F0ZT5NSUlI
+WHpDQ0JVZWdBd0lCQWdJVVhxSS92ZDE4Q2FnOThvTnBkelY3Qml5LzZFQXdEUVlKS29aSWh2Y05B
+UUVOQlFBd2ZERUxNQWtHJiMxMzsKQTFVRUJoTUNWVk14UERBNkJnTlZCQW9NTTBsdWRHVnlibVYw
+SUVOdmNuQnZjbUYwYVc5dUlHWnZjaUJCYzNOcFoyNWxaQ0JPWVcxbCYjMTM7CmN5QmhibVFnVG5W
+dFltVnljekV2TUMwR0ExVUVBd3dtU1VOQlRrNGdWSEpoWkdWdFlYSnJJRU5zWldGeWFXNW5hRzkx
+YzJVZ1VHbHMmIzEzOwpiM1FnUTBFd0hoY05Nakl4TVRFMk1UTXlPRFU1V2hjTk1qY3hNVEUxTVRN
+eU9EVTVXakNCMERFTE1Ba0dBMVVFQmhNQ1FrVXhFVEFQJiMxMzsKQmdOVkJBZ1RDRUp5ZFhOelpX
+eHpNUkl3RUFZRFZRUUhFd2xXYVd4MmIyOXlaR1V4TXpBeEJnTlZCQW9US2tSbGJHOXBkSFJsSUVO
+diYjMTM7CmJuTjFiSFJwYm1jZ1lXNWtJRUZrZG1semIzSjVJRU5XUWtFdlUwTlNUREUrTUR3R0Ex
+VUVBeE0xU1VOQlRrNGdWRTFEU0NCQmRYUm8mIzEzOwpiM0pwZW1Wa0lGUnlZV1JsYldGeWF5QlFh
+V3h2ZENCV1lXeHBaR0YwYjNJZ1ZtRnNhV1F4SlRBakJna3Foa2lHOXcwQkNRRVdGbUpsJiMxMzsK
+ZEcxamFITnRaRUJrWld4dmFYUjBaUzVqYjIwd2dnSWlNQTBHQ1NxR1NJYjNEUUVCQVFVQUE0SUNE
+d0F3Z2dJS0FvSUNBUUM2Rkp3eiYjMTM7CktxUVZYNmZHMy9FTFJTR1dWOUdyS2FGTUttaFdJeGVw
+d1JaTjZNeE1xa2Q1RG5ZZmlUK1dwOThqRWtxZ1R4MlVNYjlxdWdjR05WNmcmIzEzOwozNS9DclFi
+L0YvbXozQzRzZkxOdURwU3FLOVFGOCtwYVRINmhRbXJPcHFWK1VUdmRqOVNNZ0tHeUZpelM4OENE
+V014NHczaTRGQUtlJiMxMzsKNk5Sc0pSR1RBdEtEdU1IY0E0c2owOEdqZTNsUFdjZ0Z2Y1FORFZl
+RUJUdU9IQkcrUmhqN1YxSmlOR1AvNGVwVFhURlhnUEZEZ2V6MyYjMTM7CllBZnhxcGJ1TzRUWDZi
+YllkazJudk1MRnZMRU5rQ0ZZdWxuWVB6Z25FQkdTTUtJYUFJbGIrc2NIQ3ZXZ1dqMlRMZ3doMkdK
+TmN6Vk0mIzEzOwoxTFBNcUdTK1VraTlNaDc5ODIyL3hvYXI0OTh4RHgyWXgvOHN3Z0VOTFNnQ3NR
+QVc4bk1nd1duNkFiWWwyUkFCWHVyYXlGc240UDFSJiMxMzsKdVFObVVwL3FyUktSdlNKcjFPTGtI
+WmZGVGNTWVFhVml1TVlQWHpHejh0bU1MbG1JL0I2QUNINEF3Uk1kbll2Rk8zS0kxUkJuUEtJZCYj
+MTM7Cnd3ZlVwWjVJVElwYkE3Q0dnVHgxcXh0TTF3SVVyN3BIZUtQNmpWZTNrZERMZysvQloyeE1F
+dEJrNWE4WTdCNHYzeHdIWEdUdlY4bU4mIzEzOwowQWcvU3lUL1FVeUVSaFhVeUFOMitFd1orU1FD
+VXlOZnppb1dRODc4ZUd5a1UrNDYrQmJnSTNJSXIzNlhLUHdtenQwU1orS0kzdG5GJiMxMzsKVGxu
+OW1YMEtDMGlkb2o1eWt6UG9DL01JZWQwc3A0VGlneEViV054N0VGODBQdlIvRERFd1ZQRUVra2p5
+NjNYRnVseGlDUUlEQVFBQiYjMTM7Cm80SUJnakNDQVg0d0RBWURWUjBUQVFIL0JBSXdBREFPQmdO
+VkhROEJBZjhFQkFNQ0I0QXdIUVlEVlIwT0JCWUVGSG45czBERWEya3YmIzEzOwpnRS9lSU9Uc3Fv
+Vzg1TVhGTUlHNkJnTlZIU01FZ2JJd2dhK0FGRWQ3VDY1NlVaRzEwYitkTnVtR2Z6WVdCS2xGb1lH
+QXBINHdmREVMJiMxMzsKTUFrR0ExVUVCaE1DVlZNeFBEQTZCZ05WQkFvTU0wbHVkR1Z5Ym1WMElF
+TnZjbkJ2Y21GMGFXOXVJR1p2Y2lCQmMzTnBaMjVsWkNCTyYjMTM7CllXMWxjeUJoYm1RZ1RuVnRZ
+bVZ5Y3pFdk1DMEdBMVVFQXd3bVNVTkJUazRnVkhKaFpHVnRZWEpySUVOc1pXRnlhVzVuYUc5MWMy
+VWcmIzEzOwpVR2xzYjNRZ1EwR0NGSHBxYlRGZUpjUHRVQzlYdXVQS1BzTHdEUitNTURRR0ExVWRI
+d1F0TUNzd0thQW5vQ1dHSTJoMGRIQTZMeTlqJiMxMzsKY213dWFXTmhibTR1YjNKbkwzUnRZMmhm
+Y0dsc2IzUXVZM0pzTUV3R0ExVWRJQVJGTUVNd0VBWU9Ld1lCQkFHQ3lSc0JCWU03REFvdyYjMTM7
+Ckx3WUlLd1lCQlFVSEFnRXdJekFoQmdnckJnRUZCUWNDQVJZVmFIUjBjSE02THk5amNITXVhV05o
+Ym00dWIzSm5NQTBHQ1NxR1NJYjMmIzEzOwpEUUVCRFFVQUE0SUNBUUJkU2F0NTZ1ZWpMbkFqRklG
+OTVkallXSTZzLy9ONllYeHNyck1rR0JQOEVlelB5aExoNmF3UDR6N1E5UUFJJiMxMzsKUVprWW94
+cmwvMXkwK2J5VjJxblRVVUNMUnBLL0JEcC9oY2Z3UGZLQ0EvMlJRQ0hKcmI2K3owZW5EUEZSSzBO
+S213T2NkbEd0VWswbSYjMTM7ClBnV0dTS3R1d1ZzUEFoVERKdWhvc1pPaGtOZituU09PSHJRT24x
+RTJyek9yZC9rUWxxaUN3Ukg5Nzk2TnBUQStIU01mT29iSkVFUHEmIzEzOwp0cEY3UDVxYnd0bDk1
+VWE1T3A0QWhhNzBISGZVRlM0Qk9RS0xCVmZNWmRPUitpUG9oNU93QUsraHRZa0ZDRzlQMldIdTd3
+ZjhFQytXJiMxMzsKN2s5Nmd2VGQ4eEU3b3VvYWJUMng2WWZZcUVsUEhpVS9JTTlnVnpXV0wvc3ZZ
+RHlTVnVvRndCakROTjFjZHEwcU9ZUjF5dVMxYy85RCYjMTM7CkZSN2VvN0dGRUN5K1RCZDdJaUtS
+ZkJWZVlHT09QTW5vRmZ4UkxXcnBzV05ud0Q3bGtQa0xDZ0ZDays4eUVjT1JnNjI1bW82NXo0eTYm
+IzEzOwpKNEs4Zm9kYTdxd21YTlAzUlMxOG9uNkJIdDhsUStiWGdPSG14SUhrMGFPMHFORHFndkxy
+MkZseUxHSkdpRU1ScURNTVI2L2EwNmJ0JiMxMzsKa25VTUhsN0NxTWZqSWtqUDRWTk55R1BkSmd3
+Vmsya2ViOXVORnZKQ3hUK00yZkdYUTFOYkpOZnR2NU1nU3NwOU4xeSt4NmdBM0VodyYjMTM7CnlI
+bG1KQjRZTXRvOHRUVjFpODR4UFh4aTJDQWVEYUdEdXdvc3Q4WVVDU2pxN1JDSzh0R2NhQVlya1hR
+WTJ5UWZYM2N3RHNFeFJxVlcmIzEzOwp5cmp5UnQrTjZtSzk5UT09PC9kczpYNTA5Q2VydGlmaWNh
+dGU+PC9kczpYNTA5RGF0YT48L2RzOktleUluZm8+PC9kczpTaWduYXR1cmU+PC9zbWQ6c2lnbmVk
+TWFyaz4K
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Holder-Russian/TreatyStatute-Holder-Russian-Active.smd b/core/src/test/resources/google/registry/tmch/idn/Holder-Russian/TreatyStatute-Holder-Russian-Active.smd
new file mode 100644
index 000000000..9bde2701d
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Holder-Russian/TreatyStatute-Holder-Russian-Active.smd
@@ -0,0 +1,124 @@
+Marks: Ошибки & доказательство
+smdID: 000000691669083003237-65535
+U-labels: xn------8cdabmnlsebzft8aih9crd8iye, xn-----8kcabklkqebxes6ahh6cqd3ite, xn---and--8veabqrnweb3ahv2bkh5dtd8j4e, xn---and-83dabopmueb1agu0bjh2dsd3jze, xn----8sbabijjoebvdr4agh3cpd8h9d, xn--and--83dabopmueb1agu0bjh2dsd3jze, xn--and-8cdabmnlsebzft8aih9crd8iye, xn--80aabghimebtcq2afh0cod3h7d
+notBefore: 2022-11-22T02:10:03.237Z
+notAfter: 2027-10-21T08:12:08.921Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il85Mzcy
+ZDk3NC05ZDU5LTQ4YTYtOTJlMC1iMjEyNGRiZDNiYzYiPjxzbWQ6aWQ+MDAwMDAwNjkxNjY5MDgz
+MDAzMjM3LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMjoxMDowMy4yMzdaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0yMVQwODoxMjowOC45MjFaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
+cmVhdHlPclN0YXR1dGU+PG1hcms6aWQ+MDAwMTQwMTUwMzA2MzkwMjE1MDMwNjM5MDItMTwvbWFy
+azppZD48bWFyazptYXJrTmFtZT7QntGI0LjQsdC60LggJmFtcDsg0LTQvtC60LDQt9Cw0YLQtdC7
+0YzRgdGC0LLQvjwvbWFyazptYXJrTmFtZT48bWFyazpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVy
+Ij48bWFyazpuYW1lPtCd0LDRgtCw0LvRjNGPINCQ0L3RgtC+0L3QvtCy0LA8L21hcms6bmFtZT48
+bWFyazpvcmc+0JDQvdGC0L7QvdC+0LLQsDwvbWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpzdHJl
+ZXQ+0J/RgNC+0YHQv9C10LrRgiDQktC10YDQvdCw0LTRgdC60L7Qs9C+IDE1PC9tYXJrOnN0cmVl
+dD48bWFyazpjaXR5PtCc0L7RgdC60LLQsDwvbWFyazpjaXR5PjxtYXJrOnBjPjExNzQ4NTwvbWFy
+azpwYz48bWFyazpjYz5SVTwvbWFyazpjYz48L21hcms6YWRkcj48bWFyazp2b2ljZT4rNy45MTg4
+MjIxNjc0PC9tYXJrOnZvaWNlPjxtYXJrOmVtYWlsPmluZm9AZXhhbXBsZS5leGFtcGxlPC9tYXJr
+OmVtYWlsPjwvbWFyazpob2xkZXI+PG1hcms6cHJvdGVjdGlvbj48bWFyazpjYz5VUzwvbWFyazpj
+Yz48bWFyazpydWxpbmc+UlU8L21hcms6cnVsaW5nPjwvbWFyazpwcm90ZWN0aW9uPjxtYXJrOmxh
+YmVsPnhuLS0tLS0tOGNkYWJtbmxzZWJ6ZnQ4YWloOWNyZDhpeWU8L21hcms6bGFiZWw+PG1hcms6
+bGFiZWw+eG4tLS0tLThrY2Fia2xrcWVieGVzNmFoaDZjcWQzaXRlPC9tYXJrOmxhYmVsPjxtYXJr
+OmxhYmVsPnhuLS0tYW5kLS04dmVhYnFybndlYjNhaHYyYmtoNWR0ZDhqNGU8L21hcms6bGFiZWw+
+PG1hcms6bGFiZWw+eG4tLS1hbmQtODNkYWJvcG11ZWIxYWd1MGJqaDJkc2QzanplPC9tYXJrOmxh
+YmVsPjxtYXJrOmxhYmVsPnhuLS0tLThzYmFiaWpqb2VidmRyNGFnaDNjcGQ4aDlkPC9tYXJrOmxh
+YmVsPjxtYXJrOmxhYmVsPnhuLS1hbmQtLTgzZGFib3BtdWViMWFndTBiamgyZHNkM2p6ZTwvbWFy
+azpsYWJlbD48bWFyazpsYWJlbD54bi0tYW5kLThjZGFibW5sc2ViemZ0OGFpaDljcmQ4aXllPC9t
+YXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS04MGFhYmdoaW1lYnRjcTJhZmgwY29kM2g3ZDwvbWFy
+azpsYWJlbD48bWFyazpnb29kc0FuZFNlcnZpY2VzPtCz0LjRgtCw0YDQsDwvbWFyazpnb29kc0Fu
+ZFNlcnZpY2VzPjxtYXJrOnJlZk51bT4xMjM0PC9tYXJrOnJlZk51bT48bWFyazpwcm9EYXRlPjIw
+MDAtMDEtMDFUMDA6MDA6MDAuMDAwWjwvbWFyazpwcm9EYXRlPjxtYXJrOnRpdGxlPlRlc3QgVHJl
+YXR5PC9tYXJrOnRpdGxlPjxtYXJrOmV4ZWNEYXRlPjIwMTMtMDItMDJUMDA6MDA6MDAuMDAwWjwv
+bWFyazpleGVjRGF0ZT48L21hcms6dHJlYXR5T3JTdGF0dXRlPjwvbWFyazptYXJrPjxkczpTaWdu
+YXR1cmUgeG1sbnM6ZHM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1sZHNpZyMiIElkPSJf
+ZTc0OGRmYjItMDVhNy00MmFlLWE4YWEtNGE2OGM4YTMwYjkzIj48ZHM6U2lnbmVkSW5mbz48ZHM6
+Q2Fub25pY2FsaXphdGlvbk1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEv
+MTAveG1sLWV4Yy1jMTRuIyIvPjxkczpTaWduYXR1cmVNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8v
+d3d3LnczLm9yZy8yMDAxLzA0L3htbGRzaWctbW9yZSNyc2Etc2hhMjU2Ii8+PGRzOlJlZmVyZW5j
+ZSBVUkk9IiNfOTM3MmQ5NzQtOWQ1OS00OGE2LTkyZTAtYjIxMjRkYmQzYmM2Ij48ZHM6VHJhbnNm
+b3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94
+bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0
+cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxk
+czpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVu
+YyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+djl3RUt6bng5ZjhUMVBjNnlhZGpxZlI4SW9mbEFv
+T3d6VUNwa05LbzhsMD08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNlPjxkczpSZWZlcmVu
+Y2UgVVJJPSIjXzY2N2Q4YjU1LTRhYjctNDZlOC1hYzcwLTQ5ZTZiNDJjMWI5ZiI+PGRzOlRyYW5z
+Zm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAv
+eG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRo
+bT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxlbmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZh
+bHVlPisxOFk5QnpMZkoyMUtydkNpUmVidThvNmFLa2dyYlYxN0NjeGFZVVMvY009PC9kczpEaWdl
+c3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48L2RzOlNpZ25lZEluZm8+PGRzOlNpZ25hdHVyZVZhbHVl
+IElkPSJfY2NkOTc4NDUtYjhmYi00MTRiLTgwNzItNjRkZmY4ZmVhNTVmIj5VODBIQVZyWUZnZHlr
+Y0lKbndES2lkeWtraTdvYUkyd0tEWFNhRWpCRmxhOXpqdTNlWXhmait6cjNKYUsxdGNjb3lwSjZl
+ZFFqaDhXJiMxMzsKVGxWZjlFOXAzMnBJV2czRXo3ajl0UnNvMHB1cDZnYy9UVDVvcTNkN2xDOTU4
+K25SREtob2J2ekI1WFhqbU9DT0lhMkxDNGNsYnFNbiYjMTM7CmVhZlpnWDJFZEtvSXhGMS8vVHNH
+Tmx4Ylp0dTJqcXJVcDN5SldYcmZZN0F6dGhiUkhWQ3FSaWIxTC9Wc2lXUmFTamNLWmQ5Z0pKTmEm
+IzEzOwoyZGk3NjhxajliU3g1UzkwTWlJcFVSeVJKUUgrK0ErOWRGY2NabDNibUVTL0hyb1g5R3No
+QnRFY3pZY2I2cHppNzB4LzFzWWRFLzY2JiMxMzsKTy9Dd3lCVzI0L3VmSnRST1RMdmVyc3EzSGpL
+ZjM0dHNBcGRqcFA4dUFIS3FvRTliZ3h6OVdtY29hU1Z3MXdBajQ0MzQxM01CZzl5RiYjMTM7Clp3
+VE1ZMWFyRTRHUGhPNU4va0lLSWIyME9FUHkweFlBZlQzUVBHOXc3bG1KdVBOYUNRNm5EVnd3MnRr
+NWxTdHYrUC9oeXVvWm5vL2cmIzEzOwp6SkNvbHAvNUkwbmg1QTFMTUZ3dDJzSFN6ODVxbENqcjhj
+QmtjenhpNjdDdjh0MmV2VkNEK2I0SFZlcVJlaXh0MTZNbEpzTWVleElCJiMxMzsKM3JFSFNETFlq
+UTRPTDdpNDRSa2crbnE1ejdyWXh5d3RHeERkWTRpUW55VFlxZFJOQWg2YmpsNG9Oa2RCZTFDbmt2
+VzBXSW5rM0JnYSYjMTM7CnR0ejlCSEFQTzYxcit2TjRjekZ0b3Zrd0h1RTdyVnF3MlgraThSYTBm
+NWJuY09xK29oVFdwbkk4ZTlMdmdCOFBSNVc1NUtJZ0s2cz08L2RzOlNpZ25hdHVyZVZhbHVlPjxk
+czpLZXlJbmZvIElkPSJfNjY3ZDhiNTUtNGFiNy00NmU4LWFjNzAtNDllNmI0MmMxYjlmIj48ZHM6
+WDUwOURhdGE+PGRzOlg1MDlDZXJ0aWZpY2F0ZT5NSUlIWHpDQ0JVZWdBd0lCQWdJVVhxSS92ZDE4
+Q2FnOThvTnBkelY3Qml5LzZFQXdEUVlKS29aSWh2Y05BUUVOQlFBd2ZERUxNQWtHJiMxMzsKQTFV
+RUJoTUNWVk14UERBNkJnTlZCQW9NTTBsdWRHVnlibVYwSUVOdmNuQnZjbUYwYVc5dUlHWnZjaUJC
+YzNOcFoyNWxaQ0JPWVcxbCYjMTM7CmN5QmhibVFnVG5WdFltVnljekV2TUMwR0ExVUVBd3dtU1VO
+QlRrNGdWSEpoWkdWdFlYSnJJRU5zWldGeWFXNW5hRzkxYzJVZ1VHbHMmIzEzOwpiM1FnUTBFd0ho
+Y05Nakl4TVRFMk1UTXlPRFU1V2hjTk1qY3hNVEUxTVRNeU9EVTVXakNCMERFTE1Ba0dBMVVFQmhN
+Q1FrVXhFVEFQJiMxMzsKQmdOVkJBZ1RDRUp5ZFhOelpXeHpNUkl3RUFZRFZRUUhFd2xXYVd4MmIy
+OXlaR1V4TXpBeEJnTlZCQW9US2tSbGJHOXBkSFJsSUVOdiYjMTM7CmJuTjFiSFJwYm1jZ1lXNWtJ
+RUZrZG1semIzSjVJRU5XUWtFdlUwTlNUREUrTUR3R0ExVUVBeE0xU1VOQlRrNGdWRTFEU0NCQmRY
+Um8mIzEzOwpiM0pwZW1Wa0lGUnlZV1JsYldGeWF5QlFhV3h2ZENCV1lXeHBaR0YwYjNJZ1ZtRnNh
+V1F4SlRBakJna3Foa2lHOXcwQkNRRVdGbUpsJiMxMzsKZEcxamFITnRaRUJrWld4dmFYUjBaUzVq
+YjIwd2dnSWlNQTBHQ1NxR1NJYjNEUUVCQVFVQUE0SUNEd0F3Z2dJS0FvSUNBUUM2Rkp3eiYjMTM7
+CktxUVZYNmZHMy9FTFJTR1dWOUdyS2FGTUttaFdJeGVwd1JaTjZNeE1xa2Q1RG5ZZmlUK1dwOThq
+RWtxZ1R4MlVNYjlxdWdjR05WNmcmIzEzOwozNS9DclFiL0YvbXozQzRzZkxOdURwU3FLOVFGOCtw
+YVRINmhRbXJPcHFWK1VUdmRqOVNNZ0tHeUZpelM4OENEV014NHczaTRGQUtlJiMxMzsKNk5Sc0pS
+R1RBdEtEdU1IY0E0c2owOEdqZTNsUFdjZ0Z2Y1FORFZlRUJUdU9IQkcrUmhqN1YxSmlOR1AvNGVw
+VFhURlhnUEZEZ2V6MyYjMTM7CllBZnhxcGJ1TzRUWDZiYllkazJudk1MRnZMRU5rQ0ZZdWxuWVB6
+Z25FQkdTTUtJYUFJbGIrc2NIQ3ZXZ1dqMlRMZ3doMkdKTmN6Vk0mIzEzOwoxTFBNcUdTK1VraTlN
+aDc5ODIyL3hvYXI0OTh4RHgyWXgvOHN3Z0VOTFNnQ3NRQVc4bk1nd1duNkFiWWwyUkFCWHVyYXlG
+c240UDFSJiMxMzsKdVFObVVwL3FyUktSdlNKcjFPTGtIWmZGVGNTWVFhVml1TVlQWHpHejh0bU1M
+bG1JL0I2QUNINEF3Uk1kbll2Rk8zS0kxUkJuUEtJZCYjMTM7Cnd3ZlVwWjVJVElwYkE3Q0dnVHgx
+cXh0TTF3SVVyN3BIZUtQNmpWZTNrZERMZysvQloyeE1FdEJrNWE4WTdCNHYzeHdIWEdUdlY4bU4m
+IzEzOwowQWcvU3lUL1FVeUVSaFhVeUFOMitFd1orU1FDVXlOZnppb1dRODc4ZUd5a1UrNDYrQmJn
+STNJSXIzNlhLUHdtenQwU1orS0kzdG5GJiMxMzsKVGxuOW1YMEtDMGlkb2o1eWt6UG9DL01JZWQw
+c3A0VGlneEViV054N0VGODBQdlIvRERFd1ZQRUVra2p5NjNYRnVseGlDUUlEQVFBQiYjMTM7Cm80
+SUJnakNDQVg0d0RBWURWUjBUQVFIL0JBSXdBREFPQmdOVkhROEJBZjhFQkFNQ0I0QXdIUVlEVlIw
+T0JCWUVGSG45czBERWEya3YmIzEzOwpnRS9lSU9Uc3FvVzg1TVhGTUlHNkJnTlZIU01FZ2JJd2dh
+K0FGRWQ3VDY1NlVaRzEwYitkTnVtR2Z6WVdCS2xGb1lHQXBINHdmREVMJiMxMzsKTUFrR0ExVUVC
+aE1DVlZNeFBEQTZCZ05WQkFvTU0wbHVkR1Z5Ym1WMElFTnZjbkJ2Y21GMGFXOXVJR1p2Y2lCQmMz
+TnBaMjVsWkNCTyYjMTM7CllXMWxjeUJoYm1RZ1RuVnRZbVZ5Y3pFdk1DMEdBMVVFQXd3bVNVTkJU
+azRnVkhKaFpHVnRZWEpySUVOc1pXRnlhVzVuYUc5MWMyVWcmIzEzOwpVR2xzYjNRZ1EwR0NGSHBx
+YlRGZUpjUHRVQzlYdXVQS1BzTHdEUitNTURRR0ExVWRId1F0TUNzd0thQW5vQ1dHSTJoMGRIQTZM
+eTlqJiMxMzsKY213dWFXTmhibTR1YjNKbkwzUnRZMmhmY0dsc2IzUXVZM0pzTUV3R0ExVWRJQVJG
+TUVNd0VBWU9Ld1lCQkFHQ3lSc0JCWU03REFvdyYjMTM7Ckx3WUlLd1lCQlFVSEFnRXdJekFoQmdn
+ckJnRUZCUWNDQVJZVmFIUjBjSE02THk5amNITXVhV05oYm00dWIzSm5NQTBHQ1NxR1NJYjMmIzEz
+OwpEUUVCRFFVQUE0SUNBUUJkU2F0NTZ1ZWpMbkFqRklGOTVkallXSTZzLy9ONllYeHNyck1rR0JQ
+OEVlelB5aExoNmF3UDR6N1E5UUFJJiMxMzsKUVprWW94cmwvMXkwK2J5VjJxblRVVUNMUnBLL0JE
+cC9oY2Z3UGZLQ0EvMlJRQ0hKcmI2K3owZW5EUEZSSzBOS213T2NkbEd0VWswbSYjMTM7ClBnV0dT
+S3R1d1ZzUEFoVERKdWhvc1pPaGtOZituU09PSHJRT24xRTJyek9yZC9rUWxxaUN3Ukg5Nzk2TnBU
+QStIU01mT29iSkVFUHEmIzEzOwp0cEY3UDVxYnd0bDk1VWE1T3A0QWhhNzBISGZVRlM0Qk9RS0xC
+VmZNWmRPUitpUG9oNU93QUsraHRZa0ZDRzlQMldIdTd3ZjhFQytXJiMxMzsKN2s5Nmd2VGQ4eEU3
+b3VvYWJUMng2WWZZcUVsUEhpVS9JTTlnVnpXV0wvc3ZZRHlTVnVvRndCakROTjFjZHEwcU9ZUjF5
+dVMxYy85RCYjMTM7CkZSN2VvN0dGRUN5K1RCZDdJaUtSZkJWZVlHT09QTW5vRmZ4UkxXcnBzV05u
+d0Q3bGtQa0xDZ0ZDays4eUVjT1JnNjI1bW82NXo0eTYmIzEzOwpKNEs4Zm9kYTdxd21YTlAzUlMx
+OG9uNkJIdDhsUStiWGdPSG14SUhrMGFPMHFORHFndkxyMkZseUxHSkdpRU1ScURNTVI2L2EwNmJ0
+JiMxMzsKa25VTUhsN0NxTWZqSWtqUDRWTk55R1BkSmd3Vmsya2ViOXVORnZKQ3hUK00yZkdYUTFO
+YkpOZnR2NU1nU3NwOU4xeSt4NmdBM0VodyYjMTM7CnlIbG1KQjRZTXRvOHRUVjFpODR4UFh4aTJD
+QWVEYUdEdXdvc3Q4WVVDU2pxN1JDSzh0R2NhQVlya1hRWTJ5UWZYM2N3RHNFeFJxVlcmIzEzOwp5
+cmp5UnQrTjZtSzk5UT09PC9kczpYNTA5Q2VydGlmaWNhdGU+PC9kczpYNTA5RGF0YT48L2RzOktl
+eUluZm8+PC9kczpTaWduYXR1cmU+PC9zbWQ6c2lnbmVkTWFyaz4K
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/Holder-Russian/TreatyStatute-Holder-Russian-Revoked.smd b/core/src/test/resources/google/registry/tmch/idn/Holder-Russian/TreatyStatute-Holder-Russian-Revoked.smd
new file mode 100644
index 000000000..b7ffa6623
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/Holder-Russian/TreatyStatute-Holder-Russian-Revoked.smd
@@ -0,0 +1,124 @@
+Marks: Ошибки & доказательство
+smdID: 000000691669082944549-65535
+U-labels: xn------8cdabmnlsebzft8aih9crd8iye, xn-----8kcabklkqebxes6ahh6cqd3ite, xn---and--8veabqrnweb3ahv2bkh5dtd8j4e, xn---and-83dabopmueb1agu0bjh2dsd3jze, xn----8sbabijjoebvdr4agh3cpd8h9d, xn--and--83dabopmueb1agu0bjh2dsd3jze, xn--and-8cdabmnlsebzft8aih9crd8iye, xn--80aabghimebtcq2afh0cod3h7d
+notBefore: 2022-11-22T02:09:04.549Z
+notAfter: 2027-10-21T08:12:08.921Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il9iNDBh
+NDNkNS02ZjFmLTRkMDMtODY5Ni1mMDIyODhhN2E0ZWUiPjxzbWQ6aWQ+MDAwMDAwNjkxNjY5MDgy
+OTQ0NTQ5LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMjowOTowNC41NDlaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0yMVQwODoxMjowOC45MjFaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
+cmVhdHlPclN0YXR1dGU+PG1hcms6aWQ+MDAwMTQwMTUwMzA2MzkwMjE1MDMwNjM5MDItMTwvbWFy
+azppZD48bWFyazptYXJrTmFtZT7QntGI0LjQsdC60LggJmFtcDsg0LTQvtC60LDQt9Cw0YLQtdC7
+0YzRgdGC0LLQvjwvbWFyazptYXJrTmFtZT48bWFyazpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVy
+Ij48bWFyazpuYW1lPtCd0LDRgtCw0LvRjNGPINCQ0L3RgtC+0L3QvtCy0LA8L21hcms6bmFtZT48
+bWFyazpvcmc+0JDQvdGC0L7QvdC+0LLQsDwvbWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpzdHJl
+ZXQ+0J/RgNC+0YHQv9C10LrRgiDQktC10YDQvdCw0LTRgdC60L7Qs9C+IDE1PC9tYXJrOnN0cmVl
+dD48bWFyazpjaXR5PtCc0L7RgdC60LLQsDwvbWFyazpjaXR5PjxtYXJrOnBjPjExNzQ4NTwvbWFy
+azpwYz48bWFyazpjYz5SVTwvbWFyazpjYz48L21hcms6YWRkcj48bWFyazp2b2ljZT4rNy45MTg4
+MjIxNjc0PC9tYXJrOnZvaWNlPjxtYXJrOmVtYWlsPmluZm9AZXhhbXBsZS5leGFtcGxlPC9tYXJr
+OmVtYWlsPjwvbWFyazpob2xkZXI+PG1hcms6cHJvdGVjdGlvbj48bWFyazpjYz5VUzwvbWFyazpj
+Yz48bWFyazpydWxpbmc+UlU8L21hcms6cnVsaW5nPjwvbWFyazpwcm90ZWN0aW9uPjxtYXJrOmxh
+YmVsPnhuLS0tLS0tOGNkYWJtbmxzZWJ6ZnQ4YWloOWNyZDhpeWU8L21hcms6bGFiZWw+PG1hcms6
+bGFiZWw+eG4tLS0tLThrY2Fia2xrcWVieGVzNmFoaDZjcWQzaXRlPC9tYXJrOmxhYmVsPjxtYXJr
+OmxhYmVsPnhuLS0tYW5kLS04dmVhYnFybndlYjNhaHYyYmtoNWR0ZDhqNGU8L21hcms6bGFiZWw+
+PG1hcms6bGFiZWw+eG4tLS1hbmQtODNkYWJvcG11ZWIxYWd1MGJqaDJkc2QzanplPC9tYXJrOmxh
+YmVsPjxtYXJrOmxhYmVsPnhuLS0tLThzYmFiaWpqb2VidmRyNGFnaDNjcGQ4aDlkPC9tYXJrOmxh
+YmVsPjxtYXJrOmxhYmVsPnhuLS1hbmQtLTgzZGFib3BtdWViMWFndTBiamgyZHNkM2p6ZTwvbWFy
+azpsYWJlbD48bWFyazpsYWJlbD54bi0tYW5kLThjZGFibW5sc2ViemZ0OGFpaDljcmQ4aXllPC9t
+YXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS04MGFhYmdoaW1lYnRjcTJhZmgwY29kM2g3ZDwvbWFy
+azpsYWJlbD48bWFyazpnb29kc0FuZFNlcnZpY2VzPtCz0LjRgtCw0YDQsDwvbWFyazpnb29kc0Fu
+ZFNlcnZpY2VzPjxtYXJrOnJlZk51bT4xMjM0PC9tYXJrOnJlZk51bT48bWFyazpwcm9EYXRlPjIw
+MDAtMDEtMDFUMDA6MDA6MDAuMDAwWjwvbWFyazpwcm9EYXRlPjxtYXJrOnRpdGxlPlRlc3QgVHJl
+YXR5PC9tYXJrOnRpdGxlPjxtYXJrOmV4ZWNEYXRlPjIwMTMtMDItMDJUMDA6MDA6MDAuMDAwWjwv
+bWFyazpleGVjRGF0ZT48L21hcms6dHJlYXR5T3JTdGF0dXRlPjwvbWFyazptYXJrPjxkczpTaWdu
+YXR1cmUgeG1sbnM6ZHM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1sZHNpZyMiIElkPSJf
+N2ViOGNkOGQtZGQxOS00NjFkLWFhOGYtNDE3NDU4YmM3NGYzIj48ZHM6U2lnbmVkSW5mbz48ZHM6
+Q2Fub25pY2FsaXphdGlvbk1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEv
+MTAveG1sLWV4Yy1jMTRuIyIvPjxkczpTaWduYXR1cmVNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8v
+d3d3LnczLm9yZy8yMDAxLzA0L3htbGRzaWctbW9yZSNyc2Etc2hhMjU2Ii8+PGRzOlJlZmVyZW5j
+ZSBVUkk9IiNfYjQwYTQzZDUtNmYxZi00ZDAzLTg2OTYtZjAyMjg4YTdhNGVlIj48ZHM6VHJhbnNm
+b3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94
+bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0
+cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxk
+czpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVu
+YyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+TlBVWExVd1RKNmI3VlZHVk05dkdteElTY0x2M0Uz
+YVI1bitXMWpyL25Gdz08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNlPjxkczpSZWZlcmVu
+Y2UgVVJJPSIjXzdmM2MwODE3LWEyMTgtNDQwZS1iMTIwLTdlMWRkNDlkZTMxZiI+PGRzOlRyYW5z
+Zm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAv
+eG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRo
+bT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxlbmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZh
+bHVlPnF3cDZpS3VzaHBHUWVlUUR5RHFLVEhPdFNORXUxaGZTODVZd3pjY1ZvSlk9PC9kczpEaWdl
+c3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48L2RzOlNpZ25lZEluZm8+PGRzOlNpZ25hdHVyZVZhbHVl
+IElkPSJfZDUyNzE0ZTEtNDk2Mi00NGFmLTkxNTItODg5MWExOWFjOTdjIj5FQzdEeVpsb2dCZWtB
+Y1VLUmhFaHFlU2R6TjN1ZllCdHVDdldSMnI1NlBTYmpqTkFsaFhkVUN1RmRrRllWQm9CNTFvVjhr
+UFVqQkNCJiMxMzsKMnM4UUNWelByVldvTnJDRnYyR0VmZlowdStsTTlnVE9Zcno2eE5iRjdCWG5v
+a0YyY1pPa3FIMVFEbnpTc3VEMTNnNTlPcElQdEx4ciYjMTM7Citwb0NhVUhBMWFWSnQ2dDVLdzYw
+d3ZSanFKZGV1NytMU240V2JuYjhENzllS2ZPcXVURGtUM2s3QkVoNjN3V1hnNFFDaU5QK3NuUWwm
+IzEzOwpMOGE2R24ydHVTUVFtMFhXZUYwOXJsU2NqUGxYYWp5MGFmaWpUOW9YK1FJb1JpWUVRUzFJ
+bTNEaDBJRTlsQlRvTkJCK1hGbzhEekVHJiMxMzsKU0JFbTdsaXN6eXRyNkxOMDRnaWJwZnc5dEdi
+Y3lrdEJST2N5VnVEMDRDR01aNWFXc0E2MVdNSFJLZWhhSDdKd09kQmZTUzZmYlNsRiYjMTM7CnJN
+V3ZpN2tkL1hCNmFvKzdqa2kyR2srV0NNc1ZQbW9LVDBuZWFORGJhU2V4WkcrOHYxeTNVZ3BmTW9h
+YjhwQ09vOVlZNW1HQ1JDQmMmIzEzOwprYmtaZXdxRW8ybmxqZGhxOHRiZ2xvN0tCVHhFcDZaMG1u
+UWE5MFd5VGpqYnV0dHFvUjNTUHZOWld5NjVUU1ppdzQvbWQyYVZiTUh5JiMxMzsKWXNqMHg0aGxI
+UTdQaHA2ZW5jVFU2dTZjZjB3Z0JTVk42cE9lUlM4ejRVazFBQ0NqK0ErNG8yUXRjaEJWN0lvR3Fa
+dFFkb1dzSVRLMCYjMTM7Ck5BNmdxcjhMMzg1T2VjNTlDd1pxbytZazY2N1ZvQ1crT2FRZnJ4WXNH
+aE41blFVMEN5OXNHZ3E4VDJ1TXpHT3lUWlBNM3RITUFERT08L2RzOlNpZ25hdHVyZVZhbHVlPjxk
+czpLZXlJbmZvIElkPSJfN2YzYzA4MTctYTIxOC00NDBlLWIxMjAtN2UxZGQ0OWRlMzFmIj48ZHM6
+WDUwOURhdGE+PGRzOlg1MDlDZXJ0aWZpY2F0ZT5NSUlIWHpDQ0JVZWdBd0lCQWdJVVhxSS92ZDE4
+Q2FnOThvTnBkelY3Qml5LzZFQXdEUVlKS29aSWh2Y05BUUVOQlFBd2ZERUxNQWtHJiMxMzsKQTFV
+RUJoTUNWVk14UERBNkJnTlZCQW9NTTBsdWRHVnlibVYwSUVOdmNuQnZjbUYwYVc5dUlHWnZjaUJC
+YzNOcFoyNWxaQ0JPWVcxbCYjMTM7CmN5QmhibVFnVG5WdFltVnljekV2TUMwR0ExVUVBd3dtU1VO
+QlRrNGdWSEpoWkdWdFlYSnJJRU5zWldGeWFXNW5hRzkxYzJVZ1VHbHMmIzEzOwpiM1FnUTBFd0ho
+Y05Nakl4TVRFMk1UTXlPRFU1V2hjTk1qY3hNVEUxTVRNeU9EVTVXakNCMERFTE1Ba0dBMVVFQmhN
+Q1FrVXhFVEFQJiMxMzsKQmdOVkJBZ1RDRUp5ZFhOelpXeHpNUkl3RUFZRFZRUUhFd2xXYVd4MmIy
+OXlaR1V4TXpBeEJnTlZCQW9US2tSbGJHOXBkSFJsSUVOdiYjMTM7CmJuTjFiSFJwYm1jZ1lXNWtJ
+RUZrZG1semIzSjVJRU5XUWtFdlUwTlNUREUrTUR3R0ExVUVBeE0xU1VOQlRrNGdWRTFEU0NCQmRY
+Um8mIzEzOwpiM0pwZW1Wa0lGUnlZV1JsYldGeWF5QlFhV3h2ZENCV1lXeHBaR0YwYjNJZ1ZtRnNh
+V1F4SlRBakJna3Foa2lHOXcwQkNRRVdGbUpsJiMxMzsKZEcxamFITnRaRUJrWld4dmFYUjBaUzVq
+YjIwd2dnSWlNQTBHQ1NxR1NJYjNEUUVCQVFVQUE0SUNEd0F3Z2dJS0FvSUNBUUM2Rkp3eiYjMTM7
+CktxUVZYNmZHMy9FTFJTR1dWOUdyS2FGTUttaFdJeGVwd1JaTjZNeE1xa2Q1RG5ZZmlUK1dwOThq
+RWtxZ1R4MlVNYjlxdWdjR05WNmcmIzEzOwozNS9DclFiL0YvbXozQzRzZkxOdURwU3FLOVFGOCtw
+YVRINmhRbXJPcHFWK1VUdmRqOVNNZ0tHeUZpelM4OENEV014NHczaTRGQUtlJiMxMzsKNk5Sc0pS
+R1RBdEtEdU1IY0E0c2owOEdqZTNsUFdjZ0Z2Y1FORFZlRUJUdU9IQkcrUmhqN1YxSmlOR1AvNGVw
+VFhURlhnUEZEZ2V6MyYjMTM7CllBZnhxcGJ1TzRUWDZiYllkazJudk1MRnZMRU5rQ0ZZdWxuWVB6
+Z25FQkdTTUtJYUFJbGIrc2NIQ3ZXZ1dqMlRMZ3doMkdKTmN6Vk0mIzEzOwoxTFBNcUdTK1VraTlN
+aDc5ODIyL3hvYXI0OTh4RHgyWXgvOHN3Z0VOTFNnQ3NRQVc4bk1nd1duNkFiWWwyUkFCWHVyYXlG
+c240UDFSJiMxMzsKdVFObVVwL3FyUktSdlNKcjFPTGtIWmZGVGNTWVFhVml1TVlQWHpHejh0bU1M
+bG1JL0I2QUNINEF3Uk1kbll2Rk8zS0kxUkJuUEtJZCYjMTM7Cnd3ZlVwWjVJVElwYkE3Q0dnVHgx
+cXh0TTF3SVVyN3BIZUtQNmpWZTNrZERMZysvQloyeE1FdEJrNWE4WTdCNHYzeHdIWEdUdlY4bU4m
+IzEzOwowQWcvU3lUL1FVeUVSaFhVeUFOMitFd1orU1FDVXlOZnppb1dRODc4ZUd5a1UrNDYrQmJn
+STNJSXIzNlhLUHdtenQwU1orS0kzdG5GJiMxMzsKVGxuOW1YMEtDMGlkb2o1eWt6UG9DL01JZWQw
+c3A0VGlneEViV054N0VGODBQdlIvRERFd1ZQRUVra2p5NjNYRnVseGlDUUlEQVFBQiYjMTM7Cm80
+SUJnakNDQVg0d0RBWURWUjBUQVFIL0JBSXdBREFPQmdOVkhROEJBZjhFQkFNQ0I0QXdIUVlEVlIw
+T0JCWUVGSG45czBERWEya3YmIzEzOwpnRS9lSU9Uc3FvVzg1TVhGTUlHNkJnTlZIU01FZ2JJd2dh
+K0FGRWQ3VDY1NlVaRzEwYitkTnVtR2Z6WVdCS2xGb1lHQXBINHdmREVMJiMxMzsKTUFrR0ExVUVC
+aE1DVlZNeFBEQTZCZ05WQkFvTU0wbHVkR1Z5Ym1WMElFTnZjbkJ2Y21GMGFXOXVJR1p2Y2lCQmMz
+TnBaMjVsWkNCTyYjMTM7CllXMWxjeUJoYm1RZ1RuVnRZbVZ5Y3pFdk1DMEdBMVVFQXd3bVNVTkJU
+azRnVkhKaFpHVnRZWEpySUVOc1pXRnlhVzVuYUc5MWMyVWcmIzEzOwpVR2xzYjNRZ1EwR0NGSHBx
+YlRGZUpjUHRVQzlYdXVQS1BzTHdEUitNTURRR0ExVWRId1F0TUNzd0thQW5vQ1dHSTJoMGRIQTZM
+eTlqJiMxMzsKY213dWFXTmhibTR1YjNKbkwzUnRZMmhmY0dsc2IzUXVZM0pzTUV3R0ExVWRJQVJG
+TUVNd0VBWU9Ld1lCQkFHQ3lSc0JCWU03REFvdyYjMTM7Ckx3WUlLd1lCQlFVSEFnRXdJekFoQmdn
+ckJnRUZCUWNDQVJZVmFIUjBjSE02THk5amNITXVhV05oYm00dWIzSm5NQTBHQ1NxR1NJYjMmIzEz
+OwpEUUVCRFFVQUE0SUNBUUJkU2F0NTZ1ZWpMbkFqRklGOTVkallXSTZzLy9ONllYeHNyck1rR0JQ
+OEVlelB5aExoNmF3UDR6N1E5UUFJJiMxMzsKUVprWW94cmwvMXkwK2J5VjJxblRVVUNMUnBLL0JE
+cC9oY2Z3UGZLQ0EvMlJRQ0hKcmI2K3owZW5EUEZSSzBOS213T2NkbEd0VWswbSYjMTM7ClBnV0dT
+S3R1d1ZzUEFoVERKdWhvc1pPaGtOZituU09PSHJRT24xRTJyek9yZC9rUWxxaUN3Ukg5Nzk2TnBU
+QStIU01mT29iSkVFUHEmIzEzOwp0cEY3UDVxYnd0bDk1VWE1T3A0QWhhNzBISGZVRlM0Qk9RS0xC
+VmZNWmRPUitpUG9oNU93QUsraHRZa0ZDRzlQMldIdTd3ZjhFQytXJiMxMzsKN2s5Nmd2VGQ4eEU3
+b3VvYWJUMng2WWZZcUVsUEhpVS9JTTlnVnpXV0wvc3ZZRHlTVnVvRndCakROTjFjZHEwcU9ZUjF5
+dVMxYy85RCYjMTM7CkZSN2VvN0dGRUN5K1RCZDdJaUtSZkJWZVlHT09QTW5vRmZ4UkxXcnBzV05u
+d0Q3bGtQa0xDZ0ZDays4eUVjT1JnNjI1bW82NXo0eTYmIzEzOwpKNEs4Zm9kYTdxd21YTlAzUlMx
+OG9uNkJIdDhsUStiWGdPSG14SUhrMGFPMHFORHFndkxyMkZseUxHSkdpRU1ScURNTVI2L2EwNmJ0
+JiMxMzsKa25VTUhsN0NxTWZqSWtqUDRWTk55R1BkSmd3Vmsya2ViOXVORnZKQ3hUK00yZkdYUTFO
+YkpOZnR2NU1nU3NwOU4xeSt4NmdBM0VodyYjMTM7CnlIbG1KQjRZTXRvOHRUVjFpODR4UFh4aTJD
+QWVEYUdEdXdvc3Q4WVVDU2pxN1JDSzh0R2NhQVlya1hRWTJ5UWZYM2N3RHNFeFJxVlcmIzEzOwp5
+cmp5UnQrTjZtSzk5UT09PC9kczpYNTA5Q2VydGlmaWNhdGU+PC9kczpYNTA5RGF0YT48L2RzOktl
+eUluZm8+PC9kczpTaWduYXR1cmU+PC9zbWQ6c2lnbmVkTWFyaz4K
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/RevokedCert/TMVRevoked-Trademark-Agent-Arab-Active.smd b/core/src/test/resources/google/registry/tmch/idn/RevokedCert/TMVRevoked-Trademark-Agent-Arab-Active.smd
new file mode 100644
index 000000000..d3a5fb938
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/RevokedCert/TMVRevoked-Trademark-Agent-Arab-Active.smd
@@ -0,0 +1,122 @@
+Marks: الاختبار & لتقييم
+smdID: 000000771669081349443-65535
+U-labels: xn------nzeaagpf7azb2ppajr3fa, xn-----btdaafne4a7azpoaiq8ea, xn----ymcaaeld1a4a6onahp3ea, xn--mgbaadjcy1a8mmago8da
+notBefore: 2022-11-22T01:42:29.443Z
+notAfter: 2027-10-18T14:27:18.209Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il8wZWY3
+YzU5Yy04NWY0LTQ0ZDAtOWZhZi0zN2FlZTdkY2Q3OGYiPjxzbWQ6aWQ+MDAwMDAwNzcxNjY5MDgx
+MzQ5NDQzLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMTo0MjoyOS40NDNaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0xOFQxNDoyNzoxOC4yMDlaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
+cmFkZW1hcms+PG1hcms6aWQ+MDAwMTQ0MTUwMzA2NjE5NTE1MDMwNjYxOTUtMTwvbWFyazppZD48
+bWFyazptYXJrTmFtZT7Yp9mE2KfYrtiq2KjYp9ixICZhbXA7INmE2KrZgtmK2YrZhTwvbWFyazpt
+YXJrTmFtZT48bWFyazpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpuYW1lPtmF2YfZ
+htiv2LMg2KfZhNmF2LnZhNmI2YXYp9iq2YrYqTwvbWFyazpuYW1lPjxtYXJrOmFkZHI+PG1hcms6
+c3RyZWV0Ptis2LnZgdixINin2KjZhiDYs9mK2YbYp9ihIDc1PC9tYXJrOnN0cmVldD48bWFyazpj
+aXR5PtmF2YPZhtin2LM8L21hcms6Y2l0eT48bWFyazpwYz4yOTAwPC9tYXJrOnBjPjxtYXJrOmNj
+Pk1BPC9tYXJrOmNjPjwvbWFyazphZGRyPjwvbWFyazpob2xkZXI+PG1hcms6Y29udGFjdCB0eXBl
+PSJhZ2VudCI+PG1hcms6bmFtZT7ZhdmH2YbYr9izINin2YTZhdi52YTZiNmF2KfYqtmK2Kk8L21h
+cms6bmFtZT48bWFyazpvcmc+2YjZg9in2YTYqTwvbWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpz
+dHJlZXQ+2LTYp9ix2Lkg2KzYudmB2LEg2KfYqNmGINiz2YrZhtin2KEgNzU8L21hcms6c3RyZWV0
+PjxtYXJrOmNpdHk+2YXZg9mG2KfYszwvbWFyazpjaXR5PjxtYXJrOnBjPjI5MDA8L21hcms6cGM+
+PG1hcms6Y2M+TUE8L21hcms6Y2M+PC9tYXJrOmFkZHI+PG1hcms6dm9pY2U+KzIxMi41MjI1Mzkw
+NDA8L21hcms6dm9pY2U+PG1hcms6ZmF4PisyMTIuNTIyNTM5MDQxPC9tYXJrOmZheD48bWFyazpl
+bWFpbD50ZXN0dG1jaCtpZG5AZ21haWwuY29tPC9tYXJrOmVtYWlsPjwvbWFyazpjb250YWN0Pjxt
+YXJrOmp1cmlzZGljdGlvbj5VUzwvbWFyazpqdXJpc2RpY3Rpb24+PG1hcms6Y2xhc3M+MTU8L21h
+cms6Y2xhc3M+PG1hcms6bGFiZWw+eG4tLS0tLS1uemVhYWdwZjdhemIycHBhanIzZmE8L21hcms6
+bGFiZWw+PG1hcms6bGFiZWw+eG4tLS0tLWJ0ZGFhZm5lNGE3YXpwb2FpcThlYTwvbWFyazpsYWJl
+bD48bWFyazpsYWJlbD54bi0tLS15bWNhYWVsZDFhNGE2b25haHAzZWE8L21hcms6bGFiZWw+PG1h
+cms6bGFiZWw+eG4tLW1nYmFhZGpjeTFhOG1tYWdvOGRhPC9tYXJrOmxhYmVsPjxtYXJrOmdvb2Rz
+QW5kU2VydmljZXM+2LrZitiq2KfYsTwvbWFyazpnb29kc0FuZFNlcnZpY2VzPjxtYXJrOnJlZ051
+bT4xMjM0PC9tYXJrOnJlZ051bT48bWFyazpyZWdEYXRlPjIwMTMtMDEtMDFUMDA6MDA6MDAuMDAw
+WjwvbWFyazpyZWdEYXRlPjwvbWFyazp0cmFkZW1hcms+PC9tYXJrOm1hcms+PGRzOlNpZ25hdHVy
+ZSB4bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyIgSWQ9Il85YTM5
+ZjgyNC1kMTdkLTQwOTgtOWYxZS1mNTNlMzg3NTdjZjIiPjxkczpTaWduZWRJbmZvPjxkczpDYW5v
+bmljYWxpemF0aW9uTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94
+bWwtZXhjLWMxNG4jIi8+PGRzOlNpZ25hdHVyZU1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cu
+dzMub3JnLzIwMDEvMDQveG1sZHNpZy1tb3JlI3JzYS1zaGEyNTYiLz48ZHM6UmVmZXJlbmNlIFVS
+ST0iI18wZWY3YzU5Yy04NWY0LTQ0ZDAtOWZhZi0zN2FlZTdkY2Q3OGYiPjxkczpUcmFuc2Zvcm1z
+PjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRz
+aWcjZW52ZWxvcGVkLXNpZ25hdHVyZSIvPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8v
+d3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRp
+Z2VzdE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3No
+YTI1NiIvPjxkczpEaWdlc3RWYWx1ZT5DSHY3aTJwNVkrMmZ5VlRJd0lvVE5VTHVtVlhSd2hYUDBO
+VVRkWUt5aXhrPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PGRzOlJlZmVyZW5jZSBV
+Ukk9IiNfYTA0NWRkNzgtMTZkZC00MDhjLWEwZDctYzE0MzkyZmZhMmJmIj48ZHM6VHJhbnNmb3Jt
+cz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwt
+ZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJo
+dHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+
+SzBMN2JkMmVLcExDZjUyWXpRRlpBdUV3K3ljbVpkZHg3QW9kSmViR21Hcz08L2RzOkRpZ2VzdFZh
+bHVlPjwvZHM6UmVmZXJlbmNlPjwvZHM6U2lnbmVkSW5mbz48ZHM6U2lnbmF0dXJlVmFsdWUgSWQ9
+Il8zODhiNTBhMS1lMzFhLTQ5YTUtYThkNS04Zjk2Y2QwMDMyNTMiPmlzL0hHajRJWEpyTThCaTQ2
+ZjFEbDc2cm54c2t1ZUFnTGNFOTlRSUZtZEFGNGR0QUNzSHY0NlJxbkFURldYeFNXQldERnhZbzVa
+eXAmIzEzOwp1WFE3Ym95aEh3UzBvOUJqa2p2cFBSMVQ2UDUySEtHR3A3b25nOGtlcnpOM1h6N21j
+bTRiOW9GMkJuazN6UTQ5S0ZTL3NtQThZNktpJiMxMzsKZUszT2ZFcEFHbDVQL3NySHM1M29iMnlh
+WHhtTUJacVJUWUdrZjRzNzhwWWVtY2d0OWdKdm9oY25ld3RtZzhrUnpvTzl3YXU1UHQ0eCYjMTM7
+Ci9SanhlbEp3dzhGTHl6aS9EUWFNRkY4eUhKRk52M3hSS2gyU0tYNzhYTWRzajVzQktkMUtjWlA4
+MEJsN21uMGROTkxNZE1Bcml2QU0mIzEzOwo1RUNhbmVpNjZ0VVJ2aXdSdUExdHpJMGh0SG9yM2Fv
+L0F2WGV1L0wvQnhIQU5Md1VYNWxZQm15MEQzYlRGcm9uSk11MFNHdVRubzZGJiMxMzsKc1dkTHFo
+VFJPazJuUk93OHdSMGhnWjg4SDNMZVdadE1ab053d3l5bk83UnV3U2tLZEh4U0RZcjZBM3NoOExz
+WExNMU81N3NMaElBTSYjMTM7ClY5RzNMK3pNVjJwUzRDZlk4SnNxNnRtZWkwclNNZTRiYURsRlhU
+VVh3MFF2L1R3S0xPRnRNRGtreFh5cEZKWVlxM2Q1VElreE5xcC8mIzEzOwpZL1JRRGY0NjVWSU9t
+eXRLMWpFemZwdnZFR3VDS2p1VTUyd0NObWlRRU1zcnFmNHNKRUZQTGx0N0d6dll1T3JKYTRmay96
+TDJUYXZ4JiMxMzsKdmRrNGVDenJKaXBGaENkMk5qeHgzTjNyV045MWdKcndHZVE5cTVVM3pELzRv
+aEVXekx0M1BQam1zTjJFUDE4NVhTNE1lMERnMkZ3PTwvZHM6U2lnbmF0dXJlVmFsdWU+PGRzOktl
+eUluZm8gSWQ9Il9hMDQ1ZGQ3OC0xNmRkLTQwOGMtYTBkNy1jMTQzOTJmZmEyYmYiPjxkczpYNTA5
+RGF0YT48ZHM6WDUwOUNlcnRpZmljYXRlPk1JSUhZVENDQlVtZ0F3SUJBZ0lVSE9NN29FcGxWMDZU
+WklnWlRpMFJVa3VxZ1o0d0RRWUpLb1pJaHZjTkFRRU5CUUF3ZkRFTE1Ba0cmIzEzOwpBMVVFQmhN
+Q1ZWTXhQREE2QmdOVkJBb01NMGx1ZEdWeWJtVjBJRU52Y25CdmNtRjBhVzl1SUdadmNpQkJjM05w
+WjI1bFpDQk9ZVzFsJiMxMzsKY3lCaGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF3d21TVU5CVGs0
+Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5YVc1bmFHOTFjMlVnVUdscyYjMTM7CmIzUWdRMEV3SGhjTk1q
+SXhNVEUyTVRNek1ESXpXaGNOTWpjeE1URTFNVE16TURJeldqQ0IwakVMTUFrR0ExVUVCaE1DUWtV
+eEVUQVAmIzEzOwpCZ05WQkFnVENFSnlkWE56Wld4ek1SSXdFQVlEVlFRSEV3bFdhV3gyYjI5eVpH
+VXhNekF4QmdOVkJBb1RLa1JsYkc5cGRIUmxJRU52JiMxMzsKYm5OMWJIUnBibWNnWVc1a0lFRmtk
+bWx6YjNKNUlFTldRa0V2VTBOU1RERkFNRDRHQTFVRUF4TTNTVU5CVGs0Z1ZFMURTQ0JCZFhSbyYj
+MTM7CmIzSnBlbVZrSUZSeVlXUmxiV0Z5YXlCUWFXeHZkQ0JXWVd4cFpHRjBiM0lnVW1WMmIydGxa
+REVsTUNNR0NTcUdTSWIzRFFFSkFSWVcmIzEzOwpZbVYwYldOb2MyMWtRR1JsYkc5cGRIUmxMbU52
+YlRDQ0FpSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnSVBBRENDQWdvQ2dnSUJBUHpEJiMxMzsKejVP
+WnppVWxnSkNsRThZTDdIU1hKUVQ0YWFaejFBbUVvLysrYlp5MGc3MUFCbkdFUldick9UMklkbS81
+NkhUL1F3VXFXSjBUa0JaYiYjMTM7CmlxQmlpRDVyNEVaeXk5Z3plT0xpb2o1ajRrRTJFMHdZUFhW
+QU13amVrT0U4MGdvOVhOd0JHMDllQVdXOUNteGNmdzM5eXExbS9IRFgmIzEzOwp3ZDVwN1diUWUx
+UHBTc09Pa0hvb05CU1MwSWhGZlpnR2Y2eG9DOUZ1VjFic29lUStXMUhueUUzeXFSZ1J4N3dUSHpO
+c0hrdHI0MmNNJiMxMzsKcWE5L2lEV1ZYQjNXRHY5eE9uRkkxTlY0Y2phWERNSnJrUGVtT2s0UzFL
+SVIyOWNyOTgvSk1hWVZyd0tqeWc4T2QrNEZLbjJ3UERMRiYjMTM7CjUrNWg2azZBbHRvS2RnUU5M
+Wk5qSnR6R3dqMWRjZGl6YnFncXZHNGExdjFLWG5qZDJzL2ZZUkpOdVQ0cFNMY3I1cFpHaFprbVNh
+dDUmIzEzOwp1WlFieVdpUTFMRVR3bEhKY3RmdXJ3ME8xTGZhdTVHM1FaTksxbkQ1aFBXYStBWVVV
+MWc3S0dscVl5a2dCU0NGZ042eHV6L1BjcE9BJiMxMzsKKzdCWUFZdXFDa1lVTGZrTEFwVkxYTTlT
+Tml2UzlaeVZrMVhHWjNRdyt2ZGYwcmQrMTFHZWxHUnFkWHdub0YxU1N1eDhNUmFWRVJpUiYjMTM7
+ClQ3Qjc1TFp2T1U1SWJORUtIR3l5c2FzUDdXVk1DMnpQUnBBR0NNMys4cmZ1NUF3ZGFwU2RtZ0dW
+YTQvN2VubE91aTJVdnllNWNQT3AmIzEzOwpLRkRNdFlkL2hmQ2cydy8xV25UOUUvelhNZWNnVlh2
+cUVLaTZZai9lWFdTOWhvWUNDUG1uSFprSkVIZnhkbFEybE5YN3FnUG5BZ01CJiMxMzsKQUFHamdn
+R0NNSUlCZmpBTUJnTlZIUk1CQWY4RUFqQUFNQTRHQTFVZER3RUIvd1FFQXdJSGdEQWRCZ05WSFE0
+RUZnUVUyUStOdGJ5TSYjMTM7ClllZjBzbGZsbTFvOWdveDZpckV3Z2JvR0ExVWRJd1NCc2pDQnI0
+QVVSM3RQcm5wUmtiWFJ2NTAyNllaL05oWUVxVVdoZ1lDa2ZqQjgmIzEzOwpNUXN3Q1FZRFZRUUdF
+d0pWVXpFOE1Eb0dBMVVFQ2d3elNXNTBaWEp1WlhRZ1EyOXljRzl5WVhScGIyNGdabTl5SUVGemMy
+bG5ibVZrJiMxMzsKSUU1aGJXVnpJR0Z1WkNCT2RXMWlaWEp6TVM4d0xRWURWUVFERENaSlEwRk9U
+aUJVY21Ga1pXMWhjbXNnUTJ4bFlYSnBibWRvYjNWeiYjMTM7ClpTQlFhV3h2ZENCRFFZSVVlbXB0
+TVY0bHcrMVFMMWU2NDhvK3d2QU5INHd3TkFZRFZSMGZCQzB3S3pBcG9DZWdKWVlqYUhSMGNEb3Ym
+IzEzOwpMMk55YkM1cFkyRnViaTV2Y21jdmRHMWphRjl3YVd4dmRDNWpjbXd3VEFZRFZSMGdCRVV3
+UXpBUUJnNHJCZ0VFQVlMSkd3RUZnenNNJiMxMzsKQ2pBdkJnZ3JCZ0VGQlFjQ0FUQWpNQ0VHQ0Nz
+R0FRVUZCd0lCRmhWb2RIUndjem92TDJOd2N5NXBZMkZ1Ymk1dmNtY3dEUVlKS29aSSYjMTM7Cmh2
+Y05BUUVOQlFBRGdnSUJBSVQyL0ZnYXNnQ2lDU3hPQyt1ejJDMmt6RkVmRGI2RS9IODk4dXIzbWNh
+U0kyUGFvY0tBMEl3Ryt0aW4mIzEzOwpHQmFCK2xxTzF6a3lXdU5ldHVjaU9pTVBnWlo3Mm40QkJh
+OEh2K2N3dWRwYldiQS9WWkpaY0dhQ3g0QVhWSTVMbzJiUDlEVXlieDd4JiMxMzsKTTJ6MGxwbjUy
+R2FQTnRzcmF1MDBiRGJrb2VadmdMWUEvQktDdTRjZ2RDRW1JRzgzclBldDZnZHZaaG1NUWdYK1or
+WXNxYlJDd1RPLyYjMTM7CmxYdkc4WjVTMWdKS09pVi9PMkw3elhEblBKeEFQNVFrL3poUC9DUndD
+d1JEUXZ4b0ZFUDZtZ0w2SW8wck0vUjVBbnh5OVNlUjVkK2smIzEzOwo0TE5DV1BTNC9JNmFLL2JM
+NDIrTnFkcjJEUXJEZ1pYZDlPdTNTZno2OUFGajFsbnlwYUxjcWFRSVZwc1FPWndOZlA3SVF0VGpl
+QkkrJiMxMzsKSHlUeDBvRHpqRDBtcVdUbUVHVDYwRnRnMm1oS1pIanRaN1crdHJudWhvbWlEc0xR
+K2IxMEVBclpYcTVDOHNPS3ZPZUhxKzFEZHdiTCYjMTM7CkcxcGYzZ01hY2t6dXUxMU96QzFwaTR4
+OXA5VUZzZUsxY0JMcTRwOWVHdlpwN0tPMHlRbFdwbzJyUnVpK3NEdHRraFJaRXdYQ0lMMTkmIzEz
+OwpTMi9rS0t2NFF2YzkwamdaSE1XV1BaQ1EvdWpPemJLQWpueTQxcmxsRmlXL0xUbXBJNVJvYVg3
+WXR3emNuZzUwR1lPVGMyY1ZVc0RUJiMxMzsKcGZSb2dXK3R4YTc0RzRiUHdHb3BJaGt3YkxXRFY3
+VU16MVdNOWlnVEo2b0xFSEF2cE9wNTE4WDduNXRyUlpFeTh0T2RDdC9LczlmVyYjMTM7ClUxQWw4
+MXNvUXdwUDNqdTc8L2RzOlg1MDlDZXJ0aWZpY2F0ZT48L2RzOlg1MDlEYXRhPjwvZHM6S2V5SW5m
+bz48L2RzOlNpZ25hdHVyZT48L3NtZDpzaWduZWRNYXJrPgo=
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/RevokedCert/TMVRevoked-Trademark-Agent-Chinese-Active.smd b/core/src/test/resources/google/registry/tmch/idn/RevokedCert/TMVRevoked-Trademark-Agent-Chinese-Active.smd
new file mode 100644
index 000000000..5cacb5dcb
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/RevokedCert/TMVRevoked-Trademark-Agent-Chinese-Active.smd
@@ -0,0 +1,120 @@
+Marks: 审判&错误
+smdID: 000000801669081285959-65535
+U-labels: xn----ke8al50aln4ceuj, xn--and-ui2eu74b9t4egon, xn--et-pg5cw37ax04dfrl, xn--fcr14u8t4bdxh
+notBefore: 2022-11-22T01:41:25.959Z
+notAfter: 2027-10-18T14:36:50.931Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il83ZWZh
+MTE0YS1lODg5LTQxYWEtYWJjNy1iNzMwNDYzZjU2ZmUiPjxzbWQ6aWQ+MDAwMDAwODAxNjY5MDgx
+Mjg1OTU5LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMTo0MToyNS45NTlaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0xOFQxNDozNjo1MC45MzFaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
+cmFkZW1hcms+PG1hcms6aWQ+MDAwMTQ2MTUwMzA2Njc5NTE1MDMwNjY3OTUtMTwvbWFyazppZD48
+bWFyazptYXJrTmFtZT7lrqHliKQmYW1wO+mUmeivrzwvbWFyazptYXJrTmFtZT48bWFyazpob2xk
+ZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpvcmc+5bel56iL5aSEPC9tYXJrOm9yZz48bWFy
+azphZGRyPjxtYXJrOnN0cmVldD7pppnmuK/kuJzot6825Y+377yMNeWPt+alvO+8jDjlj7flrqQ8
+L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+6Z2S5bKb5biCPC9tYXJrOmNpdHk+PG1hcms6cGM+MzUw
+MDwvbWFyazpwYz48bWFyazpjYz5DTjwvbWFyazpjYz48L21hcms6YWRkcj48L21hcms6aG9sZGVy
+PjxtYXJrOmNvbnRhY3QgdHlwZT0iYWdlbnQiPjxtYXJrOm5hbWU+5p2O5bCP5pa5PC9tYXJrOm5h
+bWU+PG1hcms6b3JnPuW3peeoi+WkhDwvbWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpzdHJlZXQ+
+6aaZ5riv5Lic6LevNuWPt++8jDXlj7fmpbzvvIw45Y+35a6kPC9tYXJrOnN0cmVldD48bWFyazpj
+aXR5PumdkuWym+W4gjwvbWFyazpjaXR5PjxtYXJrOnBjPjM1MDA8L21hcms6cGM+PG1hcms6Y2M+
+Q048L21hcms6Y2M+PC9tYXJrOmFkZHI+PG1hcms6dm9pY2U+Kzg2LjEwODQ2NTcxNzM8L21hcms6
+dm9pY2U+PG1hcms6ZmF4Pis4Ni4xMDg0NjU3MTc1PC9tYXJrOmZheD48bWFyazplbWFpbD5pbmZv
+QGNoaW5lc2UtYWdlbmN5LmNvbTwvbWFyazplbWFpbD48L21hcms6Y29udGFjdD48bWFyazpqdXJp
+c2RpY3Rpb24+VVM8L21hcms6anVyaXNkaWN0aW9uPjxtYXJrOmNsYXNzPjE1PC9tYXJrOmNsYXNz
+PjxtYXJrOmxhYmVsPnhuLS0tLWtlOGFsNTBhbG40Y2V1ajwvbWFyazpsYWJlbD48bWFyazpsYWJl
+bD54bi0tYW5kLXVpMmV1NzRiOXQ0ZWdvbjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tZXQt
+cGc1Y3czN2F4MDRkZnJsPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1mY3IxNHU4dDRiZHho
+PC9tYXJrOmxhYmVsPjxtYXJrOmdvb2RzQW5kU2VydmljZXM+5ZCJ5LuWPC9tYXJrOmdvb2RzQW5k
+U2VydmljZXM+PG1hcms6cmVnTnVtPjEyMzQ8L21hcms6cmVnTnVtPjxtYXJrOnJlZ0RhdGU+MjAx
+My0wMS0wMVQwMDowMDowMC4wMDBaPC9tYXJrOnJlZ0RhdGU+PC9tYXJrOnRyYWRlbWFyaz48L21h
+cms6bWFyaz48ZHM6U2lnbmF0dXJlIHhtbG5zOmRzPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5
+L3htbGRzaWcjIiBJZD0iXzQ5NTgwOGM4LWM3NGEtNDE1YS04ZDk1LWJmMTk5YWUxNzI1ZiI+PGRz
+OlNpZ25lZEluZm8+PGRzOkNhbm9uaWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGhtPSJodHRwOi8v
+d3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJlTWV0aG9kIEFs
+Z29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxkc2lnLW1vcmUjcnNhLXNoYTI1
+NiIvPjxkczpSZWZlcmVuY2UgVVJJPSIjXzdlZmExMTRhLWU4ODktNDFhYS1hYmM3LWI3MzA0NjNm
+NTZmZSI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cu
+dzMub3JnLzIwMDAvMDkveG1sZHNpZyNlbnZlbG9wZWQtc2lnbmF0dXJlIi8+PGRzOlRyYW5zZm9y
+bSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwv
+ZHM6VHJhbnNmb3Jtcz48ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5v
+cmcvMjAwMS8wNC94bWxlbmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPlJPa1lMOFBwOVZHb1hB
+UTJJYU04cUcyNWVvSkZRM1JIeDc2VmkvdWhKbTQ9PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVy
+ZW5jZT48ZHM6UmVmZXJlbmNlIFVSST0iI18xMjEzOTc5NC0wYjBjLTQ0NDEtYWRkZS1mYzhkNmRk
+MThmM2YiPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3
+LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2Vz
+dE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1
+NiIvPjxkczpEaWdlc3RWYWx1ZT56T0V1NUx0SXdMd3g3YVhOOTQvbXZpYm9uazlEdTgrMEdMbFk4
+cDE2RHpzPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PC9kczpTaWduZWRJbmZvPjxk
+czpTaWduYXR1cmVWYWx1ZSBJZD0iXzY1ZGMzYTk5LWZjODMtNDFmNi05M2Q5LTFjOTRhMTEyMjNj
+MCI+Vm5GOHJIN1N4dU82blB5U25UTC9ld1BSV3VxUlR3Vnh0UG9IWFNIdHF5U1ZKT2ZHUDFtOHd1
+UXpJLzA3N1hhQStCdWlyYlJrcnUySyYjMTM7CnYrQjdFZEI4Sm5EaVpsbXd6MU4zZU5RaURjZzha
+cGpDMHFGVldzKzRnSDB5QUJkVkJQTlp2VitQc2I3QXR6a21hb0ROYi9iMXkyT0kmIzEzOwpFZFNK
+anhKYUN6MFhHWWdRblZBVVR5ZTJ6MEt0a0srZHAxVlhkRFd0MHVQTWkwNGNhN2sxR21PK2RwSE1U
+RzZacFBJRDRtcmtRR21MJiMxMzsKTC8vOWU5OHJxRFRIMDBRWjhLOForeG1qVnpUODcwYzJCbnhL
+WXpZRGNxaDhtcUcwYS9valN0d1YrUkxMMzBKQmtkQzlaU3hneFdRayYjMTM7CjY5V2JqM1RTUG9R
+ZjkwUlUxQ1JYYWRyZUpzM2xSdnpkcEhaR3VuMG9oUisvUE9jTW9tTlY3STRndGV3Q3RpdUlxbkM5
+OHp2U3VZUXEmIzEzOwpIT1dsZjN0RGVJczh2T0dSMHVJZGkyVGFzbktVemwyamJkNDhERnZnOHlo
+MXFPNUJiNGJxYTUwT0Z6NmlSMGc4M0lZWXh5K2pHY3VYJiMxMzsKdmhXOXVWOEZ4QVI3d29aMTZy
+MkRTQ0RDQnZkTEU0NlMvRlNNNUdxVVpmOEk1Y296Z0JkS1RHenEzR280bExPcDlmeC9sM0RNbTlJ
+NCYjMTM7CnRJYlp2YnVzUGdWQ0k2ZXp5MkVPalJwZm1oMDhGY1pFRXNtblBLeW5MeGFwK1B6N2k5
+NTRtWG53VHBlR1ZRaDhYNlpKSUVEUVg1YmQmIzEzOwpDM2JxYkhNKzJNcGc1TWx5S1BlakYvdGlU
+c1FCZkkveFVVSm1vMHNDZWtlRDc3Wk9aYlVlSno0RmlVQm9GL3hNSzhCbVRCeHZJNWc9PC9kczpT
+aWduYXR1cmVWYWx1ZT48ZHM6S2V5SW5mbyBJZD0iXzEyMTM5Nzk0LTBiMGMtNDQ0MS1hZGRlLWZj
+OGQ2ZGQxOGYzZiI+PGRzOlg1MDlEYXRhPjxkczpYNTA5Q2VydGlmaWNhdGU+TUlJSFlUQ0NCVW1n
+QXdJQkFnSVVIT003b0VwbFYwNlRaSWdaVGkwUlVrdXFnWjR3RFFZSktvWklodmNOQVFFTkJRQXdm
+REVMTUFrRyYjMTM7CkExVUVCaE1DVlZNeFBEQTZCZ05WQkFvTU0wbHVkR1Z5Ym1WMElFTnZjbkJ2
+Y21GMGFXOXVJR1p2Y2lCQmMzTnBaMjVsWkNCT1lXMWwmIzEzOwpjeUJoYm1RZ1RuVnRZbVZ5Y3pF
+dk1DMEdBMVVFQXd3bVNVTkJUazRnVkhKaFpHVnRZWEpySUVOc1pXRnlhVzVuYUc5MWMyVWdVR2xz
+JiMxMzsKYjNRZ1EwRXdIaGNOTWpJeE1URTJNVE16TURJeldoY05NamN4TVRFMU1UTXpNREl6V2pD
+QjBqRUxNQWtHQTFVRUJoTUNRa1V4RVRBUCYjMTM7CkJnTlZCQWdUQ0VKeWRYTnpaV3h6TVJJd0VB
+WURWUVFIRXdsV2FXeDJiMjl5WkdVeE16QXhCZ05WQkFvVEtrUmxiRzlwZEhSbElFTnYmIzEzOwpi
+bk4xYkhScGJtY2dZVzVrSUVGa2RtbHpiM0o1SUVOV1FrRXZVME5TVERGQU1ENEdBMVVFQXhNM1NV
+TkJUazRnVkUxRFNDQkJkWFJvJiMxMzsKYjNKcGVtVmtJRlJ5WVdSbGJXRnlheUJRYVd4dmRDQldZ
+V3hwWkdGMGIzSWdVbVYyYjJ0bFpERWxNQ01HQ1NxR1NJYjNEUUVKQVJZVyYjMTM7ClltVjBiV05v
+YzIxa1FHUmxiRzlwZEhSbExtTnZiVENDQWlJd0RRWUpLb1pJaHZjTkFRRUJCUUFEZ2dJUEFEQ0NB
+Z29DZ2dJQkFQekQmIzEzOwp6NU9aemlVbGdKQ2xFOFlMN0hTWEpRVDRhYVp6MUFtRW8vKytiWnkw
+ZzcxQUJuR0VSV2JyT1QySWRtLzU2SFQvUXdVcVdKMFRrQlpiJiMxMzsKaXFCaWlENXI0RVp5eTln
+emVPTGlvajVqNGtFMkUwd1lQWFZBTXdqZWtPRTgwZ285WE53QkcwOWVBV1c5Q214Y2Z3Mzl5cTFt
+L0hEWCYjMTM7CndkNXA3V2JRZTFQcFNzT09rSG9vTkJTUzBJaEZmWmdHZjZ4b0M5RnVWMWJzb2VR
+K1cxSG55RTN5cVJnUng3d1RIek5zSGt0cjQyY00mIzEzOwpxYTkvaURXVlhCM1dEdjl4T25GSTFO
+VjRjamFYRE1KcmtQZW1PazRTMUtJUjI5Y3I5OC9KTWFZVnJ3S2p5ZzhPZCs0RktuMndQRExGJiMx
+MzsKNSs1aDZrNkFsdG9LZGdRTkxaTmpKdHpHd2oxZGNkaXpicWdxdkc0YTF2MUtYbmpkMnMvZllS
+Sk51VDRwU0xjcjVwWkdoWmttU2F0NSYjMTM7CnVaUWJ5V2lRMUxFVHdsSEpjdGZ1cncwTzFMZmF1
+NUczUVpOSzFuRDVoUFdhK0FZVVUxZzdLR2xxWXlrZ0JTQ0ZnTjZ4dXovUGNwT0EmIzEzOworN0JZ
+QVl1cUNrWVVMZmtMQXBWTFhNOVNOaXZTOVp5VmsxWEdaM1F3K3ZkZjByZCsxMUdlbEdScWRYd25v
+RjFTU3V4OE1SYVZFUmlSJiMxMzsKVDdCNzVMWnZPVTVJYk5FS0hHeXlzYXNQN1dWTUMyelBScEFH
+Q00zKzhyZnU1QXdkYXBTZG1nR1ZhNC83ZW5sT3VpMlV2eWU1Y1BPcCYjMTM7CktGRE10WWQvaGZD
+ZzJ3LzFXblQ5RS96WE1lY2dWWHZxRUtpNllqL2VYV1M5aG9ZQ0NQbW5IWmtKRUhmeGRsUTJsTlg3
+cWdQbkFnTUImIzEzOwpBQUdqZ2dHQ01JSUJmakFNQmdOVkhSTUJBZjhFQWpBQU1BNEdBMVVkRHdF
+Qi93UUVBd0lIZ0RBZEJnTlZIUTRFRmdRVTJRK050YnlNJiMxMzsKWWVmMHNsZmxtMW85Z294Nmly
+RXdnYm9HQTFVZEl3U0JzakNCcjRBVVIzdFBybnBSa2JYUnY1MDI2WVovTmhZRXFVV2hnWUNrZmpC
+OCYjMTM7Ck1Rc3dDUVlEVlFRR0V3SlZVekU4TURvR0ExVUVDZ3d6U1c1MFpYSnVaWFFnUTI5eWNH
+OXlZWFJwYjI0Z1ptOXlJRUZ6YzJsbmJtVmsmIzEzOwpJRTVoYldWeklHRnVaQ0JPZFcxaVpYSnpN
+Uzh3TFFZRFZRUUREQ1pKUTBGT1RpQlVjbUZrWlcxaGNtc2dRMnhsWVhKcGJtZG9iM1Z6JiMxMzsK
+WlNCUWFXeHZkQ0JEUVlJVWVtcHRNVjRsdysxUUwxZTY0OG8rd3ZBTkg0d3dOQVlEVlIwZkJDMHdL
+ekFwb0NlZ0pZWWphSFIwY0RvdiYjMTM7CkwyTnliQzVwWTJGdWJpNXZjbWN2ZEcxamFGOXdhV3h2
+ZEM1amNtd3dUQVlEVlIwZ0JFVXdRekFRQmc0ckJnRUVBWUxKR3dFRmd6c00mIzEzOwpDakF2Qmdn
+ckJnRUZCUWNDQVRBak1DRUdDQ3NHQVFVRkJ3SUJGaFZvZEhSd2N6b3ZMMk53Y3k1cFkyRnViaTV2
+Y21jd0RRWUpLb1pJJiMxMzsKaHZjTkFRRU5CUUFEZ2dJQkFJVDIvRmdhc2dDaUNTeE9DK3V6MkMy
+a3pGRWZEYjZFL0g4OTh1cjNtY2FTSTJQYW9jS0EwSXdHK3RpbiYjMTM7CkdCYUIrbHFPMXpreVd1
+TmV0dWNpT2lNUGdaWjcybjRCQmE4SHYrY3d1ZHBiV2JBL1ZaSlpjR2FDeDRBWFZJNUxvMmJQOURV
+eWJ4N3gmIzEzOwpNMnowbHBuNTJHYVBOdHNyYXUwMGJEYmtvZVp2Z0xZQS9CS0N1NGNnZENFbUlH
+ODNyUGV0NmdkdlpobU1RZ1grWitZc3FiUkN3VE8vJiMxMzsKbFh2RzhaNVMxZ0pLT2lWL08yTDd6
+WERuUEp4QVA1UWsvemhQL0NSd0N3UkRRdnhvRkVQNm1nTDZJbzByTS9SNUFueHk5U2VSNWQrayYj
+MTM7CjRMTkNXUFM0L0k2YUsvYkw0MitOcWRyMkRRckRnWlhkOU91M1NmejY5QUZqMWxueXBhTGNx
+YVFJVnBzUU9ad05mUDdJUXRUamVCSSsmIzEzOwpIeVR4MG9EempEMG1xV1RtRUdUNjBGdGcybWhL
+WkhqdFo3Vyt0cm51aG9taURzTFErYjEwRUFyWlhxNUM4c09Ldk9lSHErMURkd2JMJiMxMzsKRzFw
+ZjNnTWFja3p1dTExT3pDMXBpNHg5cDlVRnNlSzFjQkxxNHA5ZUd2WnA3S08weVFsV3BvMnJSdWkr
+c0R0dGtoUlpFd1hDSUwxOSYjMTM7ClMyL2tLS3Y0UXZjOTBqZ1pITVdXUFpDUS91ak96YktBam55
+NDFybGxGaVcvTFRtcEk1Um9hWDdZdHd6Y25nNTBHWU9UYzJjVlVzRFQmIzEzOwpwZlJvZ1crdHhh
+NzRHNGJQd0dvcEloa3diTFdEVjdVTXoxV005aWdUSjZvTEVIQXZwT3A1MThYN241dHJSWkV5OHRP
+ZEN0L0tzOWZXJiMxMzsKVTFBbDgxc29Rd3BQM2p1NzwvZHM6WDUwOUNlcnRpZmljYXRlPjwvZHM6
+WDUwOURhdGE+PC9kczpLZXlJbmZvPjwvZHM6U2lnbmF0dXJlPjwvc21kOnNpZ25lZE1hcms+Cg==
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/RevokedCert/TMVRevoked-Trademark-Agent-English-Active.smd b/core/src/test/resources/google/registry/tmch/idn/RevokedCert/TMVRevoked-Trademark-Agent-English-Active.smd
new file mode 100644
index 000000000..386279bbb
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/RevokedCert/TMVRevoked-Trademark-Agent-English-Active.smd
@@ -0,0 +1,125 @@
+Marks: Test & Validate
+smdID: 000000871669081209053-65535
+U-labels: test---validate, test--validate, test-and-validate, test-andvalidate, test-validate, testand-validate, testandvalidate, testet-validate, testetvalidate, testvalidate
+notBefore: 2022-11-22T01:40:09.053Z
+notAfter: 2027-10-18T14:57:36.681Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il82NDgz
+ZGFiZS1jMjJhLTQ3ZjgtYjBmOS00YzFjM2VhNjk0NDIiPjxzbWQ6aWQ+MDAwMDAwODcxNjY5MDgx
+MjA5MDUzLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMTo0MDowOS4wNTNaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0xOFQxNDo1NzozNi42ODFaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
+cmFkZW1hcms+PG1hcms6aWQ+MDAwMTM3MTUwMzA2ODA0OTE1MDMwNjgwNDktMTwvbWFyazppZD48
+bWFyazptYXJrTmFtZT5UZXN0ICZhbXA7IFZhbGlkYXRlPC9tYXJrOm1hcmtOYW1lPjxtYXJrOmhv
+bGRlciBlbnRpdGxlbWVudD0ib3duZXIiPjxtYXJrOm5hbWU+VG9ueSBIb2xsYW5kPC9tYXJrOm5h
+bWU+PG1hcms6b3JnPkFnIGNvcnBvcmF0aW9uPC9tYXJrOm9yZz48bWFyazphZGRyPjxtYXJrOnN0
+cmVldD4xMzA1IEJyaWdodCBBdmVudWU8L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+QXJjYWRpYTwv
+bWFyazpjaXR5PjxtYXJrOnBjPjkwMDI4PC9tYXJrOnBjPjxtYXJrOmNjPlVTPC9tYXJrOmNjPjwv
+bWFyazphZGRyPjwvbWFyazpob2xkZXI+PG1hcms6Y29udGFjdCB0eXBlPSJhZ2VudCI+PG1hcms6
+bmFtZT5Ub255IEhvbGxhbmQ8L21hcms6bmFtZT48bWFyazpvcmc+QWcgY29ycG9yYXRpb248L21h
+cms6b3JnPjxtYXJrOmFkZHI+PG1hcms6c3RyZWV0PkJyaWdodCBBdmVudWUgMTMwNSA8L21hcms6
+c3RyZWV0PjxtYXJrOmNpdHk+QXJjYWRpYTwvbWFyazpjaXR5PjxtYXJrOnNwPkNBPC9tYXJrOnNw
+PjxtYXJrOnBjPjkwMDI4PC9tYXJrOnBjPjxtYXJrOmNjPlVTPC9tYXJrOmNjPjwvbWFyazphZGRy
+PjxtYXJrOnZvaWNlPisxLjIwMjU1NjIzMDI8L21hcms6dm9pY2U+PG1hcms6ZmF4PisxLjIwMjU1
+NjIzMDE8L21hcms6ZmF4PjxtYXJrOmVtYWlsPmluZm9AYWdjb3Jwb3JhdGlvbi5jb208L21hcms6
+ZW1haWw+PC9tYXJrOmNvbnRhY3Q+PG1hcms6anVyaXNkaWN0aW9uPlVTPC9tYXJrOmp1cmlzZGlj
+dGlvbj48bWFyazpjbGFzcz4xNTwvbWFyazpjbGFzcz48bWFyazpsYWJlbD50ZXN0LS0tdmFsaWRh
+dGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+dGVzdC0tdmFsaWRhdGU8L21hcms6bGFiZWw+PG1h
+cms6bGFiZWw+dGVzdC1hbmQtdmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+dGVzdC1h
+bmR2YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0LXZhbGlkYXRlPC9tYXJrOmxh
+YmVsPjxtYXJrOmxhYmVsPnRlc3RhbmQtdmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+
+dGVzdGFuZHZhbGlkYXRlPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnRlc3RldC12YWxpZGF0ZTwv
+bWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0ZXR2YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazps
+YWJlbD50ZXN0dmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6Z29vZHNBbmRTZXJ2aWNlcz5ndWl0
+YXI8L21hcms6Z29vZHNBbmRTZXJ2aWNlcz48bWFyazpyZWdOdW0+MTIzNDwvbWFyazpyZWdOdW0+
+PG1hcms6cmVnRGF0ZT4yMDEzLTAxLTAxVDAwOjAwOjAwLjAwMFo8L21hcms6cmVnRGF0ZT48L21h
+cms6dHJhZGVtYXJrPjwvbWFyazptYXJrPjxkczpTaWduYXR1cmUgeG1sbnM6ZHM9Imh0dHA6Ly93
+d3cudzMub3JnLzIwMDAvMDkveG1sZHNpZyMiIElkPSJfN2Y2NTNhN2MtYzU5Zi00NzRiLTlkMmQt
+NmUzMGFhOGU0MzkxIj48ZHM6U2lnbmVkSW5mbz48ZHM6Q2Fub25pY2FsaXphdGlvbk1ldGhvZCBB
+bGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjxkczpT
+aWduYXR1cmVNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGRz
+aWctbW9yZSNyc2Etc2hhMjU2Ii8+PGRzOlJlZmVyZW5jZSBVUkk9IiNfNjQ4M2RhYmUtYzIyYS00
+N2Y4LWIwZjktNGMxYzNlYTY5NDQyIj48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29y
+aXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1
+cmUiLz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94
+bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGht
+PSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFs
+dWU+UUNKOFJ5VUpKNDRLZTlyUlBPL0dNT1RoTmJ0bEpFSk5pTTlSMklENlhyUT08L2RzOkRpZ2Vz
+dFZhbHVlPjwvZHM6UmVmZXJlbmNlPjxkczpSZWZlcmVuY2UgVVJJPSIjXzU0NDAyODhlLWI2Yjkt
+NGJlOC1iOWI4LWZhMTNkMzZiMzM5ZCI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdv
+cml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJh
+bnNmb3Jtcz48ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAw
+MS8wNC94bWxlbmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPitMRGxBcjJjRWhwVHgwejRDQlU3
+U2RmeUcveUpJcVIySTdPMWg5SFpDVk09PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48
+L2RzOlNpZ25lZEluZm8+PGRzOlNpZ25hdHVyZVZhbHVlIElkPSJfMGFlOGMwNGQtYzRjNS00ZDAw
+LTkyN2UtMmQ4YmI2NTAwNDg5Ij5NSEM3OC9VOE9XVUduclp0amxvempDbEh4ZFRFVFBNcGtsalR5
+NXg2bEJPblplVjQxdXNxV0FyQVhWQ1U1L2UyYzNpY01vUXZHZkxEJiMxMzsKd3dVdVQyS1Z1elU5
+U0ZvakRZUWs2RTl0V2FGTitzc3IwbGIyYmNKa3oxQ3BLZjZHNk5YSWg2SlZYK3hBWE5nYkxxRGZ5
+TnVxaXp6SiYjMTM7CjlJa3ZMV0xnT3dSQ0QyUi8zYzVvdjZNbVV0ZTBFcnhFTUUyMTMvUzRXSmdl
+eUoxQ1AwMlRXdlVYOFMrazFpSDVHcFJxQ0lEdzVtOXImIzEzOwpoVmMrTUg5OURoZjk5ZDM4blMv
+cllTd2tqZHNGejJUSXNaSHNhZ2Q2S2NycTdBQ21weWJxN0lTamZwL0dnWjFUNlVFdmg2R2lZbWVi
+JiMxMzsKMkRaZXJxRGI5QjFBWmsxMjBnNFltejlYVFRyU2tzZlNMRTA5eG5JdCtQWk5WNmVvZ3pT
+NVFJVVVFaUxZenJQS1UrbzBUaStIbm1nTCYjMTM7CnRtVEcwdGZ5Z3ZvVUxkMU85RFovZy9ZSldj
+aHVHbmh3LzNjZkpGd0xmdEI5RkE5aURUUTVRbmoyeThWVVlUSjY1d3VuclNXL1kxOVcmIzEzOwpT
+dmdzUUJiYTNFampEaW80VWpnZVhyTGowWmJNQmc0bmNMeGZoQWdHdTBqM1ZNeHh6S2pYNzYxdVdC
+cHYyRUhBbHJBRlNxZG50bUVjJiMxMzsKcit4YUN2dm9pdm15VkdxamFySHp4U1grTy80TXVreTY1
+SzdsdlE0aTlRT3FBMWtrNTN4ckNiSUx2MUhtazVZNHJqQTJUMk4xaVBIayYjMTM7CkJZbXdMSlFk
+bGtNc0RBalgwdG5oeTVpN2owa3A1NU1PamJrN0Y4dnRkKzZSRWdzTFMrSXVId1hkL25ERVpiOXgv
+NTJ2bmIvemZEOD08L2RzOlNpZ25hdHVyZVZhbHVlPjxkczpLZXlJbmZvIElkPSJfNTQ0MDI4OGUt
+YjZiOS00YmU4LWI5YjgtZmExM2QzNmIzMzlkIj48ZHM6WDUwOURhdGE+PGRzOlg1MDlDZXJ0aWZp
+Y2F0ZT5NSUlIWVRDQ0JVbWdBd0lCQWdJVUhPTTdvRXBsVjA2VFpJZ1pUaTBSVWt1cWdaNHdEUVlK
+S29aSWh2Y05BUUVOQlFBd2ZERUxNQWtHJiMxMzsKQTFVRUJoTUNWVk14UERBNkJnTlZCQW9NTTBs
+dWRHVnlibVYwSUVOdmNuQnZjbUYwYVc5dUlHWnZjaUJCYzNOcFoyNWxaQ0JPWVcxbCYjMTM7CmN5
+QmhibVFnVG5WdFltVnljekV2TUMwR0ExVUVBd3dtU1VOQlRrNGdWSEpoWkdWdFlYSnJJRU5zWldG
+eWFXNW5hRzkxYzJVZ1VHbHMmIzEzOwpiM1FnUTBFd0hoY05Nakl4TVRFMk1UTXpNREl6V2hjTk1q
+Y3hNVEUxTVRNek1ESXpXakNCMGpFTE1Ba0dBMVVFQmhNQ1FrVXhFVEFQJiMxMzsKQmdOVkJBZ1RD
+RUp5ZFhOelpXeHpNUkl3RUFZRFZRUUhFd2xXYVd4MmIyOXlaR1V4TXpBeEJnTlZCQW9US2tSbGJH
+OXBkSFJsSUVOdiYjMTM7CmJuTjFiSFJwYm1jZ1lXNWtJRUZrZG1semIzSjVJRU5XUWtFdlUwTlNU
+REZBTUQ0R0ExVUVBeE0zU1VOQlRrNGdWRTFEU0NCQmRYUm8mIzEzOwpiM0pwZW1Wa0lGUnlZV1Js
+YldGeWF5QlFhV3h2ZENCV1lXeHBaR0YwYjNJZ1VtVjJiMnRsWkRFbE1DTUdDU3FHU0liM0RRRUpB
+UllXJiMxMzsKWW1WMGJXTm9jMjFrUUdSbGJHOXBkSFJsTG1OdmJUQ0NBaUl3RFFZSktvWklodmNO
+QVFFQkJRQURnZ0lQQURDQ0Fnb0NnZ0lCQVB6RCYjMTM7Cno1T1p6aVVsZ0pDbEU4WUw3SFNYSlFU
+NGFhWnoxQW1Fby8rK2JaeTBnNzFBQm5HRVJXYnJPVDJJZG0vNTZIVC9Rd1VxV0owVGtCWmImIzEz
+OwppcUJpaUQ1cjRFWnl5OWd6ZU9MaW9qNWo0a0UyRTB3WVBYVkFNd2pla09FODBnbzlYTndCRzA5
+ZUFXVzlDbXhjZnczOXlxMW0vSERYJiMxMzsKd2Q1cDdXYlFlMVBwU3NPT2tIb29OQlNTMEloRmZa
+Z0dmNnhvQzlGdVYxYnNvZVErVzFIbnlFM3lxUmdSeDd3VEh6TnNIa3RyNDJjTSYjMTM7CnFhOS9p
+RFdWWEIzV0R2OXhPbkZJMU5WNGNqYVhETUpya1BlbU9rNFMxS0lSMjljcjk4L0pNYVlWcndLanln
+OE9kKzRGS24yd1BETEYmIzEzOwo1KzVoNms2QWx0b0tkZ1FOTFpOakp0ekd3ajFkY2RpemJxZ3F2
+RzRhMXYxS1huamQycy9mWVJKTnVUNHBTTGNyNXBaR2haa21TYXQ1JiMxMzsKdVpRYnlXaVExTEVU
+d2xISmN0ZnVydzBPMUxmYXU1RzNRWk5LMW5ENWhQV2ErQVlVVTFnN0tHbHFZeWtnQlNDRmdONnh1
+ei9QY3BPQSYjMTM7Cis3QllBWXVxQ2tZVUxma0xBcFZMWE05U05pdlM5WnlWazFYR1ozUXcrdmRm
+MHJkKzExR2VsR1JxZFh3bm9GMVNTdXg4TVJhVkVSaVImIzEzOwpUN0I3NUxadk9VNUliTkVLSEd5
+eXNhc1A3V1ZNQzJ6UFJwQUdDTTMrOHJmdTVBd2RhcFNkbWdHVmE0LzdlbmxPdWkyVXZ5ZTVjUE9w
+JiMxMzsKS0ZETXRZZC9oZkNnMncvMVduVDlFL3pYTWVjZ1ZYdnFFS2k2WWovZVhXUzlob1lDQ1Bt
+bkhaa0pFSGZ4ZGxRMmxOWDdxZ1BuQWdNQiYjMTM7CkFBR2pnZ0dDTUlJQmZqQU1CZ05WSFJNQkFm
+OEVBakFBTUE0R0ExVWREd0VCL3dRRUF3SUhnREFkQmdOVkhRNEVGZ1FVMlErTnRieU0mIzEzOwpZ
+ZWYwc2xmbG0xbzlnb3g2aXJFd2dib0dBMVVkSXdTQnNqQ0JyNEFVUjN0UHJucFJrYlhSdjUwMjZZ
+Wi9OaFlFcVVXaGdZQ2tmakI4JiMxMzsKTVFzd0NRWURWUVFHRXdKVlV6RThNRG9HQTFVRUNnd3pT
+VzUwWlhKdVpYUWdRMjl5Y0c5eVlYUnBiMjRnWm05eUlFRnpjMmxuYm1WayYjMTM7CklFNWhiV1Z6
+SUdGdVpDQk9kVzFpWlhKek1TOHdMUVlEVlFRRERDWkpRMEZPVGlCVWNtRmtaVzFoY21zZ1EyeGxZ
+WEpwYm1kb2IzVnomIzEzOwpaU0JRYVd4dmRDQkRRWUlVZW1wdE1WNGx3KzFRTDFlNjQ4byt3dkFO
+SDR3d05BWURWUjBmQkMwd0t6QXBvQ2VnSllZamFIUjBjRG92JiMxMzsKTDJOeWJDNXBZMkZ1Ymk1
+dmNtY3ZkRzFqYUY5d2FXeHZkQzVqY213d1RBWURWUjBnQkVVd1F6QVFCZzRyQmdFRUFZTEpHd0VG
+Z3pzTSYjMTM7CkNqQXZCZ2dyQmdFRkJRY0NBVEFqTUNFR0NDc0dBUVVGQndJQkZoVm9kSFJ3Y3pv
+dkwyTndjeTVwWTJGdWJpNXZjbWN3RFFZSktvWkkmIzEzOwpodmNOQVFFTkJRQURnZ0lCQUlUMi9G
+Z2FzZ0NpQ1N4T0MrdXoyQzJrekZFZkRiNkUvSDg5OHVyM21jYVNJMlBhb2NLQTBJd0crdGluJiMx
+MzsKR0JhQitscU8xemt5V3VOZXR1Y2lPaU1QZ1paNzJuNEJCYThIditjd3VkcGJXYkEvVlpKWmNH
+YUN4NEFYVkk1TG8yYlA5RFV5Yng3eCYjMTM7Ck0yejBscG41MkdhUE50c3JhdTAwYkRia29lWnZn
+TFlBL0JLQ3U0Y2dkQ0VtSUc4M3JQZXQ2Z2R2WmhtTVFnWCtaK1lzcWJSQ3dUTy8mIzEzOwpsWHZH
+OFo1UzFnSktPaVYvTzJMN3pYRG5QSnhBUDVRay96aFAvQ1J3Q3dSRFF2eG9GRVA2bWdMNklvMHJN
+L1I1QW54eTlTZVI1ZCtrJiMxMzsKNExOQ1dQUzQvSTZhSy9iTDQyK05xZHIyRFFyRGdaWGQ5T3Uz
+U2Z6NjlBRmoxbG55cGFMY3FhUUlWcHNRT1p3TmZQN0lRdFRqZUJJKyYjMTM7Ckh5VHgwb0R6akQw
+bXFXVG1FR1Q2MEZ0ZzJtaEtaSGp0WjdXK3RybnVob21pRHNMUStiMTBFQXJaWHE1QzhzT0t2T2VI
+cSsxRGR3YkwmIzEzOwpHMXBmM2dNYWNrenV1MTFPekMxcGk0eDlwOVVGc2VLMWNCTHE0cDllR3Za
+cDdLTzB5UWxXcG8yclJ1aStzRHR0a2hSWkV3WENJTDE5JiMxMzsKUzIva0tLdjRRdmM5MGpnWkhN
+V1dQWkNRL3VqT3piS0Fqbnk0MXJsbEZpVy9MVG1wSTVSb2FYN1l0d3pjbmc1MEdZT1RjMmNWVXNE
+VCYjMTM7CnBmUm9nVyt0eGE3NEc0YlB3R29wSWhrd2JMV0RWN1VNejFXTTlpZ1RKNm9MRUhBdnBP
+cDUxOFg3bjV0clJaRXk4dE9kQ3QvS3M5ZlcmIzEzOwpVMUFsODFzb1F3cFAzanU3PC9kczpYNTA5
+Q2VydGlmaWNhdGU+PC9kczpYNTA5RGF0YT48L2RzOktleUluZm8+PC9kczpTaWduYXR1cmU+PC9z
+bWQ6c2lnbmVkTWFyaz4K
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/RevokedCert/TMVRevoked-Trademark-Agent-French-Active.smd b/core/src/test/resources/google/registry/tmch/idn/RevokedCert/TMVRevoked-Trademark-Agent-French-Active.smd
new file mode 100644
index 000000000..df3e33824
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/RevokedCert/TMVRevoked-Trademark-Agent-French-Active.smd
@@ -0,0 +1,126 @@
+Marks: Essai & évaluation
+smdID: 000000831669081353416-65535
+U-labels: xn--essai---valuation-itb, xn--essai--valuation-hqb, xn--essai-and-valuation-kzb, xn--essai-andvaluation-jwb, xn--essai-valuation-gnb, xn--essaiand-valuation-jwb, xn--essaiandvaluation-itb, xn--essaiet-valuation-itb, xn--essaietvaluation-hqb, xn--essaivaluation-fkb
+notBefore: 2022-11-22T01:42:33.416Z
+notAfter: 2027-10-18T14:46:53.013Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il8zOGU2
+ZmVmMy0yODRhLTQ1NjItODk5NC04MjcwNWYxMmZiOTgiPjxzbWQ6aWQ+MDAwMDAwODMxNjY5MDgx
+MzUzNDE2LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMTo0MjozMy40MTZaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0xOFQxNDo0Njo1My4wMTNaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
+cmFkZW1hcms+PG1hcms6aWQ+MDAwMTM5MTUwMzA2NzM4MjE1MDMwNjczODItMTwvbWFyazppZD48
+bWFyazptYXJrTmFtZT5Fc3NhaSAmYW1wOyDDqXZhbHVhdGlvbjwvbWFyazptYXJrTmFtZT48bWFy
+azpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpvcmc+QWdlbmNlIGVuIEZyYW5jZTwv
+bWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpzdHJlZXQ+MTAgQXZlbnVlIFJvdXNzZWF1eDwvbWFy
+azpzdHJlZXQ+PG1hcms6Y2l0eT5WZXJzYWlsbGVzPC9tYXJrOmNpdHk+PG1hcms6cGM+MzMwODE8
+L21hcms6cGM+PG1hcms6Y2M+RlI8L21hcms6Y2M+PC9tYXJrOmFkZHI+PC9tYXJrOmhvbGRlcj48
+bWFyazpjb250YWN0IHR5cGU9ImFnZW50Ij48bWFyazpuYW1lPkZyYW5jIExlYnJ1bjwvbWFyazpu
+YW1lPjxtYXJrOm9yZz5BZ2VuY2UgZW4gRnJhbmNlPC9tYXJrOm9yZz48bWFyazphZGRyPjxtYXJr
+OnN0cmVldD5BdmVudWUgUm91c3NlYXV4IDEwIDwvbWFyazpzdHJlZXQ+PG1hcms6Y2l0eT5WZXJz
+YWlsbGVzPC9tYXJrOmNpdHk+PG1hcms6cGM+MzMwODE8L21hcms6cGM+PG1hcms6Y2M+RlI8L21h
+cms6Y2M+PC9tYXJrOmFkZHI+PG1hcms6dm9pY2U+KzMzLjEyNTc4MTI1MDwvbWFyazp2b2ljZT48
+bWFyazpmYXg+KzMzLjEyNTc4MTI1MTwvbWFyazpmYXg+PG1hcms6ZW1haWw+aW5mb0BhZ2VuY2Ut
+ZW4tZnJhbmNlLmZyPC9tYXJrOmVtYWlsPjwvbWFyazpjb250YWN0PjxtYXJrOmp1cmlzZGljdGlv
+bj5VUzwvbWFyazpqdXJpc2RpY3Rpb24+PG1hcms6Y2xhc3M+MTU8L21hcms6Y2xhc3M+PG1hcms6
+bGFiZWw+eG4tLWVzc2FpLS0tdmFsdWF0aW9uLWl0YjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54
+bi0tZXNzYWktLXZhbHVhdGlvbi1ocWI8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLWVzc2Fp
+LWFuZC12YWx1YXRpb24ta3piPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1lc3NhaS1hbmR2
+YWx1YXRpb24tandiPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1lc3NhaS12YWx1YXRpb24t
+Z25iPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1lc3NhaWFuZC12YWx1YXRpb24tandiPC9t
+YXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1lc3NhaWFuZHZhbHVhdGlvbi1pdGI8L21hcms6bGFi
+ZWw+PG1hcms6bGFiZWw+eG4tLWVzc2FpZXQtdmFsdWF0aW9uLWl0YjwvbWFyazpsYWJlbD48bWFy
+azpsYWJlbD54bi0tZXNzYWlldHZhbHVhdGlvbi1ocWI8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+
+eG4tLWVzc2FpdmFsdWF0aW9uLWZrYjwvbWFyazpsYWJlbD48bWFyazpnb29kc0FuZFNlcnZpY2Vz
+Pmd1aXRhcjwvbWFyazpnb29kc0FuZFNlcnZpY2VzPjxtYXJrOnJlZ051bT4xMjM0PC9tYXJrOnJl
+Z051bT48bWFyazpyZWdEYXRlPjIwMTMtMDEtMDFUMDA6MDA6MDAuMDAwWjwvbWFyazpyZWdEYXRl
+PjwvbWFyazp0cmFkZW1hcms+PC9tYXJrOm1hcms+PGRzOlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0
+cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyIgSWQ9Il80YTE5YmNkNi00MDA5LTQ3M2Ut
+ODUyMC00ZWQ5ODcxNzEzNjYiPjxkczpTaWduZWRJbmZvPjxkczpDYW5vbmljYWxpemF0aW9uTWV0
+aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+
+PGRzOlNpZ25hdHVyZU1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQv
+eG1sZHNpZy1tb3JlI3JzYS1zaGEyNTYiLz48ZHM6UmVmZXJlbmNlIFVSST0iI18zOGU2ZmVmMy0y
+ODRhLTQ1NjItODk5NC04MjcwNWYxMmZiOTgiPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0g
+QWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjZW52ZWxvcGVkLXNp
+Z25hdHVyZSIvPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAx
+LzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdv
+cml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdl
+c3RWYWx1ZT4rMG81dXFpQmVFc1ZnL21LWEh6SWIvSHRzN2F5ZC9RVnRYWTJVOXprcjQ0PTwvZHM6
+RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PGRzOlJlZmVyZW5jZSBVUkk9IiNfN2Y2ZmRmYTMt
+MDhjZS00YzJlLTg0MjQtYzRmOTQzYTQyNWU0Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3Jt
+IEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9k
+czpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9y
+Zy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+cFN1Tlk3WWRSUVA2K2Er
+eTE0czVIanEzMlNCQUFJQktMWFdpNkpmV3BmYz08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJl
+bmNlPjwvZHM6U2lnbmVkSW5mbz48ZHM6U2lnbmF0dXJlVmFsdWUgSWQ9Il83NThmZDEyMi1iMmRi
+LTQyZWItYTc2Mi1iNTVlMTYyYzljMTUiPmM1dkJhZTRYSGUrR3JFWk1GdzNaV3hNME81RGNRb01R
+Z0tIbm9xejE0ajYvOHlaS216VnphMWt0eWhGMTlyMzZqbkh4b3RyaG5SeUUmIzEzOwpxYUZPZDBR
+c2M5azI4dVUwQ3J5T2RnZ3hIU2tBK0NjOUkrVkNWVkduSnIwQVZac2N2dWhNTThobitIRWR0STRa
+d0dpQ2dKRCtKcGVCJiMxMzsKOG1yMkNaa3VRMGtmUHd5T2RDYWRQNHlvaWU3cWc1LzNZenYzZzJi
+Ny93dTdLTnhBWjNaT2V1MUNYYldWS3laL0p2cTJZK2NiWmtVUiYjMTM7CmtKcDl0Y3hwTGo3V0hM
+RUNOWEhZaWZTd242UWJUWGNGbjNwd3h2WGRUcW5HdXlPY21oV2g2M0cwNWJJZHJpN3hsSmlvTzFE
+Y2JsTDgmIzEzOwprR2tBWUw0cGF1ZFRzMXU5ZllUSmNJWGxIME5Sem1Gc0dPVzlUaHdxRFhIcWE0
+RDJON0k0UUlVWnhQTVJFUXJQK2k5S05xZUJIb0J1JiMxMzsKRnJQMVQ5SGhndjNIalZFZ0xpdith
+OVBibzVBR3I3NUtyWHlBRFpRQkRVYWpDT2kzekg3SStlSnpjOUE5U3BIdmszMEkxM0dnaVBwcyYj
+MTM7CmJ0alIvWTd6TmpBSHF1Y0lHV25QRUVidmJEVEw2VS9Ybk9zcjdxQnY0YVUrSENMUU5aeHN0
+LzlTTzhMS0QzTVBSbDhUdFRjOTBCem4mIzEzOwpzWTVmbkhVYTZvUU16N3l6U2JUQmlzU0duMitW
+ZDVHQlJKK0JTVytsdUJoaVp2VVBjUWRKc0tLT1I4QjRNRU9UN3pDVG1NNmRXaVBCJiMxMzsKdUti
+bmcvU2poSHFKeWFwbG41QXllQjVBNUF0cDE2VURNRGJaMWRtb213WjBuM3drT29ycFdhMHZhOWtU
+NHNXOFgyR21WK0EvcGRNPTwvZHM6U2lnbmF0dXJlVmFsdWU+PGRzOktleUluZm8gSWQ9Il83ZjZm
+ZGZhMy0wOGNlLTRjMmUtODQyNC1jNGY5NDNhNDI1ZTQiPjxkczpYNTA5RGF0YT48ZHM6WDUwOUNl
+cnRpZmljYXRlPk1JSUhZVENDQlVtZ0F3SUJBZ0lVSE9NN29FcGxWMDZUWklnWlRpMFJVa3VxZ1o0
+d0RRWUpLb1pJaHZjTkFRRU5CUUF3ZkRFTE1Ba0cmIzEzOwpBMVVFQmhNQ1ZWTXhQREE2QmdOVkJB
+b01NMGx1ZEdWeWJtVjBJRU52Y25CdmNtRjBhVzl1SUdadmNpQkJjM05wWjI1bFpDQk9ZVzFsJiMx
+MzsKY3lCaGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF3d21TVU5CVGs0Z1ZISmhaR1Z0WVhKcklF
+TnNaV0Z5YVc1bmFHOTFjMlVnVUdscyYjMTM7CmIzUWdRMEV3SGhjTk1qSXhNVEUyTVRNek1ESXpX
+aGNOTWpjeE1URTFNVE16TURJeldqQ0IwakVMTUFrR0ExVUVCaE1DUWtVeEVUQVAmIzEzOwpCZ05W
+QkFnVENFSnlkWE56Wld4ek1SSXdFQVlEVlFRSEV3bFdhV3gyYjI5eVpHVXhNekF4QmdOVkJBb1RL
+a1JsYkc5cGRIUmxJRU52JiMxMzsKYm5OMWJIUnBibWNnWVc1a0lFRmtkbWx6YjNKNUlFTldRa0V2
+VTBOU1RERkFNRDRHQTFVRUF4TTNTVU5CVGs0Z1ZFMURTQ0JCZFhSbyYjMTM7CmIzSnBlbVZrSUZS
+eVlXUmxiV0Z5YXlCUWFXeHZkQ0JXWVd4cFpHRjBiM0lnVW1WMmIydGxaREVsTUNNR0NTcUdTSWIz
+RFFFSkFSWVcmIzEzOwpZbVYwYldOb2MyMWtRR1JsYkc5cGRIUmxMbU52YlRDQ0FpSXdEUVlKS29a
+SWh2Y05BUUVCQlFBRGdnSVBBRENDQWdvQ2dnSUJBUHpEJiMxMzsKejVPWnppVWxnSkNsRThZTDdI
+U1hKUVQ0YWFaejFBbUVvLysrYlp5MGc3MUFCbkdFUldick9UMklkbS81NkhUL1F3VXFXSjBUa0Ja
+YiYjMTM7CmlxQmlpRDVyNEVaeXk5Z3plT0xpb2o1ajRrRTJFMHdZUFhWQU13amVrT0U4MGdvOVhO
+d0JHMDllQVdXOUNteGNmdzM5eXExbS9IRFgmIzEzOwp3ZDVwN1diUWUxUHBTc09Pa0hvb05CU1Mw
+SWhGZlpnR2Y2eG9DOUZ1VjFic29lUStXMUhueUUzeXFSZ1J4N3dUSHpOc0hrdHI0MmNNJiMxMzsK
+cWE5L2lEV1ZYQjNXRHY5eE9uRkkxTlY0Y2phWERNSnJrUGVtT2s0UzFLSVIyOWNyOTgvSk1hWVZy
+d0tqeWc4T2QrNEZLbjJ3UERMRiYjMTM7CjUrNWg2azZBbHRvS2RnUU5MWk5qSnR6R3dqMWRjZGl6
+YnFncXZHNGExdjFLWG5qZDJzL2ZZUkpOdVQ0cFNMY3I1cFpHaFprbVNhdDUmIzEzOwp1WlFieVdp
+UTFMRVR3bEhKY3RmdXJ3ME8xTGZhdTVHM1FaTksxbkQ1aFBXYStBWVVVMWc3S0dscVl5a2dCU0NG
+Z042eHV6L1BjcE9BJiMxMzsKKzdCWUFZdXFDa1lVTGZrTEFwVkxYTTlTTml2UzlaeVZrMVhHWjNR
+dyt2ZGYwcmQrMTFHZWxHUnFkWHdub0YxU1N1eDhNUmFWRVJpUiYjMTM7ClQ3Qjc1TFp2T1U1SWJO
+RUtIR3l5c2FzUDdXVk1DMnpQUnBBR0NNMys4cmZ1NUF3ZGFwU2RtZ0dWYTQvN2VubE91aTJVdnll
+NWNQT3AmIzEzOwpLRkRNdFlkL2hmQ2cydy8xV25UOUUvelhNZWNnVlh2cUVLaTZZai9lWFdTOWhv
+WUNDUG1uSFprSkVIZnhkbFEybE5YN3FnUG5BZ01CJiMxMzsKQUFHamdnR0NNSUlCZmpBTUJnTlZI
+Uk1CQWY4RUFqQUFNQTRHQTFVZER3RUIvd1FFQXdJSGdEQWRCZ05WSFE0RUZnUVUyUStOdGJ5TSYj
+MTM7ClllZjBzbGZsbTFvOWdveDZpckV3Z2JvR0ExVWRJd1NCc2pDQnI0QVVSM3RQcm5wUmtiWFJ2
+NTAyNllaL05oWUVxVVdoZ1lDa2ZqQjgmIzEzOwpNUXN3Q1FZRFZRUUdFd0pWVXpFOE1Eb0dBMVVF
+Q2d3elNXNTBaWEp1WlhRZ1EyOXljRzl5WVhScGIyNGdabTl5SUVGemMybG5ibVZrJiMxMzsKSUU1
+aGJXVnpJR0Z1WkNCT2RXMWlaWEp6TVM4d0xRWURWUVFERENaSlEwRk9UaUJVY21Ga1pXMWhjbXNn
+UTJ4bFlYSnBibWRvYjNWeiYjMTM7ClpTQlFhV3h2ZENCRFFZSVVlbXB0TVY0bHcrMVFMMWU2NDhv
+K3d2QU5INHd3TkFZRFZSMGZCQzB3S3pBcG9DZWdKWVlqYUhSMGNEb3YmIzEzOwpMMk55YkM1cFky
+RnViaTV2Y21jdmRHMWphRjl3YVd4dmRDNWpjbXd3VEFZRFZSMGdCRVV3UXpBUUJnNHJCZ0VFQVlM
+Skd3RUZnenNNJiMxMzsKQ2pBdkJnZ3JCZ0VGQlFjQ0FUQWpNQ0VHQ0NzR0FRVUZCd0lCRmhWb2RI
+Undjem92TDJOd2N5NXBZMkZ1Ymk1dmNtY3dEUVlKS29aSSYjMTM7Cmh2Y05BUUVOQlFBRGdnSUJB
+SVQyL0ZnYXNnQ2lDU3hPQyt1ejJDMmt6RkVmRGI2RS9IODk4dXIzbWNhU0kyUGFvY0tBMEl3Ryt0
+aW4mIzEzOwpHQmFCK2xxTzF6a3lXdU5ldHVjaU9pTVBnWlo3Mm40QkJhOEh2K2N3dWRwYldiQS9W
+WkpaY0dhQ3g0QVhWSTVMbzJiUDlEVXlieDd4JiMxMzsKTTJ6MGxwbjUyR2FQTnRzcmF1MDBiRGJr
+b2VadmdMWUEvQktDdTRjZ2RDRW1JRzgzclBldDZnZHZaaG1NUWdYK1orWXNxYlJDd1RPLyYjMTM7
+CmxYdkc4WjVTMWdKS09pVi9PMkw3elhEblBKeEFQNVFrL3poUC9DUndDd1JEUXZ4b0ZFUDZtZ0w2
+SW8wck0vUjVBbnh5OVNlUjVkK2smIzEzOwo0TE5DV1BTNC9JNmFLL2JMNDIrTnFkcjJEUXJEZ1pY
+ZDlPdTNTZno2OUFGajFsbnlwYUxjcWFRSVZwc1FPWndOZlA3SVF0VGplQkkrJiMxMzsKSHlUeDBv
+RHpqRDBtcVdUbUVHVDYwRnRnMm1oS1pIanRaN1crdHJudWhvbWlEc0xRK2IxMEVBclpYcTVDOHNP
+S3ZPZUhxKzFEZHdiTCYjMTM7CkcxcGYzZ01hY2t6dXUxMU96QzFwaTR4OXA5VUZzZUsxY0JMcTRw
+OWVHdlpwN0tPMHlRbFdwbzJyUnVpK3NEdHRraFJaRXdYQ0lMMTkmIzEzOwpTMi9rS0t2NFF2Yzkw
+amdaSE1XV1BaQ1EvdWpPemJLQWpueTQxcmxsRmlXL0xUbXBJNVJvYVg3WXR3emNuZzUwR1lPVGMy
+Y1ZVc0RUJiMxMzsKcGZSb2dXK3R4YTc0RzRiUHdHb3BJaGt3YkxXRFY3VU16MVdNOWlnVEo2b0xF
+SEF2cE9wNTE4WDduNXRyUlpFeTh0T2RDdC9LczlmVyYjMTM7ClUxQWw4MXNvUXdwUDNqdTc8L2Rz
+Olg1MDlDZXJ0aWZpY2F0ZT48L2RzOlg1MDlEYXRhPjwvZHM6S2V5SW5mbz48L2RzOlNpZ25hdHVy
+ZT48L3NtZDpzaWduZWRNYXJrPgo=
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/idn/RevokedCert/TMVRevoked-Trademark-Agent-Russian-Active.smd b/core/src/test/resources/google/registry/tmch/idn/RevokedCert/TMVRevoked-Trademark-Agent-Russian-Active.smd
new file mode 100644
index 000000000..a9397a3bf
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/idn/RevokedCert/TMVRevoked-Trademark-Agent-Russian-Active.smd
@@ -0,0 +1,127 @@
+Marks: суда & ошибки
+smdID: 000000741669081251026-65535
+U-labels: xn------5cdin6abr1b1ay5e, xn-----6kcgl1abp7azaw9d, xn---and--3vemr6bbv9b5a2a7f, xn---and-43dkp1bbt5b3a0a1f, xn----7sbejwbn3axu3d, xn--and--43dkp1bbt5b3a0a1f, xn--and-5cdin6abr1b1ay5e, xn--et--5cdin6abr1b1ay5e, xn--et-6kcgl1abp7azaw9d, xn--80achrblzvs7c
+notBefore: 2022-11-22T01:40:51.026Z
+notAfter: 2027-10-18T14:16:55.554Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il81YmNl
+MzJiMi1lM2ZkLTQ1NjgtYmU0Ni1lYzE3Y2YxNjViZTQiPjxzbWQ6aWQ+MDAwMDAwNzQxNjY5MDgx
+MjUxMDI2LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMTo0MDo1MS4wMjZaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0xOFQxNDoxNjo1NS41NTRaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
+cmFkZW1hcms+PG1hcms6aWQ+MDAwMTQxMTUwMzA2NTU1MDE1MDMwNjU1NTAtMTwvbWFyazppZD48
+bWFyazptYXJrTmFtZT7RgdGD0LTQsCAmYW1wOyDQvtGI0LjQsdC60Lg8L21hcms6bWFya05hbWU+
+PG1hcms6aG9sZGVyIGVudGl0bGVtZW50PSJvd25lciI+PG1hcms6b3JnPtCQ0LPQtdC90YLRgdGC
+0LLQvjwvbWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpzdHJlZXQ+0J/RgNC+0YHQv9C10LrRgiDQ
+ktC10YDQvdCw0LTRgdC60L7Qs9C+IDE1PC9tYXJrOnN0cmVldD48bWFyazpjaXR5PtCc0L7RgdC6
+0LLQsDwvbWFyazpjaXR5PjxtYXJrOnBjPjExNzQ4NTwvbWFyazpwYz48bWFyazpjYz5SVTwvbWFy
+azpjYz48L21hcms6YWRkcj48L21hcms6aG9sZGVyPjxtYXJrOmNvbnRhY3QgdHlwZT0iYWdlbnQi
+PjxtYXJrOm5hbWU+0J3QsNGC0LDQu9GM0Y8g0JDQvdGC0L7QvdC+0LLQsDwvbWFyazpuYW1lPjxt
+YXJrOm9yZz7QkNCz0LXQvdGC0YHRgtCy0L48L21hcms6b3JnPjxtYXJrOmFkZHI+PG1hcms6c3Ry
+ZWV0PtCf0YDQvtGB0L/QtdC60YIg0JLQtdGA0L3QsNC00YHQutC+0LPQviAxNTwvbWFyazpzdHJl
+ZXQ+PG1hcms6Y2l0eT7QnNC+0YHQutCy0LA8L21hcms6Y2l0eT48bWFyazpwYz4xMTc0ODU8L21h
+cms6cGM+PG1hcms6Y2M+UlU8L21hcms6Y2M+PC9tYXJrOmFkZHI+PG1hcms6dm9pY2U+KzcuOTE4
+ODIyMTY3NDwvbWFyazp2b2ljZT48bWFyazpmYXg+KzcuOTE4ODIyMTY3MzwvbWFyazpmYXg+PG1h
+cms6ZW1haWw+aW5mb0BhZ2VuY3kucnU8L21hcms6ZW1haWw+PC9tYXJrOmNvbnRhY3Q+PG1hcms6
+anVyaXNkaWN0aW9uPlVTPC9tYXJrOmp1cmlzZGljdGlvbj48bWFyazpjbGFzcz4xNTwvbWFyazpj
+bGFzcz48bWFyazpsYWJlbD54bi0tLS0tLTVjZGluNmFicjFiMWF5NWU8L21hcms6bGFiZWw+PG1h
+cms6bGFiZWw+eG4tLS0tLTZrY2dsMWFicDdhemF3OWQ8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+
+eG4tLS1hbmQtLTN2ZW1yNmJidjliNWEyYTdmPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS0t
+YW5kLTQzZGtwMWJidDViM2EwYTFmPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS0tLTdzYmVq
+d2JuM2F4dTNkPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1hbmQtLTQzZGtwMWJidDViM2Ew
+YTFmPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1hbmQtNWNkaW42YWJyMWIxYXk1ZTwvbWFy
+azpsYWJlbD48bWFyazpsYWJlbD54bi0tZXQtLTVjZGluNmFicjFiMWF5NWU8L21hcms6bGFiZWw+
+PG1hcms6bGFiZWw+eG4tLWV0LTZrY2dsMWFicDdhemF3OWQ8L21hcms6bGFiZWw+PG1hcms6bGFi
+ZWw+eG4tLTgwYWNocmJsenZzN2M8L21hcms6bGFiZWw+PG1hcms6Z29vZHNBbmRTZXJ2aWNlcz7Q
+s9C40YLQsNGA0LAgPC9tYXJrOmdvb2RzQW5kU2VydmljZXM+PG1hcms6cmVnTnVtPjEyMzQ8L21h
+cms6cmVnTnVtPjxtYXJrOnJlZ0RhdGU+MjAxMy0wMS0wMVQwMDowMDowMC4wMDBaPC9tYXJrOnJl
+Z0RhdGU+PC9tYXJrOnRyYWRlbWFyaz48L21hcms6bWFyaz48ZHM6U2lnbmF0dXJlIHhtbG5zOmRz
+PSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjIiBJZD0iX2U5MWQ5MWFkLTgzNzUt
+NDc4Mi05NjFiLTQ4ODg0N2U2NGQ2NSI+PGRzOlNpZ25lZEluZm8+PGRzOkNhbm9uaWNhbGl6YXRp
+b25NZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0
+biMiLz48ZHM6U2lnbmF0dXJlTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAw
+MS8wNC94bWxkc2lnLW1vcmUjcnNhLXNoYTI1NiIvPjxkczpSZWZlcmVuY2UgVVJJPSIjXzViY2Uz
+MmIyLWUzZmQtNDU2OC1iZTQ2LWVjMTdjZjE2NWJlNCI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5z
+Zm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1sZHNpZyNlbnZlbG9w
+ZWQtc2lnbmF0dXJlIi8+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3Jn
+LzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6RGlnZXN0TWV0aG9k
+IEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxlbmMjc2hhMjU2Ii8+PGRz
+OkRpZ2VzdFZhbHVlPlJjYndBZmpZd0FlS3RQL05Xd0xzYWhPTTVpNmtNd3AvN01GRzhFZVZDWkk9
+PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48ZHM6UmVmZXJlbmNlIFVSST0iI19mZmQ0
+YTA4My02ODg3LTQwMDctOThiMi02NWU5ZDIxYWQ5ZDciPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFu
+c2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMi
+Lz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cu
+dzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1ZT5Sem52SVdNbVNr
+UWlZSVljREtSTWlLbm5aVUpyOHV4TytrUTFHNDEvYkJFPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpS
+ZWZlcmVuY2U+PC9kczpTaWduZWRJbmZvPjxkczpTaWduYXR1cmVWYWx1ZSBJZD0iXzE4MzUxZjIy
+LWIxZTAtNGM5OC04MWZkLWM3N2VkYWFhYjliYSI+SkorNi8xTUFIRnBZenR0Q01mbjlEZ2xTYUVV
+SG94RFppZkJzY21jbFFtb3ZWTmJBVVhOQXc0ZzJ6a1RkbklSLytXdVl5QWl4QU5VMCYjMTM7Cnpp
+Ui9jNncyb1ovRXhsOERkbk53MjV1S1lkMWdQSkNvR1ozOGZuUDh6ZkFMb0VTZlAvb1pZOEhUK1k3
+dDFTSWpCTnVXL0FQQ1hncTgmIzEzOwp4biticHNJT0tyR1NBTWRTMTc5YlByenMvdWVWRXl6VmJL
+VmY2Wkg0TXFPZk5FY2huclZ1blN0ZmVSSEJWN1pPQVQ2L1Y3ZnlrcGhvJiMxMzsKbUxvaE10S0N2
+cWdRRnJQaUdpUG1iVk5KYURGUllUUXdwNnN4UXQwYzlqZTdQVzBXRzMrRGxBYjgrTHVMWWlsVDJC
+bjMxbU02cGxQTyYjMTM7ClI4Y0NZOVN2cDdiUUtSMElZZ0IyK3RmRjQ0eHBkV0tybmdHQnZnUDhH
+T2VZbG1hQUF3aVhjUFlMLzhaRTZpcHc4ZFhCUW1tUFh2RFcmIzEzOwoxeEd4bUF4K3dudTFiakNK
+UngrNkt5dlZnNGdsU1JoM2R5c1h5L0RROXJzK1ZZYXZxWWQyOWJwcnI5Vm5PVWdmRlp1T0hJZDNH
+NjlOJiMxMzsKRFRETkV1MW0vRXhVbmd0M0tJbmYvN2ozcHIybkVCSExyckZ4aDNLNlJaMWlXa1hB
+aEVscDJFK241ckMrclVvSlFQck5IU0lvck91cyYjMTM7CjhTK1p6Z2svRm9XTDkrZTN6emlUQld5
+YU9MTjdzL1l1Z0VLWTlpQVIwWFBnR2lZQ2I1S1dadWhvMTdLQnA2VmZ0Y0VsUjJjMjBPcW4mIzEz
+OwoyWm9IV1VscjYvb1hXVTJmQ0FwMlpiVzViUitxY3FGd1Y4VjRPWVlmVzlJSkVmT1JHcGVQamVq
+aUx1OTlpcUgvemc0NVFDRzVjK1E9PC9kczpTaWduYXR1cmVWYWx1ZT48ZHM6S2V5SW5mbyBJZD0i
+X2ZmZDRhMDgzLTY4ODctNDAwNy05OGIyLTY1ZTlkMjFhZDlkNyI+PGRzOlg1MDlEYXRhPjxkczpY
+NTA5Q2VydGlmaWNhdGU+TUlJSFlUQ0NCVW1nQXdJQkFnSVVIT003b0VwbFYwNlRaSWdaVGkwUlVr
+dXFnWjR3RFFZSktvWklodmNOQVFFTkJRQXdmREVMTUFrRyYjMTM7CkExVUVCaE1DVlZNeFBEQTZC
+Z05WQkFvTU0wbHVkR1Z5Ym1WMElFTnZjbkJ2Y21GMGFXOXVJR1p2Y2lCQmMzTnBaMjVsWkNCT1lX
+MWwmIzEzOwpjeUJoYm1RZ1RuVnRZbVZ5Y3pFdk1DMEdBMVVFQXd3bVNVTkJUazRnVkhKaFpHVnRZ
+WEpySUVOc1pXRnlhVzVuYUc5MWMyVWdVR2xzJiMxMzsKYjNRZ1EwRXdIaGNOTWpJeE1URTJNVE16
+TURJeldoY05NamN4TVRFMU1UTXpNREl6V2pDQjBqRUxNQWtHQTFVRUJoTUNRa1V4RVRBUCYjMTM7
+CkJnTlZCQWdUQ0VKeWRYTnpaV3h6TVJJd0VBWURWUVFIRXdsV2FXeDJiMjl5WkdVeE16QXhCZ05W
+QkFvVEtrUmxiRzlwZEhSbElFTnYmIzEzOwpibk4xYkhScGJtY2dZVzVrSUVGa2RtbHpiM0o1SUVO
+V1FrRXZVME5TVERGQU1ENEdBMVVFQXhNM1NVTkJUazRnVkUxRFNDQkJkWFJvJiMxMzsKYjNKcGVt
+VmtJRlJ5WVdSbGJXRnlheUJRYVd4dmRDQldZV3hwWkdGMGIzSWdVbVYyYjJ0bFpERWxNQ01HQ1Nx
+R1NJYjNEUUVKQVJZVyYjMTM7ClltVjBiV05vYzIxa1FHUmxiRzlwZEhSbExtTnZiVENDQWlJd0RR
+WUpLb1pJaHZjTkFRRUJCUUFEZ2dJUEFEQ0NBZ29DZ2dJQkFQekQmIzEzOwp6NU9aemlVbGdKQ2xF
+OFlMN0hTWEpRVDRhYVp6MUFtRW8vKytiWnkwZzcxQUJuR0VSV2JyT1QySWRtLzU2SFQvUXdVcVdK
+MFRrQlpiJiMxMzsKaXFCaWlENXI0RVp5eTlnemVPTGlvajVqNGtFMkUwd1lQWFZBTXdqZWtPRTgw
+Z285WE53QkcwOWVBV1c5Q214Y2Z3Mzl5cTFtL0hEWCYjMTM7CndkNXA3V2JRZTFQcFNzT09rSG9v
+TkJTUzBJaEZmWmdHZjZ4b0M5RnVWMWJzb2VRK1cxSG55RTN5cVJnUng3d1RIek5zSGt0cjQyY00m
+IzEzOwpxYTkvaURXVlhCM1dEdjl4T25GSTFOVjRjamFYRE1KcmtQZW1PazRTMUtJUjI5Y3I5OC9K
+TWFZVnJ3S2p5ZzhPZCs0RktuMndQRExGJiMxMzsKNSs1aDZrNkFsdG9LZGdRTkxaTmpKdHpHd2ox
+ZGNkaXpicWdxdkc0YTF2MUtYbmpkMnMvZllSSk51VDRwU0xjcjVwWkdoWmttU2F0NSYjMTM7CnVa
+UWJ5V2lRMUxFVHdsSEpjdGZ1cncwTzFMZmF1NUczUVpOSzFuRDVoUFdhK0FZVVUxZzdLR2xxWXlr
+Z0JTQ0ZnTjZ4dXovUGNwT0EmIzEzOworN0JZQVl1cUNrWVVMZmtMQXBWTFhNOVNOaXZTOVp5Vmsx
+WEdaM1F3K3ZkZjByZCsxMUdlbEdScWRYd25vRjFTU3V4OE1SYVZFUmlSJiMxMzsKVDdCNzVMWnZP
+VTVJYk5FS0hHeXlzYXNQN1dWTUMyelBScEFHQ00zKzhyZnU1QXdkYXBTZG1nR1ZhNC83ZW5sT3Vp
+MlV2eWU1Y1BPcCYjMTM7CktGRE10WWQvaGZDZzJ3LzFXblQ5RS96WE1lY2dWWHZxRUtpNllqL2VY
+V1M5aG9ZQ0NQbW5IWmtKRUhmeGRsUTJsTlg3cWdQbkFnTUImIzEzOwpBQUdqZ2dHQ01JSUJmakFN
+QmdOVkhSTUJBZjhFQWpBQU1BNEdBMVVkRHdFQi93UUVBd0lIZ0RBZEJnTlZIUTRFRmdRVTJRK050
+YnlNJiMxMzsKWWVmMHNsZmxtMW85Z294NmlyRXdnYm9HQTFVZEl3U0JzakNCcjRBVVIzdFBybnBS
+a2JYUnY1MDI2WVovTmhZRXFVV2hnWUNrZmpCOCYjMTM7Ck1Rc3dDUVlEVlFRR0V3SlZVekU4TURv
+R0ExVUVDZ3d6U1c1MFpYSnVaWFFnUTI5eWNHOXlZWFJwYjI0Z1ptOXlJRUZ6YzJsbmJtVmsmIzEz
+OwpJRTVoYldWeklHRnVaQ0JPZFcxaVpYSnpNUzh3TFFZRFZRUUREQ1pKUTBGT1RpQlVjbUZrWlcx
+aGNtc2dRMnhsWVhKcGJtZG9iM1Z6JiMxMzsKWlNCUWFXeHZkQ0JEUVlJVWVtcHRNVjRsdysxUUwx
+ZTY0OG8rd3ZBTkg0d3dOQVlEVlIwZkJDMHdLekFwb0NlZ0pZWWphSFIwY0RvdiYjMTM7CkwyTnli
+QzVwWTJGdWJpNXZjbWN2ZEcxamFGOXdhV3h2ZEM1amNtd3dUQVlEVlIwZ0JFVXdRekFRQmc0ckJn
+RUVBWUxKR3dFRmd6c00mIzEzOwpDakF2QmdnckJnRUZCUWNDQVRBak1DRUdDQ3NHQVFVRkJ3SUJG
+aFZvZEhSd2N6b3ZMMk53Y3k1cFkyRnViaTV2Y21jd0RRWUpLb1pJJiMxMzsKaHZjTkFRRU5CUUFE
+Z2dJQkFJVDIvRmdhc2dDaUNTeE9DK3V6MkMya3pGRWZEYjZFL0g4OTh1cjNtY2FTSTJQYW9jS0Ew
+SXdHK3RpbiYjMTM7CkdCYUIrbHFPMXpreVd1TmV0dWNpT2lNUGdaWjcybjRCQmE4SHYrY3d1ZHBi
+V2JBL1ZaSlpjR2FDeDRBWFZJNUxvMmJQOURVeWJ4N3gmIzEzOwpNMnowbHBuNTJHYVBOdHNyYXUw
+MGJEYmtvZVp2Z0xZQS9CS0N1NGNnZENFbUlHODNyUGV0NmdkdlpobU1RZ1grWitZc3FiUkN3VE8v
+JiMxMzsKbFh2RzhaNVMxZ0pLT2lWL08yTDd6WERuUEp4QVA1UWsvemhQL0NSd0N3UkRRdnhvRkVQ
+Nm1nTDZJbzByTS9SNUFueHk5U2VSNWQrayYjMTM7CjRMTkNXUFM0L0k2YUsvYkw0MitOcWRyMkRR
+ckRnWlhkOU91M1NmejY5QUZqMWxueXBhTGNxYVFJVnBzUU9ad05mUDdJUXRUamVCSSsmIzEzOwpI
+eVR4MG9EempEMG1xV1RtRUdUNjBGdGcybWhLWkhqdFo3Vyt0cm51aG9taURzTFErYjEwRUFyWlhx
+NUM4c09Ldk9lSHErMURkd2JMJiMxMzsKRzFwZjNnTWFja3p1dTExT3pDMXBpNHg5cDlVRnNlSzFj
+QkxxNHA5ZUd2WnA3S08weVFsV3BvMnJSdWkrc0R0dGtoUlpFd1hDSUwxOSYjMTM7ClMyL2tLS3Y0
+UXZjOTBqZ1pITVdXUFpDUS91ak96YktBam55NDFybGxGaVcvTFRtcEk1Um9hWDdZdHd6Y25nNTBH
+WU9UYzJjVlVzRFQmIzEzOwpwZlJvZ1crdHhhNzRHNGJQd0dvcEloa3diTFdEVjdVTXoxV005aWdU
+SjZvTEVIQXZwT3A1MThYN241dHJSWkV5OHRPZEN0L0tzOWZXJiMxMzsKVTFBbDgxc29Rd3BQM2p1
+NzwvZHM6WDUwOUNlcnRpZmljYXRlPjwvZHM6WDUwOURhdGE+PC9kczpLZXlJbmZvPjwvZHM6U2ln
+bmF0dXJlPjwvc21kOnNpZ25lZE1hcms+Cg==
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/tmch_test_smd_revocation_list.csv b/core/src/test/resources/google/registry/tmch/idn/idn_smdrl.csv
similarity index 60%
rename from core/src/test/resources/google/registry/tmch/tmch_test_smd_revocation_list.csv
rename to core/src/test/resources/google/registry/tmch/idn/idn_smdrl.csv
index 1c44ca701..31e5aad10 100644
--- a/core/src/test/resources/google/registry/tmch/tmch_test_smd_revocation_list.csv
+++ b/core/src/test/resources/google/registry/tmch/idn/idn_smdrl.csv
@@ -1,4 +1,4 @@
-1,2018-05-14T19:50:00.0Z
+1,2022-11-22T02:13:05.0Z
smd-id,insertion-datetime
0000001731373633629261-65535,2013-07-15T15:42:00.0Z
0000002011373633636590-65535,2013-07-15T15:42:00.0Z
@@ -90,3 +90,63 @@ smd-id,insertion-datetime
000000671526319797729-65535,2018-05-14T19:50:00.0Z
000000681526319799634-65535,2018-05-14T19:50:00.0Z
000000691526319801540-65535,2018-05-14T19:50:00.0Z
+000000761602138912583-65535,2020-10-08T07:07:25.0Z
+000000771602138917765-65535,2020-10-08T07:07:25.0Z
+000000781602138921046-65535,2020-10-08T07:07:25.0Z
+000000791602139940381-65535,2020-10-08T07:07:25.0Z
+000000801602139944988-65535,2020-10-08T07:07:25.0Z
+000000811602139948294-65535,2020-10-08T07:07:25.0Z
+000000851602140789064-65535,2020-10-08T07:07:25.0Z
+000000871602140793676-65535,2020-10-08T07:07:25.0Z
+000000881602140796951-65535,2020-10-08T07:07:25.0Z
+000000821602110987557-65535,2020-10-08T07:07:25.0Z
+000000831602110992053-65535,2020-10-08T07:07:25.0Z
+000000841602110995259-65535,2020-10-08T07:07:25.0Z
+000000731602140350750-65535,2020-10-08T07:07:25.0Z
+000000741602140355369-65535,2020-10-08T07:07:25.0Z
+000000751602140358711-65535,2020-10-08T07:07:25.0Z
+000000911602138189351-65535,2020-10-08T07:07:25.0Z
+000000901602138184808-65535,2020-10-08T07:07:25.0Z
+000000921602138192687-65535,2020-10-08T07:07:25.0Z
+000000701602139732115-65535,2020-10-08T07:07:25.0Z
+000000711602139736549-65535,2020-10-08T07:07:25.0Z
+000000721602139739807-65535,2020-10-08T07:07:25.0Z
+000000501602140605133-65535,2020-10-08T07:07:25.0Z
+000000541602140609520-65535,2020-10-08T07:07:25.0Z
+000000551602140612810-65535,2020-10-08T07:07:25.0Z
+000000631602109886951-65535,2020-10-08T07:07:25.0Z
+000000651602109891290-65535,2020-10-08T07:07:25.0Z
+000000661602109894526-65535,2020-10-08T07:07:25.0Z
+000000671602140216254-65535,2020-10-08T07:07:25.0Z
+000000681602140220694-65535,2020-10-08T07:07:25.0Z
+000000691602140223978-65535,2020-10-08T07:07:25.0Z
+000000761669082551615-65535,2022-11-22T02:13:05.0Z
+000000771669082555441-65535,2022-11-22T02:13:05.0Z
+000000781669082558861-65535,2022-11-22T02:13:05.0Z
+000000791669082784332-65535,2022-11-22T02:13:05.0Z
+000000801669082788014-65535,2022-11-22T02:13:05.0Z
+000000811669082791326-65535,2022-11-22T02:13:05.0Z
+000000851669081527097-65535,2022-11-22T02:13:05.0Z
+000000871669081530967-65535,2022-11-22T02:13:05.0Z
+000000881669081534681-65535,2022-11-22T02:13:05.0Z
+000000821669082071641-65535,2022-11-22T02:13:05.0Z
+000000831669082075540-65535,2022-11-22T02:13:05.0Z
+000000841669082079052-65535,2022-11-22T02:13:05.0Z
+000000731669083181132-65535,2022-11-22T02:13:05.0Z
+000000741669083185092-65535,2022-11-22T02:13:05.0Z
+000000751669083188600-65535,2022-11-22T02:13:05.0Z
+000000911669082362045-65535,2022-11-22T02:13:05.0Z
+000000901669082358255-65535,2022-11-22T02:13:05.0Z
+000000921669082365554-65535,2022-11-22T02:13:05.0Z
+000000701669082634742-65535,2022-11-22T02:13:05.0Z
+000000711669082638580-65535,2022-11-22T02:13:05.0Z
+000000721669082641964-65535,2022-11-22T02:13:05.0Z
+000000501669081773210-65535,2022-11-22T02:13:05.0Z
+000000541669081776937-65535,2022-11-22T02:13:05.0Z
+000000551669081780286-65535,2022-11-22T02:13:05.0Z
+000000631669081892159-65535,2022-11-22T02:13:05.0Z
+000000651669081895880-65535,2022-11-22T02:13:05.0Z
+000000661669081899289-65535,2022-11-22T02:13:05.0Z
+000000671669082937593-65535,2022-11-22T02:13:05.0Z
+000000681669082941285-65535,2022-11-22T02:13:05.0Z
+000000691669082944549-65535,2022-11-22T02:13:05.0Z
diff --git a/core/src/test/resources/google/registry/tmch/invalid/InvalidSignature-Court-Agent-French-Active.smd b/core/src/test/resources/google/registry/tmch/invalid/InvalidSignature-Court-Agent-French-Active.smd
deleted file mode 100644
index 438830df8..000000000
--- a/core/src/test/resources/google/registry/tmch/invalid/InvalidSignature-Court-Agent-French-Active.smd
+++ /dev/null
@@ -1,108 +0,0 @@
-Marks: Essai & évaluation
-smdID: 0000001791376056505261-65535
-U-labels: essai---évaluation, essai--évaluation, essai-et-évaluation, essai-etévaluation, essai-évaluation, essaiet-évaluation, essaietévaluation, essaiévaluation
-notBefore: 2013-08-09 15:55:05
-notAfter: 2017-07-24 00:00:00
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il9jNDU2
-NmI1My01MGM5LTQyNTktOTkxMC03OWNlNjU1MGU3YTQiPgogIDxzbWQ6aWQ+MDAwMDAwMTc5MTM3
-NjA1NjUwNTI2MS02NTUzNTwvc21kOmlkPgogIDxzbWQ6aXNzdWVySW5mbyBpc3N1ZXJJRD0iNjU1
-MzUiPgogICAgPHNtZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz4KICAgIDxz
-bWQ6ZW1haWw+bm90YXZhaWxhYmxlQGV4YW1wbGUuY29tPC9zbWQ6ZW1haWw+CiAgICA8c21kOnVy
-bD5odHRwOi8vd3d3LmV4YW1wbGUuY29tPC9zbWQ6dXJsPgogICAgPHNtZDp2b2ljZT4rMzIuMDAw
-MDAwPC9zbWQ6dm9pY2U+CiAgPC9zbWQ6aXNzdWVySW5mbz4KICA8c21kOm5vdEJlZm9yZT4yMDEz
-LTA4LTA5VDEzOjU1OjA1LjI2MVo8L3NtZDpub3RCZWZvcmU+CiAgPHNtZDpub3RBZnRlcj4yMDE3
-LTA3LTIzVDIyOjAwOjAwLjAwMFo8L3NtZDpub3RBZnRlcj4KICA8bWFyazptYXJrIHhtbG5zOm1h
-cms9InVybjppZXRmOnBhcmFtczp4bWw6bnM6bWFyay0xLjAiPgogICAgPG1hcms6Y291cnQ+CiAg
-ICAgIDxtYXJrOmlkPjAwMDUyMjEzNzM0Njk4OTkxMzczNDY5ODk5LTY1NTM1PC9tYXJrOmlkPgog
-ICAgICA8bWFyazptYXJrTmFtZT5Fc3NhaSAmYW1wOyDDqXZhbHVhdGlvbjwvbWFyazptYXJrTmFt
-ZT4KICAgICAgPG1hcms6aG9sZGVyIGVudGl0bGVtZW50PSJvd25lciI+CiAgICAgICAgPG1hcms6
-b3JnPkFnZW5jZSBlbiBGcmFuY2U8L21hcms6b3JnPgogICAgICAgIDxtYXJrOmFkZHI+CiAgICAg
-ICAgICA8bWFyazpzdHJlZXQ+MTAgQXZlbnVlIFJvdXNzZWF1eDwvbWFyazpzdHJlZXQ+CiAgICAg
-ICAgICA8bWFyazpjaXR5PlZlcnNhaWxsZXM8L21hcms6Y2l0eT4KICAgICAgICAgIDxtYXJrOnBj
-PjMzMDgxPC9tYXJrOnBjPgogICAgICAgICAgPG1hcms6Y2M+RlI8L21hcms6Y2M+CiAgICAgICAg
-PC9tYXJrOmFkZHI+CiAgICAgIDwvbWFyazpob2xkZXI+CiAgICAgIDxtYXJrOmNvbnRhY3QgdHlw
-ZT0iYWdlbnQiPgogICAgICAgIDxtYXJrOm5hbWU+RnJhbmMgTGVicnVuPC9tYXJrOm5hbWU+CiAg
-ICAgICAgPG1hcms6b3JnPkFnZW5jZSBlbiBGcmFuY2U8L21hcms6b3JnPgogICAgICAgIDxtYXJr
-OmFkZHI+CiAgICAgICAgICA8bWFyazpzdHJlZXQ+MTAgQXZlbnVlIFJvdXNzZWF1eDwvbWFyazpz
-dHJlZXQ+CiAgICAgICAgICA8bWFyazpjaXR5PlZlcnNhaWxsZXM8L21hcms6Y2l0eT4KICAgICAg
-ICAgIDxtYXJrOnBjPjMzMDgxPC9tYXJrOnBjPgogICAgICAgICAgPG1hcms6Y2M+RlI8L21hcms6
-Y2M+CiAgICAgICAgPC9tYXJrOmFkZHI+CiAgICAgICAgPG1hcms6dm9pY2U+KzMzLjEyNTc4MTI1
-MDwvbWFyazp2b2ljZT4KICAgICAgICA8bWFyazpmYXg+KzMzLjEyNTc4MTI1MTwvbWFyazpmYXg+
-CiAgICAgICAgPG1hcms6ZW1haWw+aW5mb0BhZ2VuY2UtZW4tZnJhbmNlLmZyPC9tYXJrOmVtYWls
-PgogICAgICA8L21hcms6Y29udGFjdD4KICAgICAgPG1hcms6bGFiZWw+eG4tLWVzc2FpZXQtdmFs
-dWF0aW9uLWl0YjwvbWFyazpsYWJlbD4KICAgICAgPG1hcms6bGFiZWw+eG4tLWVzc2FpLXZhbHVh
-dGlvbi1nbmI8L21hcms6bGFiZWw+CiAgICAgIDxtYXJrOmxhYmVsPnhuLS1lc3NhaS1ldC12YWx1
-YXRpb24tandiPC9tYXJrOmxhYmVsPgogICAgICA8bWFyazpsYWJlbD54bi0tZXNzYWktZXR2YWx1
-YXRpb24taXRiPC9tYXJrOmxhYmVsPgogICAgICA8bWFyazpsYWJlbD54bi0tZXNzYWktLXZhbHVh
-dGlvbi1ocWI8L21hcms6bGFiZWw+CiAgICAgIDxtYXJrOmxhYmVsPnhuLS1lc3NhaWV0dmFsdWF0
-aW9uLWhxYjwvbWFyazpsYWJlbD4KICAgICAgPG1hcms6bGFiZWw+eG4tLWVzc2FpdmFsdWF0aW9u
-LWZrYjwvbWFyazpsYWJlbD4KICAgICAgPG1hcms6bGFiZWw+eG4tLWVzc2FpLS0tdmFsdWF0aW9u
-LWl0YjwvbWFyazpsYWJlbD4KICAgICAgPG1hcms6Z29vZHNBbmRTZXJ2aWNlcz5JbnN0cnVtZW50
-cyBtdXNpY2F1eDwvbWFyazpnb29kc0FuZFNlcnZpY2VzPgogICAgICA8bWFyazpyZWZOdW0+MTIz
-NDwvbWFyazpyZWZOdW0+CiAgICAgIDxtYXJrOnByb0RhdGU+MjAxMi0xMi0zMVQyMzowMDowMC4w
-MDBaPC9tYXJrOnByb0RhdGU+CiAgICAgIDxtYXJrOmNjPkZSPC9tYXJrOmNjPgogICAgICA8bWFy
-azpjb3VydE5hbWU+Z3VpdGFyZTwvbWFyazpjb3VydE5hbWU+CiAgICA8L21hcms6Y291cnQ+CiAg
-PC9tYXJrOm1hcms+CjxkczpTaWduYXR1cmUgeG1sbnM6ZHM9Imh0dHA6Ly93d3cudzMub3JnLzIw
-MDAvMDkveG1sZHNpZyMiIElkPSJfZTBhNWNlYjktZjE4OS00NmQwLTkxZDAtNTEyNjI2Yzk5ZDQ3
-Ij48ZHM6U2lnbmVkSW5mbz48ZHM6Q2Fub25pY2FsaXphdGlvbk1ldGhvZCBBbGdvcml0aG09Imh0
-dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjxkczpTaWduYXR1cmVNZXRo
-b2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGRzaWctbW9yZSNyc2Et
-c2hhMjU2Ii8+PGRzOlJlZmVyZW5jZSBVUkk9IiNfZDM2ZmYyZDgtZjk3OS00NmQxLTkyZmEtMjIy
-ZDU4ZjVmNjc5Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDov
-L3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48ZHM6VHJh
-bnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4j
-Ii8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3
-LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+UGVrWUFNanV2
-NjBWZFMvUTNtcWRmSW82R2o3cHZIYWZXcTNoOTFjdDdSUT08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6
-UmVmZXJlbmNlPjxkczpSZWZlcmVuY2UgVVJJPSIjXzdmYzBmNTdkLTllMWYtNGZmYS05N2QxLTQ0
-YzhkMTA1YmJjZiI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6
-Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6
-RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxlbmMj
-c2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPjNWc1hyNSttUjV3RWMxdjRPbUR3aXNQT2RxVXBibThs
-NFhkRWlQTWt2VG89PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48L2RzOlNpZ25lZElu
-Zm8+PGRzOlNpZ25hdHVyZVZhbHVlIElkPSJfMDU0OTg0NGEtMWQyZC00YmVmLTg2NDMtMmU3ZjU1
-N2IyMjY4Ij5jOGpFUzBrbldpbnljWnZLb0tPcXh0U2xXQTV5TmxzL0xzUld5U1dWN0lPV3FOc25y
-TEdyN0RYRm1CTDFBWmZpR09QVUkrZVkzVmxFClhiTFJ1QlB6MENpRFNkUnlnU2thSlM0Q1Q1R1Vy
-eDJ0cks0dEVKNUhuQ1R5eUVTYjNBOFVwT1dHUVlhZEw4c3Y2dmQzd05wTDBwU1gKK3lQOUd0NFFD
-ZXlhSWZiaE5tRmxtQ1pZMnZ3UHpkQjRwbzcveGFyMzYrUXl0Nm1ITGdLOHNFaEM2bmJ5YWo1bW5O
-a25Nenk0bVo4OQpvekJ0ZWhnNTFMNUZZU29ENmFjVGsxeGZrSWhVWFhnTmREaVZ2UEsrMjdqdk1q
-eGlrWGNpQXFSd2x2bi9DSlVQdUx2M0RQQkZZNFJSCnV2MWFuZWpxZnVFTGU3VTFPc1FPYTJlT01G
-Yi9DN0N2Wkx5eEZBPT08L2RzOlNpZ25hdHVyZVZhbHVlPjxkczpLZXlJbmZvIElkPSJfN2ZjMGY1
-N2QtOWUxZi00ZmZhLTk3ZDEtNDRjOGQxMDViYmNmIj48ZHM6WDUwOURhdGE+PGRzOlg1MDlDZXJ0
-aWZpY2F0ZT5NSUlGTHpDQ0JCZWdBd0lCQWdJZ0xyQWJldm9hZTUyeTNmNkMydEIwU24zcDdYSm0w
-VDAyRm9neEtDZk5oWG93RFFZSktvWklodmNOCkFRRUxCUUF3ZkRFTE1Ba0dBMVVFQmhNQ1ZWTXhQ
-REE2QmdOVkJBb1RNMGx1ZEdWeWJtVjBJRU52Y25CdmNtRjBhVzl1SUdadmNpQkIKYzNOcFoyNWxa
-Q0JPWVcxbGN5QmhibVFnVG5WdFltVnljekV2TUMwR0ExVUVBeE1tU1VOQlRrNGdWSEpoWkdWdFlY
-SnJJRU5zWldGeQphVzVuYUc5MWMyVWdVR2xzYjNRZ1EwRXdIaGNOTVRNd05qSTJNREF3TURBd1do
-Y05NVGd3TmpJMU1qTTFPVFU1V2pDQmp6RUxNQWtHCkExVUVCaE1DUWtVeElEQWVCZ05WQkFnVEYw
-SnlkWE56Wld4ekxVTmhjR2wwWVd3Z1VtVm5hVzl1TVJFd0R3WURWUVFIRXdoQ2NuVnoKYzJWc2N6
-RVJNQThHQTFVRUNoTUlSR1ZzYjJsMGRHVXhPREEyQmdOVkJBTVRMMGxEUVU1T0lGUk5RMGdnUVhW
-MGFHOXlhWHBsWkNCVQpjbUZrWlcxaGNtc2dVR2xzYjNRZ1ZtRnNhV1JoZEc5eU1JSUJJakFOQmdr
-cWhraUc5dzBCQVFFRkFBT0NBUThBTUlJQkNnS0NBUUVBCnhscDNLcFlIWDNXeUFzRmhTazNMd1dm
-bkdseG5VREZxRlpBM1VvdU1Zai9YaWdiTWtOZUVYSWpsa1JPS1Q0T1BHZlJ4L0xBeVJsUVEKakNN
-djRxaGJrY1gxcDdhcjYzZmxxNFNaTlZjbDE1bDdoMHVUNThGelNmbmx6MHU1cmtIZkpJbUQ0Mytt
-YVAvOGd2MzZGUjI3alc4Ugo5d1k0aGsrV3M0SUIwaUZTZDhTWHYxS3I4dy9KbU1RU0RraXVHK1Jm
-SWl1YndRL2Z5N0VrajVRV2hQWncrbU14TktuSFVMeTN4WXoyCkx3VmZmdGp3VXVlYWN2cU5SQ2tN
-WGxDbE9BRHFmVDhvU1pvZURYZWhIdmxQc0xDZW1HQm9US3Vyc2tJUzY5RjB5UEVINWd6ZTBIK2YK
-OEZST3NJb0tTc1ZRMzRCNFMvam9FNjducHNKUFRkS3NOUEpUeVFJREFRQUJvNElCaHpDQ0FZTXdE
-QVlEVlIwVEFRSC9CQUl3QURBZApCZ05WSFE0RUZnUVVvRnBZNzZwNXlvTkRSR3RRcHpWdVI4MVVX
-UTB3Z2NZR0ExVWRJd1NCdmpDQnU0QVV3NjArcHRZUkFFV0FYRHBYClNvcHQzREVObm5HaGdZQ2tm
-akI4TVFzd0NRWURWUVFHRXdKVlV6RThNRG9HQTFVRUNoTXpTVzUwWlhKdVpYUWdRMjl5Y0c5eVlY
-UnAKYjI0Z1ptOXlJRUZ6YzJsbmJtVmtJRTVoYldWeklHRnVaQ0JPZFcxaVpYSnpNUzh3TFFZRFZR
-UURFeVpKUTBGT1RpQlVjbUZrWlcxaApjbXNnUTJ4bFlYSnBibWRvYjNWelpTQlFhV3h2ZENCRFFZ
-SWdMckFiZXZvYWU1MnkzZjZDMnRCMFNuM3A3WEptMFQwMkZvZ3hLQ2ZOCmhYa3dEZ1lEVlIwUEFR
-SC9CQVFEQWdlQU1EUUdBMVVkSHdRdE1Dc3dLYUFub0NXR0kyaDBkSEE2THk5amNtd3VhV05oYm00
-dWIzSm4KTDNSdFkyaGZjR2xzYjNRdVkzSnNNRVVHQTFVZElBUStNRHd3T2dZREtnTUVNRE13TVFZ
-SUt3WUJCUVVIQWdFV0pXaDBkSEE2THk5MwpkM2N1YVdOaGJtNHViM0puTDNCcGJHOTBYM0psY0c5
-emFYUnZjbmt3RFFZSktvWklodmNOQVFFTEJRQURnZ0VCQUllRFlZSnI2MFczCnk5UXMrM3pSVkk5
-a2VrS29tNXZrSE9hbEIzd0hhWklhQUZZcEk5OHRZMGFWTjlhR09OMHY2V1FGK252ejFLUlpRYkF6
-MDFCWHRhUkoKNG1Qa2FyaGh1TG45TmtCeHA4SFI1cWNjK0tIN2d2NnIvYzBpRzNiQ05KK1FTcjdR
-Zis1TWxNbzZ6TDVVZGRVL1QyamliTVhDai9mMgoxUXczeDlRZ295WExGSjlvemFMZ1E5Uk1rTGxP
-bXprQ0FpWE41QWI0M2FKOWY3TjJnRTJOblJqTkttbUM5QUJRMFRSd0VLVkxoVmwxClVHcUNISjNB
-bEJYV0lYTjVzalBRY0QvK25IZUVYTXhZdmxBeXF4WG9EM01XdFFWajdqMm9xbGFrT0JNZ0c4K3Ey
-cVlsbUJ0czRGTmkKdzc0OElsNTg2SEtCUnF4SHRaZFJLVzJWcWFRPTwvZHM6WDUwOUNlcnRpZmlj
-YXRlPjwvZHM6WDUwOURhdGE+PC9kczpLZXlJbmZvPjwvZHM6U2lnbmF0dXJlPjwvc21kOnNpZ25l
-ZE1hcms+Cg==
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/invalid/InvalidSignature-Trademark-Agent-English-Active.smd b/core/src/test/resources/google/registry/tmch/invalid/InvalidSignature-Trademark-Agent-English-Active.smd
deleted file mode 100644
index 63bfdee49..000000000
--- a/core/src/test/resources/google/registry/tmch/invalid/InvalidSignature-Trademark-Agent-English-Active.smd
+++ /dev/null
@@ -1,109 +0,0 @@
-Marks: Test & Validate
-smdID: 0000001751376056503931-65535
-U-labels: test---validate, test--validate, test-et-validate, test-etvalidate, test-validate, testand-validate, testandvalidate, testet-validate, testetvalidate, testvalidate
-notBefore: 2013-08-09 15:55:03
-notAfter: 2017-07-24 00:00:00
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il84Yzk0
-ZjRmMS1jZTlmLTRjOTAtOTUzMS01MzE1ZDIzY2EzYmQiPgogIDxzbWQ6aWQ+MDAwMDAwMTc1MTM3
-NjA1NjUwMzkzMS02NTUzNTwvc21kOmlkPgogIDxzbWQ6aXNzdWVySW5mbyBpc3N1ZXJJRD0iNjU1
-MzUiPgogICAgPHNtZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz4KICAgIDxz
-bWQ6ZW1haWw+bm90YXZhaWxhYmxlQGV4YW1wbGUuY29tPC9zbWQ6ZW1haWw+CiAgICA8c21kOnVy
-bD5odHRwOi8vd3d3LmV4YW1wbGUuY29tPC9zbWQ6dXJsPgogICAgPHNtZDp2b2ljZT4rMzIuMDAw
-MDAwPC9zbWQ6dm9pY2U+CiAgPC9zbWQ6aXNzdWVySW5mbz4KICA8c21kOm5vdEJlZm9yZT4yMDEz
-LTA4LTA5VDEzOjU1OjAzLjkzMVo8L3NtZDpub3RCZWZvcmU+CiAgPHNtZDpub3RBZnRlcj4yMDE3
-LTA3LTIzVDIyOjAwOjAwLjAwMFo8L3NtZDpub3RBZnRlcj4KICA8bWFyazptYXJrIHhtbG5zOm1h
-cms9InVybjppZXRmOnBhcmFtczp4bWw6bnM6bWFyay0xLjAiPgogICAgPG1hcms6dHJhZGVtYXJr
-PgogICAgICA8bWFyazppZD4wMDA1MjAxMzczNDY4OTczMTM3MzQ2ODk3My02NTUzNTwvbWFyazpp
-ZD4KICAgICAgPG1hcms6bWFya05hbWU+VGVzdCAmYW1wOyBWYWxpZGF0ZTwvbWFyazptYXJrTmFt
-ZT4KICAgICAgPG1hcms6aG9sZGVyIGVudGl0bGVtZW50PSJvd25lciI+CiAgICAgICAgPG1hcms6
-b3JnPkFnIGNvcnBvcmF0aW9uPC9tYXJrOm9yZz4KICAgICAgICA8bWFyazphZGRyPgogICAgICAg
-ICAgPG1hcms6c3RyZWV0PjEzMDUgQnJpZ2h0IEF2ZW51ZTwvbWFyazpzdHJlZXQ+CiAgICAgICAg
-ICA8bWFyazpjaXR5PkFyY2FkaWE8L21hcms6Y2l0eT4KICAgICAgICAgIDxtYXJrOnNwPkNBPC9t
-YXJrOnNwPgogICAgICAgICAgPG1hcms6cGM+OTAwMjg8L21hcms6cGM+CiAgICAgICAgICA8bWFy
-azpjYz5VUzwvbWFyazpjYz4KICAgICAgICA8L21hcms6YWRkcj4KICAgICAgPC9tYXJrOmhvbGRl
-cj4KICAgICAgPG1hcms6Y29udGFjdCB0eXBlPSJhZ2VudCI+CiAgICAgICAgPG1hcms6bmFtZT5U
-b255IEhvbGxhbmQ8L21hcms6bmFtZT4KICAgICAgICA8bWFyazpvcmc+QWcgY29ycG9yYXRpb248
-L21hcms6b3JnPgogICAgICAgIDxtYXJrOmFkZHI+CiAgICAgICAgICA8bWFyazpzdHJlZXQ+MTMw
-NSBCcmlnaHQgQXZlbnVlPC9tYXJrOnN0cmVldD4KICAgICAgICAgIDxtYXJrOmNpdHk+QXJjYWRp
-YTwvbWFyazpjaXR5PgogICAgICAgICAgPG1hcms6c3A+Q0E8L21hcms6c3A+CiAgICAgICAgICA8
-bWFyazpwYz45MDAyODwvbWFyazpwYz4KICAgICAgICAgIDxtYXJrOmNjPlVTPC9tYXJrOmNjPgog
-ICAgICAgIDwvbWFyazphZGRyPgogICAgICAgIDxtYXJrOnZvaWNlPisxLjIwMjU1NjIzMDI8L21h
-cms6dm9pY2U+CiAgICAgICAgPG1hcms6ZmF4PisxLjIwMjU1NjIzMDE8L21hcms6ZmF4PgogICAg
-ICAgIDxtYXJrOmVtYWlsPmluZm9AYWdjb3Jwb3JhdGlvbi5jb208L21hcms6ZW1haWw+CiAgICAg
-IDwvbWFyazpjb250YWN0PgogICAgICA8bWFyazpqdXJpc2RpY3Rpb24+VVM8L21hcms6anVyaXNk
-aWN0aW9uPgogICAgICA8bWFyazpjbGFzcz4xNTwvbWFyazpjbGFzcz4KICAgICAgPG1hcms6bGFi
-ZWw+dGVzdGFuZHZhbGlkYXRlPC9tYXJrOmxhYmVsPgogICAgICA8bWFyazpsYWJlbD50ZXN0LS0t
-dmFsaWRhdGU8L21hcms6bGFiZWw+CiAgICAgIDxtYXJrOmxhYmVsPnRlc3RhbmQtdmFsaWRhdGU8
-L21hcms6bGFiZWw+CiAgICAgIDxtYXJrOmxhYmVsPnRlc3QtZXQtdmFsaWRhdGU8L21hcms6bGFi
-ZWw+CiAgICAgIDxtYXJrOmxhYmVsPnRlc3QtdmFsaWRhdGU8L21hcms6bGFiZWw+CiAgICAgIDxt
-YXJrOmxhYmVsPnRlc3QtLXZhbGlkYXRlPC9tYXJrOmxhYmVsPgogICAgICA8bWFyazpsYWJlbD50
-ZXN0LWV0dmFsaWRhdGU8L21hcms6bGFiZWw+CiAgICAgIDxtYXJrOmxhYmVsPnRlc3RldHZhbGlk
-YXRlPC9tYXJrOmxhYmVsPgogICAgICA8bWFyazpsYWJlbD50ZXN0dmFsaWRhdGU8L21hcms6bGFi
-ZWw+CiAgICAgIDxtYXJrOmxhYmVsPnRlc3RldC12YWxpZGF0ZTwvbWFyazpsYWJlbD4KICAgICAg
-PG1hcms6Z29vZHNBbmRTZXJ2aWNlcz5ndWl0YXI8L21hcms6Z29vZHNBbmRTZXJ2aWNlcz4KICAg
-ICAgPG1hcms6cmVnTnVtPjEyMzQ8L21hcms6cmVnTnVtPgogICAgICA8bWFyazpyZWdEYXRlPjIw
-MTItMTItMzFUMjM6MDA6MDAuMDAwWjwvbWFyazpyZWdEYXRlPgogICAgPC9tYXJrOnRyYWRlbWFy
-az4KICA8L21hcms6bWFyaz4KPGRzOlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0cDovL3d3dy53My5v
-cmcvMjAwMC8wOS94bWxkc2lnIyIgSWQ9Il9kNzE5MmM5NC02MWY2LTRhNTgtYmYwMC00NmQzMTk4
-MmJmM2EiPjxkczpTaWduZWRJbmZvPjxkczpDYW5vbmljYWxpemF0aW9uTWV0aG9kIEFsZ29yaXRo
-bT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PGRzOlNpZ25hdHVy
-ZU1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZHNpZy1tb3Jl
-I3JzYS1zaGEyNTYiLz48ZHM6UmVmZXJlbmNlIFVSST0iI18yMmNlOTgwNi04NjYwLTQ4MzItOWQy
-Ny0xM2E5NjFkMWRhYjMiPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJo
-dHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjZW52ZWxvcGVkLXNpZ25hdHVyZSIvPjxk
-czpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMt
-YzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0dHA6
-Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1ZT53ZFJB
-eE13My9qK2JEalhxQTgzc0QvdC9YTHVmWXk5QzR1VU5JWE1RRnp3PTwvZHM6RGlnZXN0VmFsdWU+
-PC9kczpSZWZlcmVuY2U+PGRzOlJlZmVyZW5jZSBVUkk9IiNfOTUwZDllZTQtM2ZiZS00ZWRjLTkw
-NjktMjE4MzA2ZjgwNzJmIj48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0i
-aHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1z
-PjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3ht
-bGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+S213NFBpbmZvYVNsRlZJS0lDR2pXWStTS0RO
-eHlBUDYxakJFWlQzRzh6ST08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNlPjwvZHM6U2ln
-bmVkSW5mbz48ZHM6U2lnbmF0dXJlVmFsdWUgSWQ9Il9lMDg5M2QwZS1kOGIxLTRlOWYtODgzOC05
-MjY4ZmNjYjQwMTIiPnA2WG9KcklFcWxRMHcvR3h4RFJSQktBdFhyTHR5dm1DTDN4UU9NenFvSTM3
-dEVLc2lWTGNBRXNxcTI0RTNQa1JCekk1RGZhbW10WDEKWjJPS0lwNEN4T2lWSjBMY1hrcVVseEFv
-eitJVS9vRXVranJ4ZTl4cHlqdnFOcU53THdrVTdVenU4Yy9BbW5Ia3E0a2tiMldXYVJ4Swozcmpj
-RHoxV1RpRVZJakw4V2RWQnBUbjRPczZHcWZ6MlZJVnZ1eWVHSmVKZnZBcjBsQUQxUnp5RENET3c5
-dmRNOUM5ZitNM2RGTFQ1CkZvaStDU1lHRTdNMjR5K2JsZTZxMUtMOEw5Rjl4SFMxWkM0cWdBYmps
-bksyRk9nQ3BodTdFdG5pejJleFJZTUwwUlFRanRweHIxTjEKZlYxM0UyTCtRMzZkbnF4TXp1UlJU
-SWViQkpZek95Uk5QTUdWekE9PTwvZHM6U2lnbmF0dXJlVmFsdWU+PGRzOktleUluZm8gSWQ9Il85
-NTBkOWVlNC0zZmJlLTRlZGMtOTA2OS0yMTgzMDZmODA3MmYiPjxkczpYNTA5RGF0YT48ZHM6WDUw
-OUNlcnRpZmljYXRlPk1JSUZMekNDQkJlZ0F3SUJBZ0lnTHJBYmV2b2FlNTJ5M2Y2QzJ0QjBTbjNw
-N1hKbTBUMDJGb2d4S0NmTmhYb3dEUVlKS29aSWh2Y04KQVFFTEJRQXdmREVMTUFrR0ExVUVCaE1D
-VlZNeFBEQTZCZ05WQkFvVE0wbHVkR1Z5Ym1WMElFTnZjbkJ2Y21GMGFXOXVJR1p2Y2lCQgpjM05w
-WjI1bFpDQk9ZVzFsY3lCaGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF4TW1TVU5CVGs0Z1ZISmha
-R1Z0WVhKcklFTnNaV0Z5CmFXNW5hRzkxYzJVZ1VHbHNiM1FnUTBFd0hoY05NVE13TmpJMk1EQXdN
-REF3V2hjTk1UZ3dOakkxTWpNMU9UVTVXakNCanpFTE1Ba0cKQTFVRUJoTUNRa1V4SURBZUJnTlZC
-QWdURjBKeWRYTnpaV3h6TFVOaGNHbDBZV3dnVW1WbmFXOXVNUkV3RHdZRFZRUUhFd2hDY25Wegpj
-MlZzY3pFUk1BOEdBMVVFQ2hNSVJHVnNiMmwwZEdVeE9EQTJCZ05WQkFNVEwwbERRVTVPSUZSTlEw
-Z2dRWFYwYUc5eWFYcGxaQ0JVCmNtRmtaVzFoY21zZ1VHbHNiM1FnVm1Gc2FXUmhkRzl5TUlJQklq
-QU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUEKeGxwM0twWUhYM1d5QXNGaFNr
-M0x3V2ZuR2x4blVERnFGWkEzVW91TVlqL1hpZ2JNa05lRVhJamxrUk9LVDRPUEdmUngvTEF5UmxR
-UQpqQ012NHFoYmtjWDFwN2FyNjNmbHE0U1pOVmNsMTVsN2gwdVQ1OEZ6U2ZubHowdTVya0hmSklt
-RDQzK21hUC84Z3YzNkZSMjdqVzhSCjl3WTRoaytXczRJQjBpRlNkOFNYdjFLcjh3L0ptTVFTRGtp
-dUcrUmZJaXVid1EvZnk3RWtqNVFXaFBadyttTXhOS25IVUx5M3hZejIKTHdWZmZ0andVdWVhY3Zx
-TlJDa01YbENsT0FEcWZUOG9TWm9lRFhlaEh2bFBzTENlbUdCb1RLdXJza0lTNjlGMHlQRUg1Z3pl
-MEgrZgo4RlJPc0lvS1NzVlEzNEI0Uy9qb0U2N25wc0pQVGRLc05QSlR5UUlEQVFBQm80SUJoekND
-QVlNd0RBWURWUjBUQVFIL0JBSXdBREFkCkJnTlZIUTRFRmdRVW9GcFk3NnA1eW9ORFJHdFFwelZ1
-UjgxVVdRMHdnY1lHQTFVZEl3U0J2akNCdTRBVXc2MCtwdFlSQUVXQVhEcFgKU29wdDNERU5ubkdo
-Z1lDa2ZqQjhNUXN3Q1FZRFZRUUdFd0pWVXpFOE1Eb0dBMVVFQ2hNelNXNTBaWEp1WlhRZ1EyOXlj
-Rzl5WVhScApiMjRnWm05eUlFRnpjMmxuYm1Wa0lFNWhiV1Z6SUdGdVpDQk9kVzFpWlhKek1TOHdM
-UVlEVlFRREV5WkpRMEZPVGlCVWNtRmtaVzFoCmNtc2dRMnhsWVhKcGJtZG9iM1Z6WlNCUWFXeHZk
-Q0JEUVlJZ0xyQWJldm9hZTUyeTNmNkMydEIwU24zcDdYSm0wVDAyRm9neEtDZk4KaFhrd0RnWURW
-UjBQQVFIL0JBUURBZ2VBTURRR0ExVWRId1F0TUNzd0thQW5vQ1dHSTJoMGRIQTZMeTlqY213dWFX
-TmhibTR1YjNKbgpMM1J0WTJoZmNHbHNiM1F1WTNKc01FVUdBMVVkSUFRK01Ed3dPZ1lES2dNRU1E
-TXdNUVlJS3dZQkJRVUhBZ0VXSldoMGRIQTZMeTkzCmQzY3VhV05oYm00dWIzSm5MM0JwYkc5MFgz
-SmxjRzl6YVhSdmNua3dEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBSWVEWVlKcjYwVzMKeTlRcysz
-elJWSTlrZWtLb201dmtIT2FsQjN3SGFaSWFBRllwSTk4dFkwYVZOOWFHT04wdjZXUUYrbnZ6MUtS
-WlFiQXowMUJYdGFSSgo0bVBrYXJoaHVMbjlOa0J4cDhIUjVxY2MrS0g3Z3Y2ci9jMGlHM2JDTkor
-UVNyN1FmKzVNbE1vNnpMNVVkZFUvVDJqaWJNWENqL2YyCjFRdzN4OVFnb3lYTEZKOW96YUxnUTlS
-TWtMbE9temtDQWlYTjVBYjQzYUo5ZjdOMmdFMk5uUmpOS21tQzlBQlEwVFJ3RUtWTGhWbDEKVUdx
-Q0hKM0FsQlhXSVhONXNqUFFjRC8rbkhlRVhNeFl2bEF5cXhYb0QzTVd0UVZqN2oyb3FsYWtPQk1n
-RzgrcTJxWWxtQnRzNEZOaQp3NzQ4SWw1ODZIS0JScXhIdFpkUktXMlZxYVE9PC9kczpYNTA5Q2Vy
-dGlmaWNhdGU+PC9kczpYNTA5RGF0YT48L2RzOktleUluZm8+PC9kczpTaWduYXR1cmU+PC9zbWQ6
-c2lnbmVkTWFyaz4K
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/invalid/InvalidSignature-Trademark-Agent-Russian-Active.smd b/core/src/test/resources/google/registry/tmch/invalid/InvalidSignature-Trademark-Agent-Russian-Active.smd
deleted file mode 100644
index 292a47925..000000000
--- a/core/src/test/resources/google/registry/tmch/invalid/InvalidSignature-Trademark-Agent-Russian-Active.smd
+++ /dev/null
@@ -1,109 +0,0 @@
-Marks: суда & ошибки
-smdID: 0000001811376056505653-65535
-U-labels: суда---ошибки, суда--ошибки, суда-и-ошибки, суда-иошибки, суда-ошибки, судаи-ошибки, судаиошибки, судаошибки
-notBefore: 2013-08-09 15:55:05
-notAfter: 2017-07-24 00:00:00
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il83OGUy
-MmEyNy04YjA4LTQ0YjItYTg2Yi04MjI3ZTYxOThjNmQiPgogIDxzbWQ6aWQ+MDAwMDAwMTgxMTM3
-NjA1NjUwNTY1My02NTUzNTwvc21kOmlkPgogIDxzbWQ6aXNzdWVySW5mbyBpc3N1ZXJJRD0iNjU1
-MzUiPgogICAgPHNtZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz4KICAgIDxz
-bWQ6ZW1haWw+bm90YXZhaWxhYmxlQGV4YW1wbGUuY29tPC9zbWQ6ZW1haWw+CiAgICA8c21kOnVy
-bD5odHRwOi8vd3d3LmV4YW1wbGUuY29tPC9zbWQ6dXJsPgogICAgPHNtZDp2b2ljZT4rMzIuMDAw
-MDAwPC9zbWQ6dm9pY2U+CiAgPC9zbWQ6aXNzdWVySW5mbz4KICA8c21kOm5vdEJlZm9yZT4yMDEz
-LTA4LTA5VDEzOjU1OjA1LjY1M1o8L3NtZDpub3RCZWZvcmU+CiAgPHNtZDpub3RBZnRlcj4yMDE3
-LTA3LTIzVDIyOjAwOjAwLjAwMFo8L3NtZDpub3RBZnRlcj4KICA8bWFyazptYXJrIHhtbG5zOm1h
-cms9InVybjppZXRmOnBhcmFtczp4bWw6bnM6bWFyay0xLjAiPgogICAgPG1hcms6dHJhZGVtYXJr
-PgogICAgICA8bWFyazppZD4wMDA1MjQxMzczNDcwNDE5MTM3MzQ3MDQxOS02NTUzNTwvbWFyazpp
-ZD4KICAgICAgPG1hcms6bWFya05hbWU+0YHRg9C00LAgJmFtcDsg0L7RiNC40LHQutC4PC9tYXJr
-Om1hcmtOYW1lPgogICAgICA8bWFyazpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj4KICAgICAg
-ICA8bWFyazpvcmc+0JDQs9C10L3RgtGB0YLQstC+PC9tYXJrOm9yZz4KICAgICAgICA8bWFyazph
-ZGRyPgogICAgICAgICAgPG1hcms6c3RyZWV0PtCf0YDQvtGB0L/QtdC60YIg0JLQtdGA0L3QsNC0
-0YHQutC+0LPQviAxNTwvbWFyazpzdHJlZXQ+CiAgICAgICAgICA8bWFyazpjaXR5PtCc0L7RgdC6
-0LLQsDwvbWFyazpjaXR5PgogICAgICAgICAgPG1hcms6cGM+MTE3NDg1PC9tYXJrOnBjPgogICAg
-ICAgICAgPG1hcms6Y2M+UlU8L21hcms6Y2M+CiAgICAgICAgPC9tYXJrOmFkZHI+CiAgICAgIDwv
-bWFyazpob2xkZXI+CiAgICAgIDxtYXJrOmNvbnRhY3QgdHlwZT0iYWdlbnQiPgogICAgICAgIDxt
-YXJrOm5hbWU+0J3QsNGC0LDQu9GM0Y8g0JDQvdGC0L7QvdC+0LLQsDwvbWFyazpuYW1lPgogICAg
-ICAgIDxtYXJrOm9yZz7QkNCz0LXQvdGC0YHRgtCy0L48L21hcms6b3JnPgogICAgICAgIDxtYXJr
-OmFkZHI+CiAgICAgICAgICA8bWFyazpzdHJlZXQ+0J/RgNC+0YHQv9C10LrRgiDQktC10YDQvdCw
-0LTRgdC60L7Qs9C+IDE1PC9tYXJrOnN0cmVldD4KICAgICAgICAgIDxtYXJrOmNpdHk+0JzQvtGB
-0LrQstCwPC9tYXJrOmNpdHk+CiAgICAgICAgICA8bWFyazpwYz4xMTc0ODU8L21hcms6cGM+CiAg
-ICAgICAgICA8bWFyazpjYz5SVTwvbWFyazpjYz4KICAgICAgICA8L21hcms6YWRkcj4KICAgICAg
-ICA8bWFyazp2b2ljZT4rNy45MTg4MjIxNjc0PC9tYXJrOnZvaWNlPgogICAgICAgIDxtYXJrOmZh
-eD4rNy45MTg4MjIxNjczPC9tYXJrOmZheD4KICAgICAgICA8bWFyazplbWFpbD5pbmZvQGFnZW5j
-eS5ydTwvbWFyazplbWFpbD4KICAgICAgPC9tYXJrOmNvbnRhY3Q+CiAgICAgIDxtYXJrOmp1cmlz
-ZGljdGlvbj5SVTwvbWFyazpqdXJpc2RpY3Rpb24+CiAgICAgIDxtYXJrOmNsYXNzPjE1PC9tYXJr
-OmNsYXNzPgogICAgICA8bWFyazpsYWJlbD54bi0tLS03c2JlandibjNheHUzZDwvbWFyazpsYWJl
-bD4KICAgICAgPG1hcms6bGFiZWw+eG4tLS0tN3NiZWp3YWJwN2F6YXc5ZDwvbWFyazpsYWJlbD4K
-ICAgICAgPG1hcms6bGFiZWw+eG4tLS0tN3NiZWp2YmJwN2F6YXc5ZDwvbWFyazpsYWJlbD4KICAg
-ICAgPG1hcms6bGFiZWw+eG4tLS0tLTZrY2dsMWFicDdhemF3OWQ8L21hcms6bGFiZWw+CiAgICAg
-IDxtYXJrOmxhYmVsPnhuLS0tLS0tNWNkaW42YWJyMWIxYXk1ZTwvbWFyazpsYWJlbD4KICAgICAg
-PG1hcms6bGFiZWw+eG4tLTgwYWNocmFibjNheHUzZDwvbWFyazpsYWJlbD4KICAgICAgPG1hcms6
-bGFiZWw+eG4tLTgwYWNocmJsenZzN2M8L21hcms6bGFiZWw+CiAgICAgIDxtYXJrOmxhYmVsPnhu
-LS0tLS02a2NnbDBhYmJyMWIxYXk1ZTwvbWFyazpsYWJlbD4KICAgICAgPG1hcms6Z29vZHNBbmRT
-ZXJ2aWNlcz7Qs9C40YLQsNGA0LA8L21hcms6Z29vZHNBbmRTZXJ2aWNlcz4KICAgICAgPG1hcms6
-cmVnTnVtPjEyMzQ8L21hcms6cmVnTnVtPgogICAgICA8bWFyazpyZWdEYXRlPjIwMTItMTItMzFU
-MjM6MDA6MDAuMDAwWjwvbWFyazpyZWdEYXRlPgogICAgPC9tYXJrOnRyYWRlbWFyaz4KICA8L21h
-cms6bWFyaz4KPGRzOlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8w
-OS94bWxkc2lnIyIgSWQ9Il83MTc1MjQ5OS1jYTE4LTRhNTAtOTQ1Ni1iYjBmMTU0MTJiMjAiPjxk
-czpTaWduZWRJbmZvPjxkczpDYW5vbmljYWxpemF0aW9uTWV0aG9kIEFsZ29yaXRobT0iaHR0cDov
-L3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PGRzOlNpZ25hdHVyZU1ldGhvZCBB
-bGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZHNpZy1tb3JlI3JzYS1zaGEy
-NTYiLz48ZHM6UmVmZXJlbmNlIFVSST0iI19jNDU2NmI1My01MGM5LTQyNTktOTkxMC03OWNlNjU1
-MGU3YTQiPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3
-LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjZW52ZWxvcGVkLXNpZ25hdHVyZSIvPjxkczpUcmFuc2Zv
-cm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48
-L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMu
-b3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1ZT5ORjRBN2toNzZDUVNY
-Sjh5MGU5SzhvTnNsQ1Z0QldGaEtwbGh3bEM4T0JNPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpSZWZl
-cmVuY2U+PGRzOlJlZmVyZW5jZSBVUkk9IiNfZGExMzFmNjktYWZmMC00M2NmLTg5NjItYjNkMjgx
-N2Q5YmFlIj48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3
-dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdl
-c3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEy
-NTYiLz48ZHM6RGlnZXN0VmFsdWU+RVFaQ3RRdy93UG96aFZhRlVUaitsVEZxa0JjOHBZQ3VQdFcv
-ZEhIVUNQOD08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNlPjwvZHM6U2lnbmVkSW5mbz48
-ZHM6U2lnbmF0dXJlVmFsdWUgSWQ9Il81N2U4ZjU4Yi0xMTVhLTQ2N2UtYTkwMC0yZWRmN2U3MjA4
-MzAiPmtaZEYyV1VRYlg2aENQQzd3NktnRkxtR1UrTktjbVgvSVZuQlR2SEo3Z0J2MFlIbi82NkFl
-N1NkTUZYRE9XUHJLeXdHdSt2VFQ3ZkYKSCttdGlFSWtZanJVdlNyNExXK1lGajIyS2lVcmxHd2hQ
-ZTcxN2dKRkY0ZUxaWUNOcnhCbldIT0kxL0YyQkl4THY4UkhaMlpRZGZ0ZgpkQUdiUGo5ZXBOQVFR
-Ni9uYXF4VmRQNGlDOUtRRFZXMlRoaHNsTlJIc0ZwZGtGK3RmdmUrYStySWdzVGdtTGJTZDZGVUNp
-NCs4dmMzCjJod3BkaWNPQnpOalBqTmYzOTBFWG1FdHRkNmplalNUK0JWSzBmb1B3dDBkb3FPMzhG
-bWVOWG41WGxGWWhneEd5UU5iaXZDbmFlaXEKSWJxano1ZU1MZWp3ZmQrN2NGMUhRQnczQzFrSUlM
-K0xYenBOK1E9PTwvZHM6U2lnbmF0dXJlVmFsdWU+PGRzOktleUluZm8gSWQ9Il9kYTEzMWY2OS1h
-ZmYwLTQzY2YtODk2Mi1iM2QyODE3ZDliYWUiPjxkczpYNTA5RGF0YT48ZHM6WDUwOUNlcnRpZmlj
-YXRlPk1JSUZMekNDQkJlZ0F3SUJBZ0lnTHJBYmV2b2FlNTJ5M2Y2QzJ0QjBTbjNwN1hKbTBUMDJG
-b2d4S0NmTmhYb3dEUVlKS29aSWh2Y04KQVFFTEJRQXdmREVMTUFrR0ExVUVCaE1DVlZNeFBEQTZC
-Z05WQkFvVE0wbHVkR1Z5Ym1WMElFTnZjbkJ2Y21GMGFXOXVJR1p2Y2lCQgpjM05wWjI1bFpDQk9Z
-VzFsY3lCaGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF4TW1TVU5CVGs0Z1ZISmhaR1Z0WVhKcklF
-TnNaV0Z5CmFXNW5hRzkxYzJVZ1VHbHNiM1FnUTBFd0hoY05NVE13TmpJMk1EQXdNREF3V2hjTk1U
-Z3dOakkxTWpNMU9UVTVXakNCanpFTE1Ba0cKQTFVRUJoTUNRa1V4SURBZUJnTlZCQWdURjBKeWRY
-TnpaV3h6TFVOaGNHbDBZV3dnVW1WbmFXOXVNUkV3RHdZRFZRUUhFd2hDY25WegpjMlZzY3pFUk1B
-OEdBMVVFQ2hNSVJHVnNiMmwwZEdVeE9EQTJCZ05WQkFNVEwwbERRVTVPSUZSTlEwZ2dRWFYwYUc5
-eWFYcGxaQ0JVCmNtRmtaVzFoY21zZ1VHbHNiM1FnVm1Gc2FXUmhkRzl5TUlJQklqQU5CZ2txaGtp
-Rzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUEKeGxwM0twWUhYM1d5QXNGaFNrM0x3V2ZuR2x4
-blVERnFGWkEzVW91TVlqL1hpZ2JNa05lRVhJamxrUk9LVDRPUEdmUngvTEF5UmxRUQpqQ012NHFo
-YmtjWDFwN2FyNjNmbHE0U1pOVmNsMTVsN2gwdVQ1OEZ6U2ZubHowdTVya0hmSkltRDQzK21hUC84
-Z3YzNkZSMjdqVzhSCjl3WTRoaytXczRJQjBpRlNkOFNYdjFLcjh3L0ptTVFTRGtpdUcrUmZJaXVi
-d1EvZnk3RWtqNVFXaFBadyttTXhOS25IVUx5M3hZejIKTHdWZmZ0andVdWVhY3ZxTlJDa01YbENs
-T0FEcWZUOG9TWm9lRFhlaEh2bFBzTENlbUdCb1RLdXJza0lTNjlGMHlQRUg1Z3plMEgrZgo4RlJP
-c0lvS1NzVlEzNEI0Uy9qb0U2N25wc0pQVGRLc05QSlR5UUlEQVFBQm80SUJoekNDQVlNd0RBWURW
-UjBUQVFIL0JBSXdBREFkCkJnTlZIUTRFRmdRVW9GcFk3NnA1eW9ORFJHdFFwelZ1UjgxVVdRMHdn
-Y1lHQTFVZEl3U0J2akNCdTRBVXc2MCtwdFlSQUVXQVhEcFgKU29wdDNERU5ubkdoZ1lDa2ZqQjhN
-UXN3Q1FZRFZRUUdFd0pWVXpFOE1Eb0dBMVVFQ2hNelNXNTBaWEp1WlhRZ1EyOXljRzl5WVhScApi
-MjRnWm05eUlFRnpjMmxuYm1Wa0lFNWhiV1Z6SUdGdVpDQk9kVzFpWlhKek1TOHdMUVlEVlFRREV5
-WkpRMEZPVGlCVWNtRmtaVzFoCmNtc2dRMnhsWVhKcGJtZG9iM1Z6WlNCUWFXeHZkQ0JEUVlJZ0xy
-QWJldm9hZTUyeTNmNkMydEIwU24zcDdYSm0wVDAyRm9neEtDZk4KaFhrd0RnWURWUjBQQVFIL0JB
-UURBZ2VBTURRR0ExVWRId1F0TUNzd0thQW5vQ1dHSTJoMGRIQTZMeTlqY213dWFXTmhibTR1YjNK
-bgpMM1J0WTJoZmNHbHNiM1F1WTNKc01FVUdBMVVkSUFRK01Ed3dPZ1lES2dNRU1ETXdNUVlJS3dZ
-QkJRVUhBZ0VXSldoMGRIQTZMeTkzCmQzY3VhV05oYm00dWIzSm5MM0JwYkc5MFgzSmxjRzl6YVhS
-dmNua3dEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBSWVEWVlKcjYwVzMKeTlRcyszelJWSTlrZWtL
-b201dmtIT2FsQjN3SGFaSWFBRllwSTk4dFkwYVZOOWFHT04wdjZXUUYrbnZ6MUtSWlFiQXowMUJY
-dGFSSgo0bVBrYXJoaHVMbjlOa0J4cDhIUjVxY2MrS0g3Z3Y2ci9jMGlHM2JDTkorUVNyN1FmKzVN
-bE1vNnpMNVVkZFUvVDJqaWJNWENqL2YyCjFRdzN4OVFnb3lYTEZKOW96YUxnUTlSTWtMbE9temtD
-QWlYTjVBYjQzYUo5ZjdOMmdFMk5uUmpOS21tQzlBQlEwVFJ3RUtWTGhWbDEKVUdxQ0hKM0FsQlhX
-SVhONXNqUFFjRC8rbkhlRVhNeFl2bEF5cXhYb0QzTVd0UVZqN2oyb3FsYWtPQk1nRzgrcTJxWWxt
-QnRzNEZOaQp3NzQ4SWw1ODZIS0JScXhIdFpkUktXMlZxYVE9PC9kczpYNTA5Q2VydGlmaWNhdGU+
-PC9kczpYNTA5RGF0YT48L2RzOktleUluZm8+PC9kczpTaWduYXR1cmU+PC9zbWQ6c2lnbmVkTWFy
-az4K
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/invalid/InvalidSignature-TreatyStatute-Agent-Chinese-Active.smd b/core/src/test/resources/google/registry/tmch/invalid/InvalidSignature-TreatyStatute-Agent-Chinese-Active.smd
deleted file mode 100644
index 12af94783..000000000
--- a/core/src/test/resources/google/registry/tmch/invalid/InvalidSignature-TreatyStatute-Agent-Chinese-Active.smd
+++ /dev/null
@@ -1,105 +0,0 @@
-Marks: 检查&查询
-smdID: 0000001881376056506522-65535
-U-labels: 检查-查询, 检查和查询, 检查查询
-notBefore: 2013-08-09 15:55:06
-notAfter: 2017-07-24 00:00:00
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il9kMzZm
-ZjJkOC1mOTc5LTQ2ZDEtOTJmYS0yMjJkNThmNWY2NzkiPgogIDxzbWQ6aWQ+MDAwMDAwMTg4MTM3
-NjA1NjUwNjUyMi02NTUzNTwvc21kOmlkPgogIDxzbWQ6aXNzdWVySW5mbyBpc3N1ZXJJRD0iNjU1
-MzUiPgogICAgPHNtZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz4KICAgIDxz
-bWQ6ZW1haWw+bm90YXZhaWxhYmxlQGV4YW1wbGUuY29tPC9zbWQ6ZW1haWw+CiAgICA8c21kOnVy
-bD5odHRwOi8vd3d3LmV4YW1wbGUuY29tPC9zbWQ6dXJsPgogICAgPHNtZDp2b2ljZT4rMzIuMDAw
-MDAwPC9zbWQ6dm9pY2U+CiAgPC9zbWQ6aXNzdWVySW5mbz4KICA8c21kOm5vdEJlZm9yZT4yMDEz
-LTA4LTA5VDEzOjU1OjA2LjUyMlo8L3NtZDpub3RCZWZvcmU+CiAgPHNtZDpub3RBZnRlcj4yMDE3
-LTA3LTIzVDIyOjAwOjAwLjAwMFo8L3NtZDpub3RBZnRlcj4KICA8bWFyazptYXJrIHhtbG5zOm1h
-cms9InVybjppZXRmOnBhcmFtczp4bWw6bnM6bWFyay0xLjAiPgogICAgPG1hcms6dHJlYXR5T3JT
-dGF0dXRlPgogICAgICA8bWFyazppZD4wMDA1MjgxMzczNDczMTkxMTM3MzQ3MzE5MS02NTUzNTwv
-bWFyazppZD4KICAgICAgPG1hcms6bWFya05hbWU+5qOA5p+lJmFtcDvmn6Xor6I8L21hcms6bWFy
-a05hbWU+CiAgICAgIDxtYXJrOmhvbGRlciBlbnRpdGxlbWVudD0ib3duZXIiPgogICAgICAgIDxt
-YXJrOm9yZz7lt6XnqIvlpIQ8L21hcms6b3JnPgogICAgICAgIDxtYXJrOmFkZHI+CiAgICAgICAg
-ICA8bWFyazpzdHJlZXQ+6aaZ5riv5Lic6LevNuWPt++8jDXlj7fmpbzvvIw45Y+35a6kPC9tYXJr
-OnN0cmVldD4KICAgICAgICAgIDxtYXJrOmNpdHk+6Z2S5bKb5biCPC9tYXJrOmNpdHk+CiAgICAg
-ICAgICA8bWFyazpwYz4zNTAwPC9tYXJrOnBjPgogICAgICAgICAgPG1hcms6Y2M+Q048L21hcms6
-Y2M+CiAgICAgICAgPC9tYXJrOmFkZHI+CiAgICAgIDwvbWFyazpob2xkZXI+CiAgICAgIDxtYXJr
-OmNvbnRhY3QgdHlwZT0iYWdlbnQiPgogICAgICAgIDxtYXJrOm5hbWU+5p2O5bCP5pa5PC9tYXJr
-Om5hbWU+CiAgICAgICAgPG1hcms6b3JnPuW3peeoi+WkhDwvbWFyazpvcmc+CiAgICAgICAgPG1h
-cms6YWRkcj4KICAgICAgICAgIDxtYXJrOnN0cmVldD7pppnmuK/kuJzot6825Y+377yMNeWPt+al
-vO+8jDjlj7flrqQ8L21hcms6c3RyZWV0PgogICAgICAgICAgPG1hcms6Y2l0eT7pnZLlspvluII8
-L21hcms6Y2l0eT4KICAgICAgICAgIDxtYXJrOnBjPjM1MDA8L21hcms6cGM+CiAgICAgICAgICA8
-bWFyazpjYz5DTjwvbWFyazpjYz4KICAgICAgICA8L21hcms6YWRkcj4KICAgICAgICA8bWFyazp2
-b2ljZT4rODYuMTA4NDY1NzE3MzwvbWFyazp2b2ljZT4KICAgICAgICA8bWFyazpmYXg+Kzg2LjEw
-ODQ2NTcxNzU8L21hcms6ZmF4PgogICAgICAgIDxtYXJrOmVtYWlsPmluZm9AY2hpbmVzZS1hZ2Vu
-Y3kuY29tPC9tYXJrOmVtYWlsPgogICAgICA8L21hcms6Y29udGFjdD4KICAgICAgPG1hcms6cHJv
-dGVjdGlvbj4KICAgICAgICA8bWFyazpjYz5DTjwvbWFyazpjYz4KICAgICAgICA8bWFyazpydWxp
-bmc+Q048L21hcms6cnVsaW5nPgogICAgICA8L21hcms6cHJvdGVjdGlvbj4KICAgICAgPG1hcms6
-bGFiZWw+eG4tLTB0cjEzNmJiYTc4Zjc4OWo8L21hcms6bGFiZWw+CiAgICAgIDxtYXJrOmxhYmVs
-PnhuLS1qdnZhOTZkaTQwaTwvbWFyazpsYWJlbD4KICAgICAgPG1hcms6bGFiZWw+eG4tLS0tc2g3
-YmI3OGY3ODlqPC9tYXJrOmxhYmVsPgogICAgICA8bWFyazpnb29kc0FuZFNlcnZpY2VzPuS5kOWZ
-qDwvbWFyazpnb29kc0FuZFNlcnZpY2VzPgogICAgICA8bWFyazpyZWZOdW0+MTIzNDwvbWFyazpy
-ZWZOdW0+CiAgICAgIDxtYXJrOnByb0RhdGU+MjAxMy0wMi0wMVQyMzowMDowMC4wMDBaPC9tYXJr
-OnByb0RhdGU+CiAgICAgIDxtYXJrOnRpdGxlPlRlc3QgVHJlYXR5PC9tYXJrOnRpdGxlPgogICAg
-ICA8bWFyazpleGVjRGF0ZT4yMDEzLTAyLTAxVDIzOjAwOjAwLjAwMFo8L21hcms6ZXhlY0RhdGU+
-CiAgICA8L21hcms6dHJlYXR5T3JTdGF0dXRlPgogIDwvbWFyazptYXJrPgo8ZHM6U2lnbmF0dXJl
-IHhtbG5zOmRzPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjIiBJZD0iX2EwY2Ni
-NWJhLTAyNTItNGNiMC05ZGEwLWI0ZGI4YjU5Y2IxMSI+PGRzOlNpZ25lZEluZm8+PGRzOkNhbm9u
-aWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3ht
-bC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJlTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53
-My5vcmcvMjAwMS8wNC94bWxkc2lnLW1vcmUjcnNhLXNoYTI1NiIvPjxkczpSZWZlcmVuY2UgVVJJ
-PSIjXzc4ZTIyYTI3LThiMDgtNDRiMi1hODZiLTgyMjdlNjE5OGM2ZCI+PGRzOlRyYW5zZm9ybXM+
-PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1sZHNp
-ZyNlbnZlbG9wZWQtc2lnbmF0dXJlIi8+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93
-d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6RGln
-ZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxlbmMjc2hh
-MjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPlhaREJSYytJRHU0Zkl5YTNuZXdyYXVwdWdWY2dST2I2OWRy
-U1JxejBUWmM9PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48ZHM6UmVmZXJlbmNlIFVS
-ST0iI19lNjA5ODllNC1iZGIxLTQ4NDctYjRiOC1lZGRlOGIzNDZkZjciPjxkczpUcmFuc2Zvcm1z
-PjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1l
-eGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0
-dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1ZT5w
-RGtqZ1U3aGEvd0xxNC93M202S2ErL0ZVNnRqamN0SG1aNkdNSDVkcTRNPTwvZHM6RGlnZXN0VmFs
-dWU+PC9kczpSZWZlcmVuY2U+PC9kczpTaWduZWRJbmZvPjxkczpTaWduYXR1cmVWYWx1ZSBJZD0i
-XzY2MjZmNGU5LTM0ZjEtNDM0Zi1iOGE2LWYxMGU5MWU0ZjBkZCI+dFN0MElPMWxOY0RISlYzR2VM
-RW01OGNPbW5rbEFnOW9EcGpDNmtibTdsOWNjbWxUZGdIc0NyVWhBSmN0bm9PM3paL01uOWVicUZl
-Ngo5MHlTVCswYWg5NGxTMXFJdkxHZ0kxWnJsWWM3eElwQi9DdktYaWNQaEZTcW0zYVRMLzdmd3p4
-T25xZUNHSFRpVlhsK0kyQ09BV04xCjZ6cWJ3ZXFrN1JSNkxGL3FrS0pKRkRpc1EvZ3hRY2NLZ29w
-T05EVTQwU2xDaStrZ2xONUJtTVVJb3hKREp2VFN4ZnhndFFhd0NKSEEKYm5ZL2h0QndqT2swaU9W
-T1VXQmZGR05XaVpsbEdSWkNqZ2kvVzlsWDF2UnRWRGh2cDMzZmd0TWFSOXhuQTVpM3lPNFAzR0JJ
-bVRpSwordVI2cjVBZDJvSXRSVVVYZjI4R3BhWHhuZXBxRmZ0TS9YY01Ddz09PC9kczpTaWduYXR1
-cmVWYWx1ZT48ZHM6S2V5SW5mbyBJZD0iX2U2MDk4OWU0LWJkYjEtNDg0Ny1iNGI4LWVkZGU4YjM0
-NmRmNyI+PGRzOlg1MDlEYXRhPjxkczpYNTA5Q2VydGlmaWNhdGU+TUlJRkx6Q0NCQmVnQXdJQkFn
-SWdMckFiZXZvYWU1MnkzZjZDMnRCMFNuM3A3WEptMFQwMkZvZ3hLQ2ZOaFhvd0RRWUpLb1pJaHZj
-TgpBUUVMQlFBd2ZERUxNQWtHQTFVRUJoTUNWVk14UERBNkJnTlZCQW9UTTBsdWRHVnlibVYwSUVO
-dmNuQnZjbUYwYVc5dUlHWnZjaUJCCmMzTnBaMjVsWkNCT1lXMWxjeUJoYm1RZ1RuVnRZbVZ5Y3pF
-dk1DMEdBMVVFQXhNbVNVTkJUazRnVkhKaFpHVnRZWEpySUVOc1pXRnkKYVc1bmFHOTFjMlVnVUds
-c2IzUWdRMEV3SGhjTk1UTXdOakkyTURBd01EQXdXaGNOTVRnd05qSTFNak0xT1RVNVdqQ0JqekVM
-TUFrRwpBMVVFQmhNQ1FrVXhJREFlQmdOVkJBZ1RGMEp5ZFhOelpXeHpMVU5oY0dsMFlXd2dVbVZu
-YVc5dU1SRXdEd1lEVlFRSEV3aENjblZ6CmMyVnNjekVSTUE4R0ExVUVDaE1JUkdWc2IybDBkR1V4
-T0RBMkJnTlZCQU1UTDBsRFFVNU9JRlJOUTBnZ1FYVjBhRzl5YVhwbFpDQlUKY21Ga1pXMWhjbXNn
-VUdsc2IzUWdWbUZzYVdSaGRHOXlNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJD
-Z0tDQVFFQQp4bHAzS3BZSFgzV3lBc0ZoU2szTHdXZm5HbHhuVURGcUZaQTNVb3VNWWovWGlnYk1r
-TmVFWElqbGtST0tUNE9QR2ZSeC9MQXlSbFFRCmpDTXY0cWhia2NYMXA3YXI2M2ZscTRTWk5WY2wx
-NWw3aDB1VDU4RnpTZm5sejB1NXJrSGZKSW1ENDMrbWFQLzhndjM2RlIyN2pXOFIKOXdZNGhrK1dz
-NElCMGlGU2Q4U1h2MUtyOHcvSm1NUVNEa2l1RytSZklpdWJ3US9meTdFa2o1UVdoUFp3K21NeE5L
-bkhVTHkzeFl6MgpMd1ZmZnRqd1V1ZWFjdnFOUkNrTVhsQ2xPQURxZlQ4b1Nab2VEWGVoSHZsUHNM
-Q2VtR0JvVEt1cnNrSVM2OUYweVBFSDVnemUwSCtmCjhGUk9zSW9LU3NWUTM0QjRTL2pvRTY3bnBz
-SlBUZEtzTlBKVHlRSURBUUFCbzRJQmh6Q0NBWU13REFZRFZSMFRBUUgvQkFJd0FEQWQKQmdOVkhR
-NEVGZ1FVb0ZwWTc2cDV5b05EUkd0UXB6VnVSODFVV1Ewd2djWUdBMVVkSXdTQnZqQ0J1NEFVdzYw
-K3B0WVJBRVdBWERwWApTb3B0M0RFTm5uR2hnWUNrZmpCOE1Rc3dDUVlEVlFRR0V3SlZVekU4TURv
-R0ExVUVDaE16U1c1MFpYSnVaWFFnUTI5eWNHOXlZWFJwCmIyNGdabTl5SUVGemMybG5ibVZrSUU1
-aGJXVnpJR0Z1WkNCT2RXMWlaWEp6TVM4d0xRWURWUVFERXlaSlEwRk9UaUJVY21Ga1pXMWgKY21z
-Z1EyeGxZWEpwYm1kb2IzVnpaU0JRYVd4dmRDQkRRWUlnTHJBYmV2b2FlNTJ5M2Y2QzJ0QjBTbjNw
-N1hKbTBUMDJGb2d4S0NmTgpoWGt3RGdZRFZSMFBBUUgvQkFRREFnZUFNRFFHQTFVZEh3UXRNQ3N3
-S2FBbm9DV0dJMmgwZEhBNkx5OWpjbXd1YVdOaGJtNHViM0puCkwzUnRZMmhmY0dsc2IzUXVZM0pz
-TUVVR0ExVWRJQVErTUR3d09nWURLZ01FTURNd01RWUlLd1lCQlFVSEFnRVdKV2gwZEhBNkx5OTMK
-ZDNjdWFXTmhibTR1YjNKbkwzQnBiRzkwWDNKbGNHOXphWFJ2Y25rd0RRWUpLb1pJaHZjTkFRRUxC
-UUFEZ2dFQkFJZURZWUpyNjBXMwp5OVFzKzN6UlZJOWtla0tvbTV2a0hPYWxCM3dIYVpJYUFGWXBJ
-OTh0WTBhVk45YUdPTjB2NldRRitudnoxS1JaUWJBejAxQlh0YVJKCjRtUGthcmhodUxuOU5rQnhw
-OEhSNXFjYytLSDdndjZyL2MwaUczYkNOSitRU3I3UWYrNU1sTW82ekw1VWRkVS9UMmppYk1YQ2ov
-ZjIKMVF3M3g5UWdveVhMRko5b3phTGdROVJNa0xsT216a0NBaVhONUFiNDNhSjlmN04yZ0UyTm5S
-ak5LbW1DOUFCUTBUUndFS1ZMaFZsMQpVR3FDSEozQWxCWFdJWE41c2pQUWNELytuSGVFWE14WXZs
-QXlxeFhvRDNNV3RRVmo3ajJvcWxha09CTWdHOCtxMnFZbG1CdHM0Rk5pCnc3NDhJbDU4NkhLQlJx
-eEh0WmRSS1cyVnFhUT08L2RzOlg1MDlDZXJ0aWZpY2F0ZT48L2RzOlg1MDlEYXRhPjwvZHM6S2V5
-SW5mbz48L2RzOlNpZ25hdHVyZT48L3NtZDpzaWduZWRNYXJrPgo=
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/invalid/InvalidSignature-TreatyStatute-Agent-English-Active.smd b/core/src/test/resources/google/registry/tmch/invalid/InvalidSignature-TreatyStatute-Agent-English-Active.smd
deleted file mode 100644
index ae88151a5..000000000
--- a/core/src/test/resources/google/registry/tmch/invalid/InvalidSignature-TreatyStatute-Agent-English-Active.smd
+++ /dev/null
@@ -1,110 +0,0 @@
-Marks: Test & Validate
-smdID: 0000001771376056504712-65535
-U-labels: test---validate, test--validate, test-and-validate, test-andvalidate, test-validate, testand-validate, testandvalidate, testvalidate
-notBefore: 2013-08-09 15:55:04
-notAfter: 2017-07-24 00:00:00
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il8yMmNl
-OTgwNi04NjYwLTQ4MzItOWQyNy0xM2E5NjFkMWRhYjMiPgogIDxzbWQ6aWQ+MDAwMDAwMTc3MTM3
-NjA1NjUwNDcxMi02NTUzNTwvc21kOmlkPgogIDxzbWQ6aXNzdWVySW5mbyBpc3N1ZXJJRD0iNjU1
-MzUiPgogICAgPHNtZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz4KICAgIDxz
-bWQ6ZW1haWw+bm90YXZhaWxhYmxlQGV4YW1wbGUuY29tPC9zbWQ6ZW1haWw+CiAgICA8c21kOnVy
-bD5odHRwOi8vd3d3LmV4YW1wbGUuY29tPC9zbWQ6dXJsPgogICAgPHNtZDp2b2ljZT4rMzIuMDAw
-MDAwPC9zbWQ6dm9pY2U+CiAgPC9zbWQ6aXNzdWVySW5mbz4KICA8c21kOm5vdEJlZm9yZT4yMDEz
-LTA4LTA5VDEzOjU1OjA0LjcxMlo8L3NtZDpub3RCZWZvcmU+CiAgPHNtZDpub3RBZnRlcj4yMDE3
-LTA3LTIzVDIyOjAwOjAwLjAwMFo8L3NtZDpub3RBZnRlcj4KICA8bWFyazptYXJrIHhtbG5zOm1h
-cms9InVybjppZXRmOnBhcmFtczp4bWw6bnM6bWFyay0xLjAiPgogICAgPG1hcms6dHJlYXR5T3JT
-dGF0dXRlPgogICAgICA8bWFyazppZD4wMDA1MjAxMzczNDY5MjQ0MTM3MzQ2OTI0NC02NTUzNTwv
-bWFyazppZD4KICAgICAgPG1hcms6bWFya05hbWU+VGVzdCAmYW1wOyBWYWxpZGF0ZTwvbWFyazpt
-YXJrTmFtZT4KICAgICAgPG1hcms6aG9sZGVyIGVudGl0bGVtZW50PSJvd25lciI+CiAgICAgICAg
-PG1hcms6b3JnPkFnIGNvcnBvcmF0aW9uPC9tYXJrOm9yZz4KICAgICAgICA8bWFyazphZGRyPgog
-ICAgICAgICAgPG1hcms6c3RyZWV0PjEzMDUgQnJpZ2h0IEF2ZW51ZTwvbWFyazpzdHJlZXQ+CiAg
-ICAgICAgICA8bWFyazpjaXR5PkFyY2FkaWE8L21hcms6Y2l0eT4KICAgICAgICAgIDxtYXJrOnNw
-PkNBPC9tYXJrOnNwPgogICAgICAgICAgPG1hcms6cGM+OTAwMjg8L21hcms6cGM+CiAgICAgICAg
-ICA8bWFyazpjYz5VUzwvbWFyazpjYz4KICAgICAgICA8L21hcms6YWRkcj4KICAgICAgPC9tYXJr
-OmhvbGRlcj4KICAgICAgPG1hcms6Y29udGFjdCB0eXBlPSJhZ2VudCI+CiAgICAgICAgPG1hcms6
-bmFtZT5Ub255IEhvbGxhbmQ8L21hcms6bmFtZT4KICAgICAgICA8bWFyazpvcmc+QWcgY29ycG9y
-YXRpb248L21hcms6b3JnPgogICAgICAgIDxtYXJrOmFkZHI+CiAgICAgICAgICA8bWFyazpzdHJl
-ZXQ+MTMwNSBCcmlnaHQgQXZlbnVlPC9tYXJrOnN0cmVldD4KICAgICAgICAgIDxtYXJrOmNpdHk+
-QXJjYWRpYTwvbWFyazpjaXR5PgogICAgICAgICAgPG1hcms6c3A+Q0E8L21hcms6c3A+CiAgICAg
-ICAgICA8bWFyazpwYz45MDAyODwvbWFyazpwYz4KICAgICAgICAgIDxtYXJrOmNjPlVTPC9tYXJr
-OmNjPgogICAgICAgIDwvbWFyazphZGRyPgogICAgICAgIDxtYXJrOnZvaWNlPisxLjIwMjU1NjIz
-MDI8L21hcms6dm9pY2U+CiAgICAgICAgPG1hcms6ZmF4PisxLjIwMjU1NjIzMDE8L21hcms6ZmF4
-PgogICAgICAgIDxtYXJrOmVtYWlsPmluZm9AYWdjb3Jwb3JhdGlvbi5jb208L21hcms6ZW1haWw+
-CiAgICAgIDwvbWFyazpjb250YWN0PgogICAgICA8bWFyazpwcm90ZWN0aW9uPgogICAgICAgIDxt
-YXJrOmNjPlVTPC9tYXJrOmNjPgogICAgICAgIDxtYXJrOnJ1bGluZz5VUzwvbWFyazpydWxpbmc+
-CiAgICAgIDwvbWFyazpwcm90ZWN0aW9uPgogICAgICA8bWFyazpsYWJlbD50ZXN0YW5kdmFsaWRh
-dGU8L21hcms6bGFiZWw+CiAgICAgIDxtYXJrOmxhYmVsPnRlc3QtLS12YWxpZGF0ZTwvbWFyazps
-YWJlbD4KICAgICAgPG1hcms6bGFiZWw+dGVzdGFuZC12YWxpZGF0ZTwvbWFyazpsYWJlbD4KICAg
-ICAgPG1hcms6bGFiZWw+dGVzdC12YWxpZGF0ZTwvbWFyazpsYWJlbD4KICAgICAgPG1hcms6bGFi
-ZWw+dGVzdC1hbmR2YWxpZGF0ZTwvbWFyazpsYWJlbD4KICAgICAgPG1hcms6bGFiZWw+dGVzdC0t
-dmFsaWRhdGU8L21hcms6bGFiZWw+CiAgICAgIDxtYXJrOmxhYmVsPnRlc3R2YWxpZGF0ZTwvbWFy
-azpsYWJlbD4KICAgICAgPG1hcms6bGFiZWw+dGVzdC1hbmQtdmFsaWRhdGU8L21hcms6bGFiZWw+
-CiAgICAgIDxtYXJrOmdvb2RzQW5kU2VydmljZXM+TXVzaWNhbCBpbnN0cnVtZW50czwvbWFyazpn
-b29kc0FuZFNlcnZpY2VzPgogICAgICA8bWFyazpyZWZOdW0+MTIzNDwvbWFyazpyZWZOdW0+CiAg
-ICAgIDxtYXJrOnByb0RhdGU+MjAxMy0wMi0wMVQyMzowMDowMC4wMDBaPC9tYXJrOnByb0RhdGU+
-CiAgICAgIDxtYXJrOnRpdGxlPmd1aXRhcjwvbWFyazp0aXRsZT4KICAgICAgPG1hcms6ZXhlY0Rh
-dGU+MjAxMy0wMi0wMVQyMzowMDowMC4wMDBaPC9tYXJrOmV4ZWNEYXRlPgogICAgPC9tYXJrOnRy
-ZWF0eU9yU3RhdHV0ZT4KICA8L21hcms6bWFyaz4KPGRzOlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0
-cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyIgSWQ9Il81ODg5YzM5Zi1jMzM3LTQ0Nzct
-OTU1Ni05NTNiZTA5Y2NkMTgiPjxkczpTaWduZWRJbmZvPjxkczpDYW5vbmljYWxpemF0aW9uTWV0
-aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+
-PGRzOlNpZ25hdHVyZU1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQv
-eG1sZHNpZy1tb3JlI3JzYS1zaGEyNTYiLz48ZHM6UmVmZXJlbmNlIFVSST0iI184Yzk0ZjRmMS1j
-ZTlmLTRjOTAtOTUzMS01MzE1ZDIzY2EzYmQiPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0g
-QWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjZW52ZWxvcGVkLXNp
-Z25hdHVyZSIvPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAx
-LzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdv
-cml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdl
-c3RWYWx1ZT5IdUdKYlZCWkVaVGlFelB2d0NObVFsNmFMZEExWHo1QzAzdnhDWFBIZW1BPTwvZHM6
-RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PGRzOlJlZmVyZW5jZSBVUkk9IiNfMWRlNTg5OGMt
-NmY3Ny00ZDViLTlkZDgtMzE4MWM5MTE3Yzk3Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3Jt
-IEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9k
-czpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9y
-Zy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+NHBiU0M2M2xObVBxelc3
-TDBNRDBxZ05GNHc5SUE3YXQ3OWxEVE5VZjBndz08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJl
-bmNlPjwvZHM6U2lnbmVkSW5mbz48ZHM6U2lnbmF0dXJlVmFsdWUgSWQ9Il9hODAwZmIwNS02NjRh
-LTQ2OTItYjM5MS04OTM4NTlhNTM0OGQiPlc5VHAxQ09HeEk4dlZQNkZONEdpYlhtc3RRM1Z0bmpS
-ZVN3VVdicFZCTEtmenZ1L1c1OGNoOUdxdnRQTm9HZTdXOXVvQUt0U1J0MUkKMzdPeDIwQmVQb2xG
-dWZmekVVR3NGMHBETkRoWmNiRUdEMlVWRTBpYnhIRkVDUU13d0ppK1NVb2ora3JIWmRXM0FybmNa
-Z0RkMkhXZgpudVJZSmVucnpCS2k2RG1YVlVRYlhXRFVkbGxzcjlDSmtBTHYrd0s2V2RweE9Na0NT
-c2E0WUU2bEVNTjVXNGhzUXFlZ2N6ZGkwdUZ0CnZxQ2JLVnM3RTJ3c0VIZC94aUxzbldZNEUxNWdL
-NnI0UW9tWHJqdFI0ZkFyZ1lMTnRLK09NRCt6UktNeGNuNVF2QzJVeHlzNUV6RHcKNmhlenYrdXBx
-TldkRjRYL2lCNW1JY25DMzAraVBpY3lDb2JHUlE9PTwvZHM6U2lnbmF0dXJlVmFsdWU+PGRzOktl
-eUluZm8gSWQ9Il8xZGU1ODk4Yy02Zjc3LTRkNWItOWRkOC0zMTgxYzkxMTdjOTciPjxkczpYNTA5
-RGF0YT48ZHM6WDUwOUNlcnRpZmljYXRlPk1JSUZMekNDQkJlZ0F3SUJBZ0lnTHJBYmV2b2FlNTJ5
-M2Y2QzJ0QjBTbjNwN1hKbTBUMDJGb2d4S0NmTmhYb3dEUVlKS29aSWh2Y04KQVFFTEJRQXdmREVM
-TUFrR0ExVUVCaE1DVlZNeFBEQTZCZ05WQkFvVE0wbHVkR1Z5Ym1WMElFTnZjbkJ2Y21GMGFXOXVJ
-R1p2Y2lCQgpjM05wWjI1bFpDQk9ZVzFsY3lCaGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF4TW1T
-VU5CVGs0Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5CmFXNW5hRzkxYzJVZ1VHbHNiM1FnUTBFd0hoY05N
-VE13TmpJMk1EQXdNREF3V2hjTk1UZ3dOakkxTWpNMU9UVTVXakNCanpFTE1Ba0cKQTFVRUJoTUNR
-a1V4SURBZUJnTlZCQWdURjBKeWRYTnpaV3h6TFVOaGNHbDBZV3dnVW1WbmFXOXVNUkV3RHdZRFZR
-UUhFd2hDY25WegpjMlZzY3pFUk1BOEdBMVVFQ2hNSVJHVnNiMmwwZEdVeE9EQTJCZ05WQkFNVEww
-bERRVTVPSUZSTlEwZ2dRWFYwYUc5eWFYcGxaQ0JVCmNtRmtaVzFoY21zZ1VHbHNiM1FnVm1Gc2FX
-UmhkRzl5TUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUEKeGxwM0tw
-WUhYM1d5QXNGaFNrM0x3V2ZuR2x4blVERnFGWkEzVW91TVlqL1hpZ2JNa05lRVhJamxrUk9LVDRP
-UEdmUngvTEF5UmxRUQpqQ012NHFoYmtjWDFwN2FyNjNmbHE0U1pOVmNsMTVsN2gwdVQ1OEZ6U2Zu
-bHowdTVya0hmSkltRDQzK21hUC84Z3YzNkZSMjdqVzhSCjl3WTRoaytXczRJQjBpRlNkOFNYdjFL
-cjh3L0ptTVFTRGtpdUcrUmZJaXVid1EvZnk3RWtqNVFXaFBadyttTXhOS25IVUx5M3hZejIKTHdW
-ZmZ0andVdWVhY3ZxTlJDa01YbENsT0FEcWZUOG9TWm9lRFhlaEh2bFBzTENlbUdCb1RLdXJza0lT
-NjlGMHlQRUg1Z3plMEgrZgo4RlJPc0lvS1NzVlEzNEI0Uy9qb0U2N25wc0pQVGRLc05QSlR5UUlE
-QVFBQm80SUJoekNDQVlNd0RBWURWUjBUQVFIL0JBSXdBREFkCkJnTlZIUTRFRmdRVW9GcFk3NnA1
-eW9ORFJHdFFwelZ1UjgxVVdRMHdnY1lHQTFVZEl3U0J2akNCdTRBVXc2MCtwdFlSQUVXQVhEcFgK
-U29wdDNERU5ubkdoZ1lDa2ZqQjhNUXN3Q1FZRFZRUUdFd0pWVXpFOE1Eb0dBMVVFQ2hNelNXNTBa
-WEp1WlhRZ1EyOXljRzl5WVhScApiMjRnWm05eUlFRnpjMmxuYm1Wa0lFNWhiV1Z6SUdGdVpDQk9k
-VzFpWlhKek1TOHdMUVlEVlFRREV5WkpRMEZPVGlCVWNtRmtaVzFoCmNtc2dRMnhsWVhKcGJtZG9i
-M1Z6WlNCUWFXeHZkQ0JEUVlJZ0xyQWJldm9hZTUyeTNmNkMydEIwU24zcDdYSm0wVDAyRm9neEtD
-Zk4KaFhrd0RnWURWUjBQQVFIL0JBUURBZ2VBTURRR0ExVWRId1F0TUNzd0thQW5vQ1dHSTJoMGRI
-QTZMeTlqY213dWFXTmhibTR1YjNKbgpMM1J0WTJoZmNHbHNiM1F1WTNKc01FVUdBMVVkSUFRK01E
-d3dPZ1lES2dNRU1ETXdNUVlJS3dZQkJRVUhBZ0VXSldoMGRIQTZMeTkzCmQzY3VhV05oYm00dWIz
-Sm5MM0JwYkc5MFgzSmxjRzl6YVhSdmNua3dEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBSWVEWVlK
-cjYwVzMKeTlRcyszelJWSTlrZWtLb201dmtIT2FsQjN3SGFaSWFBRllwSTk4dFkwYVZOOWFHT04w
-djZXUUYrbnZ6MUtSWlFiQXowMUJYdGFSSgo0bVBrYXJoaHVMbjlOa0J4cDhIUjVxY2MrS0g3Z3Y2
-ci9jMGlHM2JDTkorUVNyN1FmKzVNbE1vNnpMNVVkZFUvVDJqaWJNWENqL2YyCjFRdzN4OVFnb3lY
-TEZKOW96YUxnUTlSTWtMbE9temtDQWlYTjVBYjQzYUo5ZjdOMmdFMk5uUmpOS21tQzlBQlEwVFJ3
-RUtWTGhWbDEKVUdxQ0hKM0FsQlhXSVhONXNqUFFjRC8rbkhlRVhNeFl2bEF5cXhYb0QzTVd0UVZq
-N2oyb3FsYWtPQk1nRzgrcTJxWWxtQnRzNEZOaQp3NzQ4SWw1ODZIS0JScXhIdFpkUktXMlZxYVE9
-PC9kczpYNTA5Q2VydGlmaWNhdGU+PC9kczpYNTA5RGF0YT48L2RzOktleUluZm8+PC9kczpTaWdu
-YXR1cmU+PC9zbWQ6c2lnbmVkTWFyaz4K
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/revoked/smd/Court-Agent-Arab-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/Court-Agent-Arab-Revoked.smd
deleted file mode 100644
index 8ab6ab5d5..000000000
--- a/core/src/test/resources/google/registry/tmch/revoked/smd/Court-Agent-Arab-Revoked.smd
+++ /dev/null
@@ -1,99 +0,0 @@
-Marks: الاختبار & لتقييم
-smdID: 000000761526319814858-65535
-U-labels: xn------nzeaagpf7azb2ppajr3fa, xn-----btdaafne4a7azpoaiq8ea, xn----ymcaaeld1a4a6onahp3ea, xn--mgbaadjcy1a8mmago8da
-notBefore: 2018-05-14T17:43:34.858Z
-notAfter: 2022-08-18T14:27:18.209Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il8xMGQ0
-ZGIxMS00YjEyLTRjM2QtYTM1MS01NWMzNzZkNDY3YzQiPjxzbWQ6aWQ+MDAwMDAwNzYxNTI2MzE5
-ODE0ODU4LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo0MzozNC44NThaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0xOFQxNDoyNzoxOC4yMDlaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazpj
-b3VydD48bWFyazppZD4wMDAxNDQxNTAzMDY2MDIyMTUwMzA2NjAyMi0xPC9tYXJrOmlkPjxtYXJr
-Om1hcmtOYW1lPtin2YTYp9iu2KrYqNin2LEgJmFtcDsg2YTYqtmC2YrZitmFPC9tYXJrOm1hcmtO
-YW1lPjxtYXJrOmhvbGRlciBlbnRpdGxlbWVudD0ib3duZXIiPjxtYXJrOm9yZz7ZiNmD2KfZhNip
-PC9tYXJrOm9yZz48bWFyazphZGRyPjxtYXJrOnN0cmVldD7YrNi52YHYsSDYp9io2YYg2LPZitmG
-2KfYoSA3NTwvbWFyazpzdHJlZXQ+PG1hcms6Y2l0eT7ZhdmD2YbYp9izPC9tYXJrOmNpdHk+PG1h
-cms6cGM+MjkwMDwvbWFyazpwYz48bWFyazpjYz5NQTwvbWFyazpjYz48L21hcms6YWRkcj48L21h
-cms6aG9sZGVyPjxtYXJrOmNvbnRhY3QgdHlwZT0iYWdlbnQiPjxtYXJrOm5hbWU+2YXZh9mG2K/Y
-syDYp9mE2YXYudmE2YjZhdin2KrZitipPC9tYXJrOm5hbWU+PG1hcms6b3JnPtmI2YPYp9mE2Kk8
-L21hcms6b3JnPjxtYXJrOmFkZHI+PG1hcms6c3RyZWV0Pti02KfYsdi5INis2LnZgdixINin2KjZ
-hiDYs9mK2YbYp9ihIDc1PC9tYXJrOnN0cmVldD48bWFyazpjaXR5PtmF2YPZhtin2LM8L21hcms6
-Y2l0eT48bWFyazpwYz4yOTAwPC9tYXJrOnBjPjxtYXJrOmNjPk1BPC9tYXJrOmNjPjwvbWFyazph
-ZGRyPjxtYXJrOnZvaWNlPisyMTIuNTIyNTM5MDQwPC9tYXJrOnZvaWNlPjxtYXJrOmZheD4rMjEy
-LjUyMjUzOTA0MTwvbWFyazpmYXg+PG1hcms6ZW1haWw+aW5mb0BhZ2VuY3ktbWFyb2Njby5jb208
-L21hcms6ZW1haWw+PC9tYXJrOmNvbnRhY3Q+PG1hcms6bGFiZWw+eG4tLS0tLS1uemVhYWdwZjdh
-emIycHBhanIzZmE8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLS0tLWJ0ZGFhZm5lNGE3YXpw
-b2FpcThlYTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tLS15bWNhYWVsZDFhNGE2b25haHAz
-ZWE8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLW1nYmFhZGpjeTFhOG1tYWdvOGRhPC9tYXJr
-OmxhYmVsPjxtYXJrOmdvb2RzQW5kU2VydmljZXM+2LrZitiq2KfYscKnPC9tYXJrOmdvb2RzQW5k
-U2VydmljZXM+PG1hcms6cmVmTnVtPjEyMzQ8L21hcms6cmVmTnVtPjxtYXJrOnByb0RhdGU+MjAx
-NC0wOS0wOFQwMDowMDowMC4wMDBaPC9tYXJrOnByb0RhdGU+PG1hcms6Y2M+VVM8L21hcms6Y2M+
-PG1hcms6Y291cnROYW1lPtin2YTYr9in2LEg2KfZhNio2YrYttin2KE8L21hcms6Y291cnROYW1l
-PjwvbWFyazpjb3VydD48L21hcms6bWFyaz48ZHM6U2lnbmF0dXJlIHhtbG5zOmRzPSJodHRwOi8v
-d3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjIiBJZD0iXzBiMTA3Y2VhLTI1OTEtNDQwMy1hNTdj
-LTM0YWUwOTQ2YTFlYSI+PGRzOlNpZ25lZEluZm8+PGRzOkNhbm9uaWNhbGl6YXRpb25NZXRob2Qg
-QWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48ZHM6
-U2lnbmF0dXJlTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxk
-c2lnLW1vcmUjcnNhLXNoYTI1NiIvPjxkczpSZWZlcmVuY2UgVVJJPSIjXzEwZDRkYjExLTRiMTIt
-NGMzZC1hMzUxLTU1YzM3NmQ0NjdjNCI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdv
-cml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1sZHNpZyNlbnZlbG9wZWQtc2lnbmF0
-dXJlIi8+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAv
-eG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRo
-bT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxlbmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZh
-bHVlPkJzaGVUVEhxOWJhbDFkWTVWMVFnb0o2QVhrS3F5RmF0Q3ZZUjJCeDhzWXM9PC9kczpEaWdl
-c3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48ZHM6UmVmZXJlbmNlIFVSST0iI18zMmU2MWJhNC0yNDZh
-LTQ3NTUtODZhMi0zZDc5MjI4NDA3MWUiPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxn
-b3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRy
-YW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIw
-MDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1ZT41TUFzSDMzTW9wazRIWkJyWXZU
-SlZUa1ArVEgvWTJJYXoyZmcwRmdhaTNnPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+
-PC9kczpTaWduZWRJbmZvPjxkczpTaWduYXR1cmVWYWx1ZSBJZD0iX2JlN2VjNDQxLWUxYWMtNGM2
-ZC04MWIxLWQ0NzUwYWNlNTUyMSI+RlhKWmFhN3daKy91YzZYUWp5MUFyM0REa1lCYUZndVhiMGE3
-VWVuMk1GYlYvbXpHWDVWL2t2bHhNeGpCN0FmNGVIanB3bHN5Y21aWgpuUjhER2JYRTB2RG9ucmdo
-UUljNTJ5RWZWYmVtRElyT0E4eVJpcGRVZkF2Vmp6bkE2bGhxakpUNDM0ZzNVdFBWYnJaSVV5czl3
-bDN4CkJhU0hocWdqKzFvaDNNZHRORlZ1SHBsWmg5T3BpZENDWnhZaWw4SFBKemJWTFp5Snp2UmFK
-a1ZBaTZwSTgxN0kvOFI0RkhYdTBMeEoKMGtuUXljL09VL1Z0bUNtUDZzdStJdk9VenFTM3hZTTRT
-Z2RhK29wdGk2WlllQWVqLzRoMnByZ2Q5MlB6ZHhDM05qdXJiTm9KUk1JSQp5U1dzMXVSL0h2dkEw
-dFNHeGN4cnVGNFdvUUJJeS9rMUZXNVFwQT09PC9kczpTaWduYXR1cmVWYWx1ZT48ZHM6S2V5SW5m
-byBJZD0iXzMyZTYxYmE0LTI0NmEtNDc1NS04NmEyLTNkNzkyMjg0MDcxZSI+PGRzOlg1MDlEYXRh
-PjxkczpYNTA5Q2VydGlmaWNhdGU+TUlJRk96Q0NCQ09nQXdJQkFnSWdMckFiZXZvYWU1MnkzZjZD
-MnRCMFNuM3A3WEptMFQwMkZvZ3hLQ2ZOaFpjd0RRWUpLb1pJaHZjTgpBUUVMQlFBd2ZERUxNQWtH
-QTFVRUJoTUNWVk14UERBNkJnTlZCQW9UTTBsdWRHVnlibVYwSUVOdmNuQnZjbUYwYVc5dUlHWnZj
-aUJCCmMzTnBaMjVsWkNCT1lXMWxjeUJoYm1RZ1RuVnRZbVZ5Y3pFdk1DMEdBMVVFQXhNbVNVTkJU
-azRnVkhKaFpHVnRZWEpySUVOc1pXRnkKYVc1bmFHOTFjMlVnVUdsc2IzUWdRMEV3SGhjTk1UZ3dN
-akk0TURBd01EQXdXaGNOTWpNd016QXhNak0xT1RVNVdqQ0JqekVMTUFrRwpBMVVFQmhNQ1FrVXhJ
-REFlQmdOVkJBZ1RGMEp5ZFhOelpXeHpMVU5oY0dsMFlXd2dVbVZuYVc5dU1SRXdEd1lEVlFRSEV3
-aENjblZ6CmMyVnNjekVSTUE4R0ExVUVDaE1JUkdWc2IybDBkR1V4T0RBMkJnTlZCQU1UTDBsRFFV
-NU9JRlJOUTBnZ1FYVjBhRzl5YVhwbFpDQlUKY21Ga1pXMWhjbXNnVUdsc2IzUWdWbUZzYVdSaGRH
-OXlNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQQp4bHAzS3BZSFgz
-V3lBc0ZoU2szTHdXZm5HbHhuVURGcUZaQTNVb3VNWWovWGlnYk1rTmVFWElqbGtST0tUNE9QR2ZS
-eC9MQXlSbFFRCmpDTXY0cWhia2NYMXA3YXI2M2ZscTRTWk5WY2wxNWw3aDB1VDU4RnpTZm5sejB1
-NXJrSGZKSW1ENDMrbWFQLzhndjM2RlIyN2pXOFIKOXdZNGhrK1dzNElCMGlGU2Q4U1h2MUtyOHcv
-Sm1NUVNEa2l1RytSZklpdWJ3US9meTdFa2o1UVdoUFp3K21NeE5LbkhVTHkzeFl6MgpMd1ZmZnRq
-d1V1ZWFjdnFOUkNrTVhsQ2xPQURxZlQ4b1Nab2VEWGVoSHZsUHNMQ2VtR0JvVEt1cnNrSVM2OUYw
-eVBFSDVnemUwSCtmCjhGUk9zSW9LU3NWUTM0QjRTL2pvRTY3bnBzSlBUZEtzTlBKVHlRSURBUUFC
-bzRJQmt6Q0NBWTh3REFZRFZSMFRBUUgvQkFJd0FEQWQKQmdOVkhRNEVGZ1FVb0ZwWTc2cDV5b05E
-Ukd0UXB6VnVSODFVV1Ewd2djWUdBMVVkSXdTQnZqQ0J1NEFVdzYwK3B0WVJBRVdBWERwWApTb3B0
-M0RFTm5uR2hnWUNrZmpCOE1Rc3dDUVlEVlFRR0V3SlZVekU4TURvR0ExVUVDaE16U1c1MFpYSnVa
-WFFnUTI5eWNHOXlZWFJwCmIyNGdabTl5SUVGemMybG5ibVZrSUU1aGJXVnpJR0Z1WkNCT2RXMWla
-WEp6TVM4d0xRWURWUVFERXlaSlEwRk9UaUJVY21Ga1pXMWgKY21zZ1EyeGxZWEpwYm1kb2IzVnpa
-U0JRYVd4dmRDQkRRWUlnTHJBYmV2b2FlNTJ5M2Y2QzJ0QjBTbjNwN1hKbTBUMDJGb2d4S0NmTgpo
-WGt3RGdZRFZSMFBBUUgvQkFRREFnZUFNRFFHQTFVZEh3UXRNQ3N3S2FBbm9DV0dJMmgwZEhBNkx5
-OWpjbXd1YVdOaGJtNHViM0puCkwzUnRZMmhmY0dsc2IzUXVZM0pzTUZFR0ExVWRJQVJLTUVnd0VB
-WU9Ld1lCQkFHQ3lSc0JCWU03REFvd05BWUlLd1lCQlFVSEFnRXcKS0RBbUJnZ3JCZ0VGQlFjQ0FS
-WWFhSFIwY0hNNkx5OWpZUzVwWTJGdWJpNXZjbWN2Y0dsc2IzUXdEUVlKS29aSWh2Y05BUUVMQlFB
-RApnZ0VCQUF1aloySWNSMkRWcnRhUnJBNTllTllDbDR4Y3NKTXU4RFFDSHYyOGZUZmkvQmlaWTRJ
-cjdGOWtGeTk2RDdPWjhvTFk1empmCjRkSHhGd0hQcUg4RGg2Sldzelh1SFcxWmEzWG1sMFBhSHhD
-V1JTMFhvbDhXc0hIcE55Z2pNQllmSjBvZFZNODg1VFoxRWw5U2l1RUgKbnluRkJnU21pRmM5OXVR
-ZC9ZRFJadUd2L0EwSHl2N3lSOXRrTEVkRDNBMXVOSkJXNFArSEpHcGRLa1lMMVE1clU3K29IVlB0
-TUtLSQozaUZrVUVzYk80NUFWZDd2UC9qLzdKdEFaUGI2a29PVjVsWmkySDFSTGNjR3d6ZGV6bmhK
-Z2QwTjlvYmIwdm5FNDEvVVNXYWZkV1JaClZHa3dQdXFUaGw3c0N0enJKSDhYWTB4Y3VtK2NmTHgy
-RUFJd1VuT2NhYjQ9PC9kczpYNTA5Q2VydGlmaWNhdGU+PC9kczpYNTA5RGF0YT48L2RzOktleUlu
-Zm8+PC9kczpTaWduYXR1cmU+PC9zbWQ6c2lnbmVkTWFyaz4=
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/revoked/smd/Court-Agent-Chinese-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/Court-Agent-Chinese-Revoked.smd
deleted file mode 100644
index 09d680e06..000000000
--- a/core/src/test/resources/google/registry/tmch/revoked/smd/Court-Agent-Chinese-Revoked.smd
+++ /dev/null
@@ -1,97 +0,0 @@
-Marks: 标记&记录
-smdID: 000000791526319820562-65535
-U-labels: xn----kw3bu0xlr2bba, xn--and-vj3ft79a885cda, xn--w2t96qr64aa
-notBefore: 2018-05-14T17:43:40.562Z
-notAfter: 2022-08-18T14:36:50.931Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il8wYmQw
-MjVkYS0zZDU0LTQ5ZjEtOGQyYS0xNjc3ZTAwOTBiZjIiPjxzbWQ6aWQ+MDAwMDAwNzkxNTI2MzE5
-ODIwNTYyLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo0Mzo0MC41NjJaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0xOFQxNDozNjo1MC45MzFaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazpj
-b3VydD48bWFyazppZD4wMDAxNDYxNTAzMDY2NjMxMTUwMzA2NjYzMS0xPC9tYXJrOmlkPjxtYXJr
-Om1hcmtOYW1lPuagh+iusCZhbXA76K6w5b2VPC9tYXJrOm1hcmtOYW1lPjxtYXJrOmhvbGRlciBl
-bnRpdGxlbWVudD0ib3duZXIiPjxtYXJrOm9yZz7lt6XnqIvlpIQ8L21hcms6b3JnPjxtYXJrOmFk
-ZHI+PG1hcms6c3RyZWV0Pummmea4r+S4nOi3rzblj7fvvIw15Y+35qW877yMOOWPt+WupDwvbWFy
-azpzdHJlZXQ+PG1hcms6Y2l0eT7pnZLlspvluII8L21hcms6Y2l0eT48bWFyazpwYz4zNTAwPC9t
-YXJrOnBjPjxtYXJrOmNjPkNOPC9tYXJrOmNjPjwvbWFyazphZGRyPjwvbWFyazpob2xkZXI+PG1h
-cms6Y29udGFjdCB0eXBlPSJhZ2VudCI+PG1hcms6bmFtZT7mnY7lsI/mlrk8L21hcms6bmFtZT48
-bWFyazpvcmc+5bel56iL5aSEPC9tYXJrOm9yZz48bWFyazphZGRyPjxtYXJrOnN0cmVldD7pppnm
-uK/kuJzot6825Y+377yMNeWPt+alvO+8jDjlj7flrqQ8L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+
-6Z2S5bKb5biCPC9tYXJrOmNpdHk+PG1hcms6cGM+MzUwMDwvbWFyazpwYz48bWFyazpjYz5DTjwv
-bWFyazpjYz48L21hcms6YWRkcj48bWFyazp2b2ljZT4rODYuMTA4NDY1NzE3MzwvbWFyazp2b2lj
-ZT48bWFyazpmYXg+Kzg2LjEwODQ2NTcxNzU8L21hcms6ZmF4PjxtYXJrOmVtYWlsPmluZm9AY2hp
-bmVzZS1hZ2VuY3kuY29tPC9tYXJrOmVtYWlsPjwvbWFyazpjb250YWN0PjxtYXJrOmxhYmVsPnhu
-LS0tLWt3M2J1MHhscjJiYmE8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLWFuZC12ajNmdDc5
-YTg4NWNkYTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tdzJ0OTZxcjY0YWE8L21hcms6bGFi
-ZWw+PG1hcms6Z29vZHNBbmRTZXJ2aWNlcz4g5ZCJ5LuWPC9tYXJrOmdvb2RzQW5kU2VydmljZXM+
-PG1hcms6cmVmTnVtPjEyMzQ8L21hcms6cmVmTnVtPjxtYXJrOnByb0RhdGU+MjAxMy0wMS0wMVQw
-MDowMDowMC4wMDBaPC9tYXJrOnByb0RhdGU+PG1hcms6Y2M+VVM8L21hcms6Y2M+PG1hcms6Y291
-cnROYW1lPkhvdmU8L21hcms6Y291cnROYW1lPjwvbWFyazpjb3VydD48L21hcms6bWFyaz48ZHM6
-U2lnbmF0dXJlIHhtbG5zOmRzPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjIiBJ
-ZD0iX2JjY2RlNjE4LWFlMTgtNDk5ZC1iZmYwLWJhNjk3YmI3M2E2YSI+PGRzOlNpZ25lZEluZm8+
-PGRzOkNhbm9uaWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8y
-MDAxLzEwL3htbC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJlTWV0aG9kIEFsZ29yaXRobT0iaHR0
-cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxkc2lnLW1vcmUjcnNhLXNoYTI1NiIvPjxkczpSZWZl
-cmVuY2UgVVJJPSIjXzBiZDAyNWRhLTNkNTQtNDlmMS04ZDJhLTE2NzdlMDA5MGJmMiI+PGRzOlRy
-YW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDAv
-MDkveG1sZHNpZyNlbnZlbG9wZWQtc2lnbmF0dXJlIi8+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09
-Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jt
-cz48ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94
-bWxlbmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPlJyVDM1cUxZQXJ1YnJIZjFkaDVTcStvcThY
-Z0dyeWdqVi85Y290SVBJWGM9PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48ZHM6UmVm
-ZXJlbmNlIFVSST0iI19iMDhkYzk1NS00NzhhLTRiOWMtOTM2OS1hNTM1MTQ3MWRmOGIiPjxkczpU
-cmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAx
-LzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdv
-cml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdl
-c3RWYWx1ZT5pRFBMSWNTaysyREpSVXlYTVdPRUgwQjVZVld2ZE00RmZjQ2d3bmNMdjdNPTwvZHM6
-RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PC9kczpTaWduZWRJbmZvPjxkczpTaWduYXR1cmVW
-YWx1ZSBJZD0iX2ZhNzFlMmFjLWM2MjYtNGM3ZS04OWJhLTJjMzM5MTc0MTgxZSI+ZUlTL2JvbzVO
-NE0xbzQrNlFaR2pTSmRnL0d3VWs4VXVTakViV1V4M2ZNeEhYVWRVWmRGL0x5RVFqN3V2ZFFFZWY3
-K3BzaWJUSXZsegpiWU1Qa25jSy9NdGF6ZU5xa0RuR1pHWjFnOWg2bFVETk5MaUl1ZHJSMEFIRHlj
-NHhCVHUwWVlyVWFmdVZMeGErWmVJajVCenVkY2VaCjZkV1VFazNFQlZncnlDM2ppWWhCcUc1TGxD
-WHlHOWxPMmdaVDRrbG9KNzRpUFdpNUhjckh5ZVBHeXB4SWFxL083b3lRaTQwR0pwTS8KMDE4eElr
-aUZTWGk5NUYzY0dYUENBOFl4S2FUL2RoRmp3V29jay9HbTRFWGdjK0FLcjFEd255bjA4SGRmRkNl
-aFFCbXVSdGxoNzVNQwpBbWlVVVdMRCtpSmd2VEV2bWQ5RkFManoxaUp3UHZoUlUwcWI3dz09PC9k
-czpTaWduYXR1cmVWYWx1ZT48ZHM6S2V5SW5mbyBJZD0iX2IwOGRjOTU1LTQ3OGEtNGI5Yy05MzY5
-LWE1MzUxNDcxZGY4YiI+PGRzOlg1MDlEYXRhPjxkczpYNTA5Q2VydGlmaWNhdGU+TUlJRk96Q0NC
-Q09nQXdJQkFnSWdMckFiZXZvYWU1MnkzZjZDMnRCMFNuM3A3WEptMFQwMkZvZ3hLQ2ZOaFpjd0RR
-WUpLb1pJaHZjTgpBUUVMQlFBd2ZERUxNQWtHQTFVRUJoTUNWVk14UERBNkJnTlZCQW9UTTBsdWRH
-VnlibVYwSUVOdmNuQnZjbUYwYVc5dUlHWnZjaUJCCmMzTnBaMjVsWkNCT1lXMWxjeUJoYm1RZ1Ru
-VnRZbVZ5Y3pFdk1DMEdBMVVFQXhNbVNVTkJUazRnVkhKaFpHVnRZWEpySUVOc1pXRnkKYVc1bmFH
-OTFjMlVnVUdsc2IzUWdRMEV3SGhjTk1UZ3dNakk0TURBd01EQXdXaGNOTWpNd016QXhNak0xT1RV
-NVdqQ0JqekVMTUFrRwpBMVVFQmhNQ1FrVXhJREFlQmdOVkJBZ1RGMEp5ZFhOelpXeHpMVU5oY0ds
-MFlXd2dVbVZuYVc5dU1SRXdEd1lEVlFRSEV3aENjblZ6CmMyVnNjekVSTUE4R0ExVUVDaE1JUkdW
-c2IybDBkR1V4T0RBMkJnTlZCQU1UTDBsRFFVNU9JRlJOUTBnZ1FYVjBhRzl5YVhwbFpDQlUKY21G
-a1pXMWhjbXNnVUdsc2IzUWdWbUZzYVdSaGRHOXlNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9D
-QVE4QU1JSUJDZ0tDQVFFQQp4bHAzS3BZSFgzV3lBc0ZoU2szTHdXZm5HbHhuVURGcUZaQTNVb3VN
-WWovWGlnYk1rTmVFWElqbGtST0tUNE9QR2ZSeC9MQXlSbFFRCmpDTXY0cWhia2NYMXA3YXI2M2Zs
-cTRTWk5WY2wxNWw3aDB1VDU4RnpTZm5sejB1NXJrSGZKSW1ENDMrbWFQLzhndjM2RlIyN2pXOFIK
-OXdZNGhrK1dzNElCMGlGU2Q4U1h2MUtyOHcvSm1NUVNEa2l1RytSZklpdWJ3US9meTdFa2o1UVdo
-UFp3K21NeE5LbkhVTHkzeFl6MgpMd1ZmZnRqd1V1ZWFjdnFOUkNrTVhsQ2xPQURxZlQ4b1Nab2VE
-WGVoSHZsUHNMQ2VtR0JvVEt1cnNrSVM2OUYweVBFSDVnemUwSCtmCjhGUk9zSW9LU3NWUTM0QjRT
-L2pvRTY3bnBzSlBUZEtzTlBKVHlRSURBUUFCbzRJQmt6Q0NBWTh3REFZRFZSMFRBUUgvQkFJd0FE
-QWQKQmdOVkhRNEVGZ1FVb0ZwWTc2cDV5b05EUkd0UXB6VnVSODFVV1Ewd2djWUdBMVVkSXdTQnZq
-Q0J1NEFVdzYwK3B0WVJBRVdBWERwWApTb3B0M0RFTm5uR2hnWUNrZmpCOE1Rc3dDUVlEVlFRR0V3
-SlZVekU4TURvR0ExVUVDaE16U1c1MFpYSnVaWFFnUTI5eWNHOXlZWFJwCmIyNGdabTl5SUVGemMy
-bG5ibVZrSUU1aGJXVnpJR0Z1WkNCT2RXMWlaWEp6TVM4d0xRWURWUVFERXlaSlEwRk9UaUJVY21G
-a1pXMWgKY21zZ1EyeGxZWEpwYm1kb2IzVnpaU0JRYVd4dmRDQkRRWUlnTHJBYmV2b2FlNTJ5M2Y2
-QzJ0QjBTbjNwN1hKbTBUMDJGb2d4S0NmTgpoWGt3RGdZRFZSMFBBUUgvQkFRREFnZUFNRFFHQTFV
-ZEh3UXRNQ3N3S2FBbm9DV0dJMmgwZEhBNkx5OWpjbXd1YVdOaGJtNHViM0puCkwzUnRZMmhmY0ds
-c2IzUXVZM0pzTUZFR0ExVWRJQVJLTUVnd0VBWU9Ld1lCQkFHQ3lSc0JCWU03REFvd05BWUlLd1lC
-QlFVSEFnRXcKS0RBbUJnZ3JCZ0VGQlFjQ0FSWWFhSFIwY0hNNkx5OWpZUzVwWTJGdWJpNXZjbWN2
-Y0dsc2IzUXdEUVlKS29aSWh2Y05BUUVMQlFBRApnZ0VCQUF1aloySWNSMkRWcnRhUnJBNTllTllD
-bDR4Y3NKTXU4RFFDSHYyOGZUZmkvQmlaWTRJcjdGOWtGeTk2RDdPWjhvTFk1empmCjRkSHhGd0hQ
-cUg4RGg2Sldzelh1SFcxWmEzWG1sMFBhSHhDV1JTMFhvbDhXc0hIcE55Z2pNQllmSjBvZFZNODg1
-VFoxRWw5U2l1RUgKbnluRkJnU21pRmM5OXVRZC9ZRFJadUd2L0EwSHl2N3lSOXRrTEVkRDNBMXVO
-SkJXNFArSEpHcGRLa1lMMVE1clU3K29IVlB0TUtLSQozaUZrVUVzYk80NUFWZDd2UC9qLzdKdEFa
-UGI2a29PVjVsWmkySDFSTGNjR3d6ZGV6bmhKZ2QwTjlvYmIwdm5FNDEvVVNXYWZkV1JaClZHa3dQ
-dXFUaGw3c0N0enJKSDhYWTB4Y3VtK2NmTHgyRUFJd1VuT2NhYjQ9PC9kczpYNTA5Q2VydGlmaWNh
-dGU+PC9kczpYNTA5RGF0YT48L2RzOktleUluZm8+PC9kczpTaWduYXR1cmU+PC9zbWQ6c2lnbmVk
-TWFyaz4=
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/revoked/smd/Court-Agent-English-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/Court-Agent-English-Revoked.smd
deleted file mode 100644
index 9f6698f91..000000000
--- a/core/src/test/resources/google/registry/tmch/revoked/smd/Court-Agent-English-Revoked.smd
+++ /dev/null
@@ -1,100 +0,0 @@
-Marks: Test & Validate
-smdID: 000000851526319831999-65535
-U-labels: test---validate, test--validate, test-and-validate, test-andvalidate, test-validate, testand-validate, testandvalidate, testvalidate
-notBefore: 2018-05-14T17:43:51.999Z
-notAfter: 2022-08-18T14:57:36.681Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il82MWMw
-MjNhYi1mNzdlLTRlMGEtOWVhNy00MGNlMjgxYjY3MjIiPjxzbWQ6aWQ+MDAwMDAwODUxNTI2MzE5
-ODMxOTk5LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo0Mzo1MS45OTlaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0xOFQxNDo1NzozNi42ODFaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazpj
-b3VydD48bWFyazppZD4wMDAxMzcxNTAzMDY3ODY4MTUwMzA2Nzg2OC0xPC9tYXJrOmlkPjxtYXJr
-Om1hcmtOYW1lPlRlc3QgJmFtcDsgVmFsaWRhdGU8L21hcms6bWFya05hbWU+PG1hcms6aG9sZGVy
-IGVudGl0bGVtZW50PSJvd25lciI+PG1hcms6bmFtZT5Ub255IEhvbGxhbmQ8L21hcms6bmFtZT48
-bWFyazpvcmc+QWcgY29ycG9yYXRpb248L21hcms6b3JnPjxtYXJrOmFkZHI+PG1hcms6c3RyZWV0
-PjEzMDUgQnJpZ2h0IEF2ZW51ZTwvbWFyazpzdHJlZXQ+PG1hcms6Y2l0eT5BcmNhZGlhPC9tYXJr
-OmNpdHk+PG1hcms6cGM+OTAwMjg8L21hcms6cGM+PG1hcms6Y2M+VVM8L21hcms6Y2M+PC9tYXJr
-OmFkZHI+PC9tYXJrOmhvbGRlcj48bWFyazpjb250YWN0IHR5cGU9ImFnZW50Ij48bWFyazpuYW1l
-PlRvbnkgSG9sbGFuZDwvbWFyazpuYW1lPjxtYXJrOm9yZz5BZyBjb3Jwb3JhdGlvbjwvbWFyazpv
-cmc+PG1hcms6YWRkcj48bWFyazpzdHJlZXQ+QnJpZ2h0IEF2ZW51ZSAxMzA1IDwvbWFyazpzdHJl
-ZXQ+PG1hcms6Y2l0eT5BcmNhZGlhPC9tYXJrOmNpdHk+PG1hcms6c3A+Q0E8L21hcms6c3A+PG1h
-cms6cGM+OTAwMjg8L21hcms6cGM+PG1hcms6Y2M+VVM8L21hcms6Y2M+PC9tYXJrOmFkZHI+PG1h
-cms6dm9pY2U+KzEuMjAyNTU2MjMwMjwvbWFyazp2b2ljZT48bWFyazpmYXg+KzEuMjAyNTU2MjMw
-MTwvbWFyazpmYXg+PG1hcms6ZW1haWw+aW5mb0BhZ2NvcnBvcmF0aW9uLmNvbTwvbWFyazplbWFp
-bD48L21hcms6Y29udGFjdD48bWFyazpsYWJlbD50ZXN0LS0tdmFsaWRhdGU8L21hcms6bGFiZWw+
-PG1hcms6bGFiZWw+dGVzdC0tdmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+dGVzdC1h
-bmQtdmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+dGVzdC1hbmR2YWxpZGF0ZTwvbWFy
-azpsYWJlbD48bWFyazpsYWJlbD50ZXN0LXZhbGlkYXRlPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVs
-PnRlc3RhbmQtdmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+dGVzdGFuZHZhbGlkYXRl
-PC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnRlc3R2YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazpn
-b29kc0FuZFNlcnZpY2VzPmd1aXRhcjwvbWFyazpnb29kc0FuZFNlcnZpY2VzPjxtYXJrOnJlZk51
-bT4xMjM0PC9tYXJrOnJlZk51bT48bWFyazpwcm9EYXRlPjIwMTMtMDEtMDFUMDA6MDA6MDAuMDAw
-WjwvbWFyazpwcm9EYXRlPjxtYXJrOmNjPlVTPC9tYXJrOmNjPjxtYXJrOmNvdXJ0TmFtZT5Ib3Zl
-PC9tYXJrOmNvdXJ0TmFtZT48L21hcms6Y291cnQ+PC9tYXJrOm1hcms+PGRzOlNpZ25hdHVyZSB4
-bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyIgSWQ9Il9lMmZjMGJk
-Zi0zOTExLTRmZDktYjQ5ZS1hZjhlY2QyYzVkODAiPjxkczpTaWduZWRJbmZvPjxkczpDYW5vbmlj
-YWxpemF0aW9uTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwt
-ZXhjLWMxNG4jIi8+PGRzOlNpZ25hdHVyZU1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMu
-b3JnLzIwMDEvMDQveG1sZHNpZy1tb3JlI3JzYS1zaGEyNTYiLz48ZHM6UmVmZXJlbmNlIFVSST0i
-I182MWMwMjNhYi1mNzdlLTRlMGEtOWVhNy00MGNlMjgxYjY3MjIiPjxkczpUcmFuc2Zvcm1zPjxk
-czpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcj
-ZW52ZWxvcGVkLXNpZ25hdHVyZSIvPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3
-LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2Vz
-dE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1
-NiIvPjxkczpEaWdlc3RWYWx1ZT4zdkJMR2ZPaHdOWHhvekFjMFBPSEFqZUR5cGFBUjB4cVZrQTZi
-VC93TXBBPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PGRzOlJlZmVyZW5jZSBVUkk9
-IiNfNDQ4ZDNlZjgtYzAyYy00NWY1LWFmYjItOGU0ODQwNzE4ZGQ5Ij48ZHM6VHJhbnNmb3Jtcz48
-ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhj
-LWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRw
-Oi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+bjZ3
-SW91M2UzcUpQSWtvVFBySGxZRGlkNkM1NjZHTXkvR1dSeVhCdzgwdz08L2RzOkRpZ2VzdFZhbHVl
-PjwvZHM6UmVmZXJlbmNlPjwvZHM6U2lnbmVkSW5mbz48ZHM6U2lnbmF0dXJlVmFsdWUgSWQ9Il80
-YWM3NmI0NS0xYjc5LTQ3N2MtYWM5Zi05NGY3OTM5OGNlOTQiPk02MzFlbXR2cVhNa2NaS0VxQkww
-eXUwc25vZ2grZS9XQnB6dVdOODA3M3Z4TDBBZVZFbkJZeUE0R2N5WTh2MUlZVytVVDBnNXVkbzcK
-aUNhcmx1MGh1dlk2WTV3eTFyNUg5bW1LeG9FWjRyZitaSExManQwL1Q0YWl2YU03SnRQYU1icmF2
-Y3ViSjFlbzc4ZVFXVHI4cW9PeQo3SE5NY0tkMXJ6N2VUclZXampqaGhQSzI4dVdwU1lJRmdpdk51
-YTh2RmNMWnVBZVZWaEFrQXhubmo4SHFqL3dSRE90S3dGZS85eVJ3CmJmR1g3Z0E1VDA0R3c1WDNC
-S0JoQVFtWDArVDN2alREVzYrRjVZR2pmMkNDMCsxblNDOWtNVjhvUTI3MkRjcjBjNHIzZThCTWl6
-S0oKMU5CaGYrL0p4bEUvcEE3d1NjdWdzYTROcy9pa3BNcDk3OElWR3c9PTwvZHM6U2lnbmF0dXJl
-VmFsdWU+PGRzOktleUluZm8gSWQ9Il80NDhkM2VmOC1jMDJjLTQ1ZjUtYWZiMi04ZTQ4NDA3MThk
-ZDkiPjxkczpYNTA5RGF0YT48ZHM6WDUwOUNlcnRpZmljYXRlPk1JSUZPekNDQkNPZ0F3SUJBZ0ln
-THJBYmV2b2FlNTJ5M2Y2QzJ0QjBTbjNwN1hKbTBUMDJGb2d4S0NmTmhaY3dEUVlKS29aSWh2Y04K
-QVFFTEJRQXdmREVMTUFrR0ExVUVCaE1DVlZNeFBEQTZCZ05WQkFvVE0wbHVkR1Z5Ym1WMElFTnZj
-bkJ2Y21GMGFXOXVJR1p2Y2lCQgpjM05wWjI1bFpDQk9ZVzFsY3lCaGJtUWdUblZ0WW1WeWN6RXZN
-QzBHQTFVRUF4TW1TVU5CVGs0Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5CmFXNW5hRzkxYzJVZ1VHbHNi
-M1FnUTBFd0hoY05NVGd3TWpJNE1EQXdNREF3V2hjTk1qTXdNekF4TWpNMU9UVTVXakNCanpFTE1B
-a0cKQTFVRUJoTUNRa1V4SURBZUJnTlZCQWdURjBKeWRYTnpaV3h6TFVOaGNHbDBZV3dnVW1WbmFX
-OXVNUkV3RHdZRFZRUUhFd2hDY25WegpjMlZzY3pFUk1BOEdBMVVFQ2hNSVJHVnNiMmwwZEdVeE9E
-QTJCZ05WQkFNVEwwbERRVTVPSUZSTlEwZ2dRWFYwYUc5eWFYcGxaQ0JVCmNtRmtaVzFoY21zZ1VH
-bHNiM1FnVm1Gc2FXUmhkRzl5TUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dL
-Q0FRRUEKeGxwM0twWUhYM1d5QXNGaFNrM0x3V2ZuR2x4blVERnFGWkEzVW91TVlqL1hpZ2JNa05l
-RVhJamxrUk9LVDRPUEdmUngvTEF5UmxRUQpqQ012NHFoYmtjWDFwN2FyNjNmbHE0U1pOVmNsMTVs
-N2gwdVQ1OEZ6U2ZubHowdTVya0hmSkltRDQzK21hUC84Z3YzNkZSMjdqVzhSCjl3WTRoaytXczRJ
-QjBpRlNkOFNYdjFLcjh3L0ptTVFTRGtpdUcrUmZJaXVid1EvZnk3RWtqNVFXaFBadyttTXhOS25I
-VUx5M3hZejIKTHdWZmZ0andVdWVhY3ZxTlJDa01YbENsT0FEcWZUOG9TWm9lRFhlaEh2bFBzTENl
-bUdCb1RLdXJza0lTNjlGMHlQRUg1Z3plMEgrZgo4RlJPc0lvS1NzVlEzNEI0Uy9qb0U2N25wc0pQ
-VGRLc05QSlR5UUlEQVFBQm80SUJrekNDQVk4d0RBWURWUjBUQVFIL0JBSXdBREFkCkJnTlZIUTRF
-RmdRVW9GcFk3NnA1eW9ORFJHdFFwelZ1UjgxVVdRMHdnY1lHQTFVZEl3U0J2akNCdTRBVXc2MCtw
-dFlSQUVXQVhEcFgKU29wdDNERU5ubkdoZ1lDa2ZqQjhNUXN3Q1FZRFZRUUdFd0pWVXpFOE1Eb0dB
-MVVFQ2hNelNXNTBaWEp1WlhRZ1EyOXljRzl5WVhScApiMjRnWm05eUlFRnpjMmxuYm1Wa0lFNWhi
-V1Z6SUdGdVpDQk9kVzFpWlhKek1TOHdMUVlEVlFRREV5WkpRMEZPVGlCVWNtRmtaVzFoCmNtc2dR
-MnhsWVhKcGJtZG9iM1Z6WlNCUWFXeHZkQ0JEUVlJZ0xyQWJldm9hZTUyeTNmNkMydEIwU24zcDdY
-Sm0wVDAyRm9neEtDZk4KaFhrd0RnWURWUjBQQVFIL0JBUURBZ2VBTURRR0ExVWRId1F0TUNzd0th
-QW5vQ1dHSTJoMGRIQTZMeTlqY213dWFXTmhibTR1YjNKbgpMM1J0WTJoZmNHbHNiM1F1WTNKc01G
-RUdBMVVkSUFSS01FZ3dFQVlPS3dZQkJBR0N5UnNCQllNN0RBb3dOQVlJS3dZQkJRVUhBZ0V3CktE
-QW1CZ2dyQmdFRkJRY0NBUllhYUhSMGNITTZMeTlqWVM1cFkyRnViaTV2Y21jdmNHbHNiM1F3RFFZ
-SktvWklodmNOQVFFTEJRQUQKZ2dFQkFBdWpaMkljUjJEVnJ0YVJyQTU5ZU5ZQ2w0eGNzSk11OERR
-Q0h2MjhmVGZpL0JpWlk0SXI3RjlrRnk5NkQ3T1o4b0xZNXpqZgo0ZEh4RndIUHFIOERoNkpXc3pY
-dUhXMVphM1htbDBQYUh4Q1dSUzBYb2w4V3NISHBOeWdqTUJZZkowb2RWTTg4NVRaMUVsOVNpdUVI
-Cm55bkZCZ1NtaUZjOTl1UWQvWURSWnVHdi9BMEh5djd5Ujl0a0xFZEQzQTF1TkpCVzRQK0hKR3Bk
-S2tZTDFRNXJVNytvSFZQdE1LS0kKM2lGa1VFc2JPNDVBVmQ3dlAvai83SnRBWlBiNmtvT1Y1bFpp
-MkgxUkxjY0d3emRlem5oSmdkME45b2JiMHZuRTQxL1VTV2FmZFdSWgpWR2t3UHVxVGhsN3NDdHpy
-Skg4WFkweGN1bStjZkx4MkVBSXdVbk9jYWI0PTwvZHM6WDUwOUNlcnRpZmljYXRlPjwvZHM6WDUw
-OURhdGE+PC9kczpLZXlJbmZvPjwvZHM6U2lnbmF0dXJlPjwvc21kOnNpZ25lZE1hcms+
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/revoked/smd/Court-Agent-French-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/Court-Agent-French-Revoked.smd
deleted file mode 100644
index 4fcdb8cbd..000000000
--- a/core/src/test/resources/google/registry/tmch/revoked/smd/Court-Agent-French-Revoked.smd
+++ /dev/null
@@ -1,101 +0,0 @@
-Marks: Essai & évaluation
-smdID: 000000821526319826296-65535
-U-labels: xn--essai---valuation-itb, xn--essai--valuation-hqb, xn--essai-et-valuation-jwb, xn--essai-etvaluation-itb, xn--essai-valuation-gnb, xn--essaiet-valuation-itb, xn--essaietvaluation-hqb, xn--essaivaluation-fkb
-notBefore: 2018-05-14T17:43:46.296Z
-notAfter: 2022-08-18T14:46:53.013Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il9iNjQ5
-YmJiMS1lMmYxLTRkYjQtODZjOC1jM2VjZWZkNTBlYWIiPjxzbWQ6aWQ+MDAwMDAwODIxNTI2MzE5
-ODI2Mjk2LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo0Mzo0Ni4yOTZaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0xOFQxNDo0Njo1My4wMTNaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazpj
-b3VydD48bWFyazppZD4wMDAxMzkxNTAzMDY3MTg5MTUwMzA2NzE4OS0xPC9tYXJrOmlkPjxtYXJr
-Om1hcmtOYW1lPkVzc2FpICZhbXA7IMOpdmFsdWF0aW9uPC9tYXJrOm1hcmtOYW1lPjxtYXJrOmhv
-bGRlciBlbnRpdGxlbWVudD0ib3duZXIiPjxtYXJrOm9yZz5BZ2VuY2UgZW4gRnJhbmNlPC9tYXJr
-Om9yZz48bWFyazphZGRyPjxtYXJrOnN0cmVldD4xMCBBdmVudWUgUm91c3NlYXV4PC9tYXJrOnN0
-cmVldD48bWFyazpjaXR5PlZlcnNhaWxsZXM8L21hcms6Y2l0eT48bWFyazpwYz4zMzA4MTwvbWFy
-azpwYz48bWFyazpjYz5GUjwvbWFyazpjYz48L21hcms6YWRkcj48L21hcms6aG9sZGVyPjxtYXJr
-OmNvbnRhY3QgdHlwZT0iYWdlbnQiPjxtYXJrOm5hbWU+RnJhbmMgTGVicnVuPC9tYXJrOm5hbWU+
-PG1hcms6b3JnPkFnZW5jZSBlbiBGcmFuY2U8L21hcms6b3JnPjxtYXJrOmFkZHI+PG1hcms6c3Ry
-ZWV0PkF2ZW51ZSBSb3Vzc2VhdXggMTAgPC9tYXJrOnN0cmVldD48bWFyazpjaXR5PlZlcnNhaWxs
-ZXM8L21hcms6Y2l0eT48bWFyazpwYz4zMzA4MTwvbWFyazpwYz48bWFyazpjYz5GUjwvbWFyazpj
-Yz48L21hcms6YWRkcj48bWFyazp2b2ljZT4rMzMuMTI1NzgxMjUwPC9tYXJrOnZvaWNlPjxtYXJr
-OmZheD4rMzMuMTI1NzgxMjUxPC9tYXJrOmZheD48bWFyazplbWFpbD5pbmZvQGFnZW5jZS1lbi1m
-cmFuY2UuZnI8L21hcms6ZW1haWw+PC9tYXJrOmNvbnRhY3Q+PG1hcms6bGFiZWw+eG4tLWVzc2Fp
-LS0tdmFsdWF0aW9uLWl0YjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tZXNzYWktLXZhbHVh
-dGlvbi1ocWI8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLWVzc2FpLWV0LXZhbHVhdGlvbi1q
-d2I8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLWVzc2FpLWV0dmFsdWF0aW9uLWl0YjwvbWFy
-azpsYWJlbD48bWFyazpsYWJlbD54bi0tZXNzYWktdmFsdWF0aW9uLWduYjwvbWFyazpsYWJlbD48
-bWFyazpsYWJlbD54bi0tZXNzYWlldC12YWx1YXRpb24taXRiPC9tYXJrOmxhYmVsPjxtYXJrOmxh
-YmVsPnhuLS1lc3NhaWV0dmFsdWF0aW9uLWhxYjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0t
-ZXNzYWl2YWx1YXRpb24tZmtiPC9tYXJrOmxhYmVsPjxtYXJrOmdvb2RzQW5kU2VydmljZXM+Z3Vp
-dGFyPC9tYXJrOmdvb2RzQW5kU2VydmljZXM+PG1hcms6cmVmTnVtPjEyMzQ8L21hcms6cmVmTnVt
-PjxtYXJrOnByb0RhdGU+MjAxMy0wMS0wMVQwMDowMDowMC4wMDBaPC9tYXJrOnByb0RhdGU+PG1h
-cms6Y2M+RlI8L21hcms6Y2M+PG1hcms6Y291cnROYW1lPmd1aXRhcmU8L21hcms6Y291cnROYW1l
-PjwvbWFyazpjb3VydD48L21hcms6bWFyaz48ZHM6U2lnbmF0dXJlIHhtbG5zOmRzPSJodHRwOi8v
-d3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjIiBJZD0iXzNkNzE3NmM2LTgxZjItNDAxZC04NzE4
-LTIwNGZhZTVlODhjYiI+PGRzOlNpZ25lZEluZm8+PGRzOkNhbm9uaWNhbGl6YXRpb25NZXRob2Qg
-QWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48ZHM6
-U2lnbmF0dXJlTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxk
-c2lnLW1vcmUjcnNhLXNoYTI1NiIvPjxkczpSZWZlcmVuY2UgVVJJPSIjX2I2NDliYmIxLWUyZjEt
-NGRiNC04NmM4LWMzZWNlZmQ1MGVhYiI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdv
-cml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1sZHNpZyNlbnZlbG9wZWQtc2lnbmF0
-dXJlIi8+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAv
-eG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRo
-bT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxlbmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZh
-bHVlPlBkTU0rM2tNV2c0emlmQkNHaGpFTmJKOUZ3Z0xRMVhpTU53Y29xTDlEdE09PC9kczpEaWdl
-c3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48ZHM6UmVmZXJlbmNlIFVSST0iI19iMGVmODNjZS05MDkw
-LTRmMmEtODQ3Zi0yYTFkY2ZjYWI3NzUiPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxn
-b3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRy
-YW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIw
-MDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1ZT5OZFBvK3JOb3h2YlhETS9zNXl6
-aEZxM1M1TjdIS0wwYzFBZnhoUks4aVFFPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+
-PC9kczpTaWduZWRJbmZvPjxkczpTaWduYXR1cmVWYWx1ZSBJZD0iX2M3MzFlMzhhLTdkMjItNDhm
-NS1iOWRlLWFlMTNkNjQ3NjljNiI+WEFjMkZKVC9jNjFDbEdic2dvUkxqbHlHa1VRZUlRWHlSem9v
-TW9NdzFMbFRjWXlDb0R4MThEb2xkOUZiSFpDSXZYSVh6VXVRV0JYSQpoMHo3V29KRjBJblhQV1lt
-cGRvdDVRYVVBR3ZRU1BhMEcrdWw2TG83YXFmeGtsWFI0akdCTUZhZzRVMHdsZ3RqS1ZjUlhPODFU
-THBoCnlCT3RrUU1ZWFBFR1RuK0RFaW4vVFU0T1ZpV1haZVd4YkYxTkpMUXZtNkZBRysrMXpxVkEr
-MHMzOXNjOVJ2bnJQNnZNRWgzSUhLNFQKZXRLbUhhcEIxY1A0dmZmQVE0cFFLdWZyb2JXYUd5alJ2
-bFdmQUZXZmpLYXpnRjBoYnVhbjMxR0k3T2FmNk9SMzNLYXFGaTdsQXhCaQpEQ1pUanZtclhBcW1r
-Tll4dGUwM2NzUDd1cHlicHp1ck9mVzBVUT09PC9kczpTaWduYXR1cmVWYWx1ZT48ZHM6S2V5SW5m
-byBJZD0iX2IwZWY4M2NlLTkwOTAtNGYyYS04NDdmLTJhMWRjZmNhYjc3NSI+PGRzOlg1MDlEYXRh
-PjxkczpYNTA5Q2VydGlmaWNhdGU+TUlJRk96Q0NCQ09nQXdJQkFnSWdMckFiZXZvYWU1MnkzZjZD
-MnRCMFNuM3A3WEptMFQwMkZvZ3hLQ2ZOaFpjd0RRWUpLb1pJaHZjTgpBUUVMQlFBd2ZERUxNQWtH
-QTFVRUJoTUNWVk14UERBNkJnTlZCQW9UTTBsdWRHVnlibVYwSUVOdmNuQnZjbUYwYVc5dUlHWnZj
-aUJCCmMzTnBaMjVsWkNCT1lXMWxjeUJoYm1RZ1RuVnRZbVZ5Y3pFdk1DMEdBMVVFQXhNbVNVTkJU
-azRnVkhKaFpHVnRZWEpySUVOc1pXRnkKYVc1bmFHOTFjMlVnVUdsc2IzUWdRMEV3SGhjTk1UZ3dN
-akk0TURBd01EQXdXaGNOTWpNd016QXhNak0xT1RVNVdqQ0JqekVMTUFrRwpBMVVFQmhNQ1FrVXhJ
-REFlQmdOVkJBZ1RGMEp5ZFhOelpXeHpMVU5oY0dsMFlXd2dVbVZuYVc5dU1SRXdEd1lEVlFRSEV3
-aENjblZ6CmMyVnNjekVSTUE4R0ExVUVDaE1JUkdWc2IybDBkR1V4T0RBMkJnTlZCQU1UTDBsRFFV
-NU9JRlJOUTBnZ1FYVjBhRzl5YVhwbFpDQlUKY21Ga1pXMWhjbXNnVUdsc2IzUWdWbUZzYVdSaGRH
-OXlNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQQp4bHAzS3BZSFgz
-V3lBc0ZoU2szTHdXZm5HbHhuVURGcUZaQTNVb3VNWWovWGlnYk1rTmVFWElqbGtST0tUNE9QR2ZS
-eC9MQXlSbFFRCmpDTXY0cWhia2NYMXA3YXI2M2ZscTRTWk5WY2wxNWw3aDB1VDU4RnpTZm5sejB1
-NXJrSGZKSW1ENDMrbWFQLzhndjM2RlIyN2pXOFIKOXdZNGhrK1dzNElCMGlGU2Q4U1h2MUtyOHcv
-Sm1NUVNEa2l1RytSZklpdWJ3US9meTdFa2o1UVdoUFp3K21NeE5LbkhVTHkzeFl6MgpMd1ZmZnRq
-d1V1ZWFjdnFOUkNrTVhsQ2xPQURxZlQ4b1Nab2VEWGVoSHZsUHNMQ2VtR0JvVEt1cnNrSVM2OUYw
-eVBFSDVnemUwSCtmCjhGUk9zSW9LU3NWUTM0QjRTL2pvRTY3bnBzSlBUZEtzTlBKVHlRSURBUUFC
-bzRJQmt6Q0NBWTh3REFZRFZSMFRBUUgvQkFJd0FEQWQKQmdOVkhRNEVGZ1FVb0ZwWTc2cDV5b05E
-Ukd0UXB6VnVSODFVV1Ewd2djWUdBMVVkSXdTQnZqQ0J1NEFVdzYwK3B0WVJBRVdBWERwWApTb3B0
-M0RFTm5uR2hnWUNrZmpCOE1Rc3dDUVlEVlFRR0V3SlZVekU4TURvR0ExVUVDaE16U1c1MFpYSnVa
-WFFnUTI5eWNHOXlZWFJwCmIyNGdabTl5SUVGemMybG5ibVZrSUU1aGJXVnpJR0Z1WkNCT2RXMWla
-WEp6TVM4d0xRWURWUVFERXlaSlEwRk9UaUJVY21Ga1pXMWgKY21zZ1EyeGxZWEpwYm1kb2IzVnpa
-U0JRYVd4dmRDQkRRWUlnTHJBYmV2b2FlNTJ5M2Y2QzJ0QjBTbjNwN1hKbTBUMDJGb2d4S0NmTgpo
-WGt3RGdZRFZSMFBBUUgvQkFRREFnZUFNRFFHQTFVZEh3UXRNQ3N3S2FBbm9DV0dJMmgwZEhBNkx5
-OWpjbXd1YVdOaGJtNHViM0puCkwzUnRZMmhmY0dsc2IzUXVZM0pzTUZFR0ExVWRJQVJLTUVnd0VB
-WU9Ld1lCQkFHQ3lSc0JCWU03REFvd05BWUlLd1lCQlFVSEFnRXcKS0RBbUJnZ3JCZ0VGQlFjQ0FS
-WWFhSFIwY0hNNkx5OWpZUzVwWTJGdWJpNXZjbWN2Y0dsc2IzUXdEUVlKS29aSWh2Y05BUUVMQlFB
-RApnZ0VCQUF1aloySWNSMkRWcnRhUnJBNTllTllDbDR4Y3NKTXU4RFFDSHYyOGZUZmkvQmlaWTRJ
-cjdGOWtGeTk2RDdPWjhvTFk1empmCjRkSHhGd0hQcUg4RGg2Sldzelh1SFcxWmEzWG1sMFBhSHhD
-V1JTMFhvbDhXc0hIcE55Z2pNQllmSjBvZFZNODg1VFoxRWw5U2l1RUgKbnluRkJnU21pRmM5OXVR
-ZC9ZRFJadUd2L0EwSHl2N3lSOXRrTEVkRDNBMXVOSkJXNFArSEpHcGRLa1lMMVE1clU3K29IVlB0
-TUtLSQozaUZrVUVzYk80NUFWZDd2UC9qLzdKdEFaUGI2a29PVjVsWmkySDFSTGNjR3d6ZGV6bmhK
-Z2QwTjlvYmIwdm5FNDEvVVNXYWZkV1JaClZHa3dQdXFUaGw3c0N0enJKSDhYWTB4Y3VtK2NmTHgy
-RUFJd1VuT2NhYjQ9PC9kczpYNTA5Q2VydGlmaWNhdGU+PC9kczpYNTA5RGF0YT48L2RzOktleUlu
-Zm8+PC9kczpTaWduYXR1cmU+PC9zbWQ6c2lnbmVkTWFyaz4=
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/revoked/smd/Court-Agent-Russian-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/Court-Agent-Russian-Revoked.smd
deleted file mode 100644
index 4703d5eb0..000000000
--- a/core/src/test/resources/google/registry/tmch/revoked/smd/Court-Agent-Russian-Revoked.smd
+++ /dev/null
@@ -1,102 +0,0 @@
-Marks: Марк & записи
-smdID: 000000731526319809137-65535
-U-labels: xn------5cdd5bials4bfv, xn-----6kcc8ahakq0bft, xn---and--3vef9ckanw2cfz, xn---and-43de2cjamu8bfx, xn----7sbb1agajo6afr, xn--and--43de2cjamu8bfx, xn--and-5cdd5bials4bfv, xn--80aaufaim2afp
-notBefore: 2018-05-14T17:43:29.137Z
-notAfter: 2022-08-18T14:16:55.554Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il9kODA1
-NWFhMy1jNzUwLTQ5ZDMtYWNkYi1mMjY1NzFmNGQyNzYiPjxzbWQ6aWQ+MDAwMDAwNzMxNTI2MzE5
-ODA5MTM3LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo0MzoyOS4xMzdaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0xOFQxNDoxNjo1NS41NTRaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazpj
-b3VydD48bWFyazppZD4wMDAxNDExNTAzMDY1MzU1MTUwMzA2NTM1NS0xPC9tYXJrOmlkPjxtYXJr
-Om1hcmtOYW1lPtCc0LDRgNC6ICZhbXA7INC30LDQv9C40YHQuDwvbWFyazptYXJrTmFtZT48bWFy
-azpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpvcmc+0JDQs9C10L3RgtGB0YLQstC+
-PC9tYXJrOm9yZz48bWFyazphZGRyPjxtYXJrOnN0cmVldD7Qn9GA0L7RgdC/0LXQutGCINCS0LXR
-gNC90LDQtNGB0LrQvtCz0L4gMTU8L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+0JzQvtGB0LrQstCw
-PC9tYXJrOmNpdHk+PG1hcms6cGM+MTE3NDg1PC9tYXJrOnBjPjxtYXJrOmNjPlJVPC9tYXJrOmNj
-PjwvbWFyazphZGRyPjwvbWFyazpob2xkZXI+PG1hcms6Y29udGFjdCB0eXBlPSJhZ2VudCI+PG1h
-cms6bmFtZT7QndCw0YLQsNC70YzRjyDQkNC90YLQvtC90L7QstCwPC9tYXJrOm5hbWU+PG1hcms6
-b3JnPtCQ0LPQtdC90YLRgdGC0LLQvjwvbWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpzdHJlZXQ+
-0J/RgNC+0YHQv9C10LrRgiDQktC10YDQvdCw0LTRgdC60L7Qs9C+IDE1PC9tYXJrOnN0cmVldD48
-bWFyazpjaXR5PtCc0L7RgdC60LLQsDwvbWFyazpjaXR5PjxtYXJrOnBjPjExNzQ4NTwvbWFyazpw
-Yz48bWFyazpjYz5SVTwvbWFyazpjYz48L21hcms6YWRkcj48bWFyazp2b2ljZT4rNy45MTg4MjIx
-Njc0PC9tYXJrOnZvaWNlPjxtYXJrOmZheD4rNy45MTg4MjIxNjczPC9tYXJrOmZheD48bWFyazpl
-bWFpbD5pbmZvQGFnZW5jeS5ydTwvbWFyazplbWFpbD48L21hcms6Y29udGFjdD48bWFyazpsYWJl
-bD54bi0tLS0tLTVjZGQ1YmlhbHM0YmZ2PC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS0tLS02
-a2NjOGFoYWtxMGJmdDwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tLWFuZC0tM3ZlZjlja2Fu
-dzJjZno8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLS1hbmQtNDNkZTJjamFtdThiZng8L21h
-cms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLS0tN3NiYjFhZ2FqbzZhZnI8L21hcms6bGFiZWw+PG1h
-cms6bGFiZWw+eG4tLWFuZC0tNDNkZTJjamFtdThiZng8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+
-eG4tLWFuZC01Y2RkNWJpYWxzNGJmdjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tODBhYXVm
-YWltMmFmcDwvbWFyazpsYWJlbD48bWFyazpnb29kc0FuZFNlcnZpY2VzPtCz0LjRgtCw0YDQsCA8
-L21hcms6Z29vZHNBbmRTZXJ2aWNlcz48bWFyazpyZWZOdW0+MTIzNDwvbWFyazpyZWZOdW0+PG1h
-cms6cHJvRGF0ZT4yMDEzLTAxLTAxVDAwOjAwOjAwLjAwMFo8L21hcms6cHJvRGF0ZT48bWFyazpj
-Yz5VUzwvbWFyazpjYz48bWFyazpjb3VydE5hbWU+SG92ZTwvbWFyazpjb3VydE5hbWU+PC9tYXJr
-OmNvdXJ0PjwvbWFyazptYXJrPjxkczpTaWduYXR1cmUgeG1sbnM6ZHM9Imh0dHA6Ly93d3cudzMu
-b3JnLzIwMDAvMDkveG1sZHNpZyMiIElkPSJfNDE5NWQyMmItYjlmMy00NmFmLWFhYmUtOTE4ODc0
-NzE4ZDE4Ij48ZHM6U2lnbmVkSW5mbz48ZHM6Q2Fub25pY2FsaXphdGlvbk1ldGhvZCBBbGdvcml0
-aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjxkczpTaWduYXR1
-cmVNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGRzaWctbW9y
-ZSNyc2Etc2hhMjU2Ii8+PGRzOlJlZmVyZW5jZSBVUkk9IiNfZDgwNTVhYTMtYzc1MC00OWQzLWFj
-ZGItZjI2NTcxZjRkMjc2Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0i
-aHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48
-ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhj
-LWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRw
-Oi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+cUlK
-a2RPdUN6OFhvRDYrOGlCd1E0QWNtazArUGxOcEU4bW5Vc09aMTBoaz08L2RzOkRpZ2VzdFZhbHVl
-PjwvZHM6UmVmZXJlbmNlPjxkczpSZWZlcmVuY2UgVVJJPSIjX2U3ZDdhMGQ0LTVlZDktNDVhNS1i
-MmYwLTNlYTg3YmZiYTE3ZiI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09
-Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jt
-cz48ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94
-bWxlbmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPlljeEp0MGQ1WW9Mdk45ZGFvaFRzYWZrb0lB
-dFFnV2FMUmduR3RpeElGdms9PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48L2RzOlNp
-Z25lZEluZm8+PGRzOlNpZ25hdHVyZVZhbHVlIElkPSJfZGE3NWMyZWMtNzkzZS00ODViLWIyNjQt
-YmM0ZTI3MTQ3Y2Y3Ij5ETG1nNWRQNEFLb2h6UjkyZkxKNkpLZ1Urc0hsM3pBVDZKM1EybHhjeklZ
-WEN0SktMOHpLaWV4MFNHeEJmQlVCVjhUNUFrelcxZDZlCjJYOFRkN2ZwamwyRUNpNlhzMDN3OEly
-WlAzY0xteWpWbmN0YzZHOUxKS1lBUEtkMUllU0htQytFL1ltSEJqOUdwVUJ0YWluZDJBVVYKL2Rr
-Nzlmd3l0VjlHQklBRzA4dW1iT1RsN0dsdGphSnRidzhKc2p5QWpxN29JL24yVmplaEUzS2czZ1Rw
-UmJ1d3Fid2svbCtMV0tRagpleElKTDVEdmRPUzBwcGZFcHdQMWxtNWkwU211WGdaRjh1Y3V6RnAw
-b2VyckVrbmlzQ2REZE5VM3Z1L0QwNmxGN0NEUEF3STN2SGN0CnFXaFlQNE5QZlNJcGhZNmdtWVNm
-OE4vaU1tUUtFbDlyTWpFMUZRPT08L2RzOlNpZ25hdHVyZVZhbHVlPjxkczpLZXlJbmZvIElkPSJf
-ZTdkN2EwZDQtNWVkOS00NWE1LWIyZjAtM2VhODdiZmJhMTdmIj48ZHM6WDUwOURhdGE+PGRzOlg1
-MDlDZXJ0aWZpY2F0ZT5NSUlGT3pDQ0JDT2dBd0lCQWdJZ0xyQWJldm9hZTUyeTNmNkMydEIwU24z
-cDdYSm0wVDAyRm9neEtDZk5oWmN3RFFZSktvWklodmNOCkFRRUxCUUF3ZkRFTE1Ba0dBMVVFQmhN
-Q1ZWTXhQREE2QmdOVkJBb1RNMGx1ZEdWeWJtVjBJRU52Y25CdmNtRjBhVzl1SUdadmNpQkIKYzNO
-cFoyNWxaQ0JPWVcxbGN5QmhibVFnVG5WdFltVnljekV2TUMwR0ExVUVBeE1tU1VOQlRrNGdWSEpo
-WkdWdFlYSnJJRU5zWldGeQphVzVuYUc5MWMyVWdVR2xzYjNRZ1EwRXdIaGNOTVRnd01qSTRNREF3
-TURBd1doY05Nak13TXpBeE1qTTFPVFU1V2pDQmp6RUxNQWtHCkExVUVCaE1DUWtVeElEQWVCZ05W
-QkFnVEYwSnlkWE56Wld4ekxVTmhjR2wwWVd3Z1VtVm5hVzl1TVJFd0R3WURWUVFIRXdoQ2NuVnoK
-YzJWc2N6RVJNQThHQTFVRUNoTUlSR1ZzYjJsMGRHVXhPREEyQmdOVkJBTVRMMGxEUVU1T0lGUk5R
-MGdnUVhWMGFHOXlhWHBsWkNCVQpjbUZrWlcxaGNtc2dVR2xzYjNRZ1ZtRnNhV1JoZEc5eU1JSUJJ
-akFOQmdrcWhraUc5dzBCQVFFRkFBT0NBUThBTUlJQkNnS0NBUUVBCnhscDNLcFlIWDNXeUFzRmhT
-azNMd1dmbkdseG5VREZxRlpBM1VvdU1Zai9YaWdiTWtOZUVYSWpsa1JPS1Q0T1BHZlJ4L0xBeVJs
-UVEKakNNdjRxaGJrY1gxcDdhcjYzZmxxNFNaTlZjbDE1bDdoMHVUNThGelNmbmx6MHU1cmtIZkpJ
-bUQ0MyttYVAvOGd2MzZGUjI3alc4Ugo5d1k0aGsrV3M0SUIwaUZTZDhTWHYxS3I4dy9KbU1RU0Rr
-aXVHK1JmSWl1YndRL2Z5N0VrajVRV2hQWncrbU14TktuSFVMeTN4WXoyCkx3VmZmdGp3VXVlYWN2
-cU5SQ2tNWGxDbE9BRHFmVDhvU1pvZURYZWhIdmxQc0xDZW1HQm9US3Vyc2tJUzY5RjB5UEVINWd6
-ZTBIK2YKOEZST3NJb0tTc1ZRMzRCNFMvam9FNjducHNKUFRkS3NOUEpUeVFJREFRQUJvNElCa3pD
-Q0FZOHdEQVlEVlIwVEFRSC9CQUl3QURBZApCZ05WSFE0RUZnUVVvRnBZNzZwNXlvTkRSR3RRcHpW
-dVI4MVVXUTB3Z2NZR0ExVWRJd1NCdmpDQnU0QVV3NjArcHRZUkFFV0FYRHBYClNvcHQzREVObm5H
-aGdZQ2tmakI4TVFzd0NRWURWUVFHRXdKVlV6RThNRG9HQTFVRUNoTXpTVzUwWlhKdVpYUWdRMjl5
-Y0c5eVlYUnAKYjI0Z1ptOXlJRUZ6YzJsbmJtVmtJRTVoYldWeklHRnVaQ0JPZFcxaVpYSnpNUzh3
-TFFZRFZRUURFeVpKUTBGT1RpQlVjbUZrWlcxaApjbXNnUTJ4bFlYSnBibWRvYjNWelpTQlFhV3h2
-ZENCRFFZSWdMckFiZXZvYWU1MnkzZjZDMnRCMFNuM3A3WEptMFQwMkZvZ3hLQ2ZOCmhYa3dEZ1lE
-VlIwUEFRSC9CQVFEQWdlQU1EUUdBMVVkSHdRdE1Dc3dLYUFub0NXR0kyaDBkSEE2THk5amNtd3Vh
-V05oYm00dWIzSm4KTDNSdFkyaGZjR2xzYjNRdVkzSnNNRkVHQTFVZElBUktNRWd3RUFZT0t3WUJC
-QUdDeVJzQkJZTTdEQW93TkFZSUt3WUJCUVVIQWdFdwpLREFtQmdnckJnRUZCUWNDQVJZYWFIUjBj
-SE02THk5allTNXBZMkZ1Ymk1dmNtY3ZjR2xzYjNRd0RRWUpLb1pJaHZjTkFRRUxCUUFECmdnRUJB
-QXVqWjJJY1IyRFZydGFSckE1OWVOWUNsNHhjc0pNdThEUUNIdjI4ZlRmaS9CaVpZNElyN0Y5a0Z5
-OTZEN09aOG9MWTV6amYKNGRIeEZ3SFBxSDhEaDZKV3N6WHVIVzFaYTNYbWwwUGFIeENXUlMwWG9s
-OFdzSEhwTnlnak1CWWZKMG9kVk04ODVUWjFFbDlTaXVFSApueW5GQmdTbWlGYzk5dVFkL1lEUlp1
-R3YvQTBIeXY3eVI5dGtMRWREM0ExdU5KQlc0UCtISkdwZEtrWUwxUTVyVTcrb0hWUHRNS0tJCjNp
-RmtVRXNiTzQ1QVZkN3ZQL2ovN0p0QVpQYjZrb09WNWxaaTJIMVJMY2NHd3pkZXpuaEpnZDBOOW9i
-YjB2bkU0MS9VU1dhZmRXUloKVkdrd1B1cVRobDdzQ3R6ckpIOFhZMHhjdW0rY2ZMeDJFQUl3VW5P
-Y2FiND08L2RzOlg1MDlDZXJ0aWZpY2F0ZT48L2RzOlg1MDlEYXRhPjwvZHM6S2V5SW5mbz48L2Rz
-OlNpZ25hdHVyZT48L3NtZDpzaWduZWRNYXJrPg==
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/revoked/smd/Court-Holder-Arab-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/Court-Holder-Arab-Revoked.smd
deleted file mode 100644
index 4c8a9eb76..000000000
--- a/core/src/test/resources/google/registry/tmch/revoked/smd/Court-Holder-Arab-Revoked.smd
+++ /dev/null
@@ -1,95 +0,0 @@
-Marks: الاختبار & لتقييم
-smdID: 000000911526319839605-65535
-U-labels: xn------nzeaagpf7azb2ppajr3fa, xn-----btdaafne4a7azpoaiq8ea, xn----ymcaaeld1a4a6onahp3ea, xn--mgbaadjcy1a8mmago8da
-notBefore: 2018-05-14T17:43:59.605Z
-notAfter: 2022-08-21T08:59:34.305Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il81ZWVl
-OGE4Ny02ZWZlLTQ2N2UtOTA4MS1iMDY3ZDQ4NDYzY2QiPjxzbWQ6aWQ+MDAwMDAwOTExNTI2MzE5
-ODM5NjA1LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo0Mzo1OS42MDVaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0yMVQwODo1OTozNC4zMDVaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazpj
-b3VydD48bWFyazppZD4wMDAxNDIxNTAzMzA1NTg0MTUwMzMwNTU4NC0xPC9tYXJrOmlkPjxtYXJr
-Om1hcmtOYW1lPtin2YTYp9iu2KrYqNin2LEgJmFtcDsg2YTYqtmC2YrZitmFPC9tYXJrOm1hcmtO
-YW1lPjxtYXJrOmhvbGRlciBlbnRpdGxlbWVudD0ib3duZXIiPjxtYXJrOm5hbWU+2YXZh9mG2K/Y
-syDYp9mE2YXYudmE2YjZhdin2KrZitipPC9tYXJrOm5hbWU+PG1hcms6b3JnPtin2K7Yqtio2KfY
-sTwvbWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpzdHJlZXQ+2KzYudmB2LEg2KfYqNmGINiz2YrZ
-htin2KEgNzU8L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+2YXZg9mG2KfYszwvbWFyazpjaXR5Pjxt
-YXJrOnBjPjI5MDA8L21hcms6cGM+PG1hcms6Y2M+TUE8L21hcms6Y2M+PC9tYXJrOmFkZHI+PG1h
-cms6dm9pY2U+KzIxMi41MjI1MzkwNDA8L21hcms6dm9pY2U+PG1hcms6ZmF4PisyMTIuNTIyNTM5
-MDQxPC9tYXJrOmZheD48bWFyazplbWFpbD5pbmZvQGV4YW1wbGUuZXhhbXBsZTwvbWFyazplbWFp
-bD48L21hcms6aG9sZGVyPjxtYXJrOmxhYmVsPnhuLS0tLS0tbnplYWFncGY3YXpiMnBwYWpyM2Zh
-PC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS0tLS1idGRhYWZuZTRhN2F6cG9haXE4ZWE8L21h
-cms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLS0teW1jYWFlbGQxYTRhNm9uYWhwM2VhPC9tYXJrOmxh
-YmVsPjxtYXJrOmxhYmVsPnhuLS1tZ2JhYWRqY3kxYThtbWFnbzhkYTwvbWFyazpsYWJlbD48bWFy
-azpnb29kc0FuZFNlcnZpY2VzPti62YrYqtin2LE8L21hcms6Z29vZHNBbmRTZXJ2aWNlcz48bWFy
-azpyZWZOdW0+MTk4PC9tYXJrOnJlZk51bT48bWFyazpwcm9EYXRlPjIwMTUtMDktMTVUMDA6MDA6
-MDAuMDAwWjwvbWFyazpwcm9EYXRlPjxtYXJrOmNjPk1BPC9tYXJrOmNjPjxtYXJrOmNvdXJ0TmFt
-ZT7Yp9mE2K/Yp9ixINin2YTYqNmK2LbYp9ihPC9tYXJrOmNvdXJ0TmFtZT48L21hcms6Y291cnQ+
-PC9tYXJrOm1hcms+PGRzOlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAw
-MC8wOS94bWxkc2lnIyIgSWQ9Il9lMWIyMDkyYy04OGU1LTRmNjUtYTY2Yy1jZTE1ZTYwZjNmZWMi
-PjxkczpTaWduZWRJbmZvPjxkczpDYW5vbmljYWxpemF0aW9uTWV0aG9kIEFsZ29yaXRobT0iaHR0
-cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PGRzOlNpZ25hdHVyZU1ldGhv
-ZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZHNpZy1tb3JlI3JzYS1z
-aGEyNTYiLz48ZHM6UmVmZXJlbmNlIFVSST0iI181ZWVlOGE4Ny02ZWZlLTQ2N2UtOTA4MS1iMDY3
-ZDQ4NDYzY2QiPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8v
-d3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjZW52ZWxvcGVkLXNpZ25hdHVyZSIvPjxkczpUcmFu
-c2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMi
-Lz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cu
-dzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1ZT5yRkQ2N1dYKzJN
-L20yNlhXdU8xeWp1WjYreHVDVm9pQ2J0cTR4am1EWC9vPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpS
-ZWZlcmVuY2U+PGRzOlJlZmVyZW5jZSBVUkk9IiNfNjc5ZDRjZGQtNWUzYy00ZmY5LTkzZmMtOTAx
-MGZlNzNlZDNkIj48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDov
-L3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpE
-aWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNz
-aGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+WmlQMFRDMzV1WjBIWnhDZmJoeGp2SCs4emZZcUZBVy92
-M1FzY0htTUthMD08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNlPjwvZHM6U2lnbmVkSW5m
-bz48ZHM6U2lnbmF0dXJlVmFsdWUgSWQ9Il9hZjk1OWU5Yy1jZjM2LTQzYWItODM5Yy0wNzIxMWQ0
-YmIzNDIiPlZzeXRZRUp6OERNNVF2cXd1RlJsWTYwNC9GdCt3ZjhYQ3pubHQ5VzBHdkVyUjdGbnlu
-UFBWelpXU1hpUGV5ckwvb1VzVzZibStIN2oKdW5aZmtDUTRwQVVtMEh5L2FoNkZ1UFhJK3FuUnFk
-UDlLb2ZUMmx1YzF1ei9abWpQcjJ0Wlp6Sm9vUmMydkpDWmJwN1RHeUpkWCtuZApyWmV5NVlKZXJP
-QW9pc0NJWnVMeWlRcEQ2REp1WnY5eGxXMlF1UnZ1S1dLRnUrUkdJekh4QWoxZ2Y3SE1JY0l3elRD
-OVBTcENKT09KCkNIc3ZQSCtVV0NxSGdmRTYvQXFXN2NUbHRMdUh5TmEwcGRGWGx0ejZqUHRmdTA4
-eHRYRnZKbTRMemQ5alJBdUdEblV6cFBkMGJHUzQKWC8yTS84YTZGQjJSeTBKUzFCSU9QaGpoM0to
-SW5MMzUvSC9HeXc9PTwvZHM6U2lnbmF0dXJlVmFsdWU+PGRzOktleUluZm8gSWQ9Il82NzlkNGNk
-ZC01ZTNjLTRmZjktOTNmYy05MDEwZmU3M2VkM2QiPjxkczpYNTA5RGF0YT48ZHM6WDUwOUNlcnRp
-ZmljYXRlPk1JSUZPekNDQkNPZ0F3SUJBZ0lnTHJBYmV2b2FlNTJ5M2Y2QzJ0QjBTbjNwN1hKbTBU
-MDJGb2d4S0NmTmhaY3dEUVlKS29aSWh2Y04KQVFFTEJRQXdmREVMTUFrR0ExVUVCaE1DVlZNeFBE
-QTZCZ05WQkFvVE0wbHVkR1Z5Ym1WMElFTnZjbkJ2Y21GMGFXOXVJR1p2Y2lCQgpjM05wWjI1bFpD
-Qk9ZVzFsY3lCaGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF4TW1TVU5CVGs0Z1ZISmhaR1Z0WVhK
-cklFTnNaV0Z5CmFXNW5hRzkxYzJVZ1VHbHNiM1FnUTBFd0hoY05NVGd3TWpJNE1EQXdNREF3V2hj
-Tk1qTXdNekF4TWpNMU9UVTVXakNCanpFTE1Ba0cKQTFVRUJoTUNRa1V4SURBZUJnTlZCQWdURjBK
-eWRYTnpaV3h6TFVOaGNHbDBZV3dnVW1WbmFXOXVNUkV3RHdZRFZRUUhFd2hDY25WegpjMlZzY3pF
-Uk1BOEdBMVVFQ2hNSVJHVnNiMmwwZEdVeE9EQTJCZ05WQkFNVEwwbERRVTVPSUZSTlEwZ2dRWFYw
-YUc5eWFYcGxaQ0JVCmNtRmtaVzFoY21zZ1VHbHNiM1FnVm1Gc2FXUmhkRzl5TUlJQklqQU5CZ2tx
-aGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUEKeGxwM0twWUhYM1d5QXNGaFNrM0x3V2Zu
-R2x4blVERnFGWkEzVW91TVlqL1hpZ2JNa05lRVhJamxrUk9LVDRPUEdmUngvTEF5UmxRUQpqQ012
-NHFoYmtjWDFwN2FyNjNmbHE0U1pOVmNsMTVsN2gwdVQ1OEZ6U2ZubHowdTVya0hmSkltRDQzK21h
-UC84Z3YzNkZSMjdqVzhSCjl3WTRoaytXczRJQjBpRlNkOFNYdjFLcjh3L0ptTVFTRGtpdUcrUmZJ
-aXVid1EvZnk3RWtqNVFXaFBadyttTXhOS25IVUx5M3hZejIKTHdWZmZ0andVdWVhY3ZxTlJDa01Y
-bENsT0FEcWZUOG9TWm9lRFhlaEh2bFBzTENlbUdCb1RLdXJza0lTNjlGMHlQRUg1Z3plMEgrZgo4
-RlJPc0lvS1NzVlEzNEI0Uy9qb0U2N25wc0pQVGRLc05QSlR5UUlEQVFBQm80SUJrekNDQVk4d0RB
-WURWUjBUQVFIL0JBSXdBREFkCkJnTlZIUTRFRmdRVW9GcFk3NnA1eW9ORFJHdFFwelZ1UjgxVVdR
-MHdnY1lHQTFVZEl3U0J2akNCdTRBVXc2MCtwdFlSQUVXQVhEcFgKU29wdDNERU5ubkdoZ1lDa2Zq
-QjhNUXN3Q1FZRFZRUUdFd0pWVXpFOE1Eb0dBMVVFQ2hNelNXNTBaWEp1WlhRZ1EyOXljRzl5WVhS
-cApiMjRnWm05eUlFRnpjMmxuYm1Wa0lFNWhiV1Z6SUdGdVpDQk9kVzFpWlhKek1TOHdMUVlEVlFR
-REV5WkpRMEZPVGlCVWNtRmtaVzFoCmNtc2dRMnhsWVhKcGJtZG9iM1Z6WlNCUWFXeHZkQ0JEUVlJ
-Z0xyQWJldm9hZTUyeTNmNkMydEIwU24zcDdYSm0wVDAyRm9neEtDZk4KaFhrd0RnWURWUjBQQVFI
-L0JBUURBZ2VBTURRR0ExVWRId1F0TUNzd0thQW5vQ1dHSTJoMGRIQTZMeTlqY213dWFXTmhibTR1
-YjNKbgpMM1J0WTJoZmNHbHNiM1F1WTNKc01GRUdBMVVkSUFSS01FZ3dFQVlPS3dZQkJBR0N5UnNC
-QllNN0RBb3dOQVlJS3dZQkJRVUhBZ0V3CktEQW1CZ2dyQmdFRkJRY0NBUllhYUhSMGNITTZMeTlq
-WVM1cFkyRnViaTV2Y21jdmNHbHNiM1F3RFFZSktvWklodmNOQVFFTEJRQUQKZ2dFQkFBdWpaMklj
-UjJEVnJ0YVJyQTU5ZU5ZQ2w0eGNzSk11OERRQ0h2MjhmVGZpL0JpWlk0SXI3RjlrRnk5NkQ3T1o4
-b0xZNXpqZgo0ZEh4RndIUHFIOERoNkpXc3pYdUhXMVphM1htbDBQYUh4Q1dSUzBYb2w4V3NISHBO
-eWdqTUJZZkowb2RWTTg4NVRaMUVsOVNpdUVICm55bkZCZ1NtaUZjOTl1UWQvWURSWnVHdi9BMEh5
-djd5Ujl0a0xFZEQzQTF1TkpCVzRQK0hKR3BkS2tZTDFRNXJVNytvSFZQdE1LS0kKM2lGa1VFc2JP
-NDVBVmQ3dlAvai83SnRBWlBiNmtvT1Y1bFppMkgxUkxjY0d3emRlem5oSmdkME45b2JiMHZuRTQx
-L1VTV2FmZFdSWgpWR2t3UHVxVGhsN3NDdHpySkg4WFkweGN1bStjZkx4MkVBSXdVbk9jYWI0PTwv
-ZHM6WDUwOUNlcnRpZmljYXRlPjwvZHM6WDUwOURhdGE+PC9kczpLZXlJbmZvPjwvZHM6U2lnbmF0
-dXJlPjwvc21kOnNpZ25lZE1hcms+
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/revoked/smd/Court-Holder-Chinese-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/Court-Holder-Chinese-Revoked.smd
deleted file mode 100644
index 03fc9f6b9..000000000
--- a/core/src/test/resources/google/registry/tmch/revoked/smd/Court-Holder-Chinese-Revoked.smd
+++ /dev/null
@@ -1,93 +0,0 @@
-Marks: 证明&标志
-smdID: 000000701526319803440-65535
-U-labels: xn----z33bn7p06br59e, xn--and-qy3f87yx4cc34g, xn--m6t41lkubhz2e
-notBefore: 2018-05-14T17:43:23.440Z
-notAfter: 2022-08-21T08:12:01.925Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il9kNzQw
-NWExMi1jZGU2LTQ0MjMtYTQzMS1iOTE0NGM1MTg2MjMiPjxzbWQ6aWQ+MDAwMDAwNzAxNTI2MzE5
-ODAzNDQwLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo0MzoyMy40NDBaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0yMVQwODoxMjowMS45MjVaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazpj
-b3VydD48bWFyazppZD4wMDAxNDUxNTAzMDY0NjA2MTUwMzA2NDYwNi0xPC9tYXJrOmlkPjxtYXJr
-Om1hcmtOYW1lPuivgeaYjiZhbXA75qCH5b+XPC9tYXJrOm1hcmtOYW1lPjxtYXJrOmhvbGRlciBl
-bnRpdGxlbWVudD0ib3duZXIiPjxtYXJrOm5hbWU+5p2O5bCP5pa5PC9tYXJrOm5hbWU+PG1hcms6
-b3JnPua1i+ivlTwvbWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpzdHJlZXQ+6aaZ5riv5Lic6Lev
-NuWPt++8jDXlj7fmpbzvvIw45Y+35a6kIDwvbWFyazpzdHJlZXQ+PG1hcms6Y2l0eT7pnZLlspvl
-uII8L21hcms6Y2l0eT48bWFyazpwYz4xMDAwPC9tYXJrOnBjPjxtYXJrOmNjPkNOPC9tYXJrOmNj
-PjwvbWFyazphZGRyPjxtYXJrOnZvaWNlPis4Ni4xMDg0NjU3MTczPC9tYXJrOnZvaWNlPjxtYXJr
-OmZheD4rODYuMTA4NDY1NzE3MzwvbWFyazpmYXg+PG1hcms6ZW1haWw+aW5mb0BleGFtcGxlLmV4
-YW1wbGU8L21hcms6ZW1haWw+PC9tYXJrOmhvbGRlcj48bWFyazpsYWJlbD54bi0tLS16MzNibjdw
-MDZicjU5ZTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tYW5kLXF5M2Y4N3l4NGNjMzRnPC9t
-YXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1tNnQ0MWxrdWJoejJlPC9tYXJrOmxhYmVsPjxtYXJr
-Omdvb2RzQW5kU2VydmljZXM+IOWQieS7ljwvbWFyazpnb29kc0FuZFNlcnZpY2VzPjxtYXJrOnJl
-Zk51bT4xMjM0PC9tYXJrOnJlZk51bT48bWFyazpwcm9EYXRlPjIwMTMtMDEtMDFUMDA6MDA6MDAu
-MDAwWjwvbWFyazpwcm9EYXRlPjxtYXJrOmNjPlVTPC9tYXJrOmNjPjxtYXJrOmNvdXJ0TmFtZT5U
-ZXN0IENvdXJ0PC9tYXJrOmNvdXJ0TmFtZT48L21hcms6Y291cnQ+PC9tYXJrOm1hcms+PGRzOlNp
-Z25hdHVyZSB4bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyIgSWQ9
-Il82YTMyYzFhMS0wM2IwLTRjZmYtODFmYi1mOTE2YjliMmUxZDYiPjxkczpTaWduZWRJbmZvPjxk
-czpDYW5vbmljYWxpemF0aW9uTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAw
-MS8xMC94bWwtZXhjLWMxNG4jIi8+PGRzOlNpZ25hdHVyZU1ldGhvZCBBbGdvcml0aG09Imh0dHA6
-Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZHNpZy1tb3JlI3JzYS1zaGEyNTYiLz48ZHM6UmVmZXJl
-bmNlIFVSST0iI19kNzQwNWExMi1jZGU2LTQ0MjMtYTQzMS1iOTE0NGM1MTg2MjMiPjxkczpUcmFu
-c2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5
-L3htbGRzaWcjZW52ZWxvcGVkLXNpZ25hdHVyZSIvPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJo
-dHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+
-PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1s
-ZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1ZT5rbnNuZWtpSFZQU0NSZ3B6SDFNdlVEcnk0emdZ
-RjVsZFRDbm1QRHc4bmVzPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PGRzOlJlZmVy
-ZW5jZSBVUkk9IiNfYzM1MTZkOGQtYTExMi00YmY1LTk0NTEtMTY0Y2ViOTE1NTEyIj48ZHM6VHJh
-bnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8x
-MC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3Jp
-dGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0
-VmFsdWU+clo3WDhlYWUzcUhKTE5NQllKMUNNVi8zQWM2R2JyWkwwWnNaUVcwYWN4dz08L2RzOkRp
-Z2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNlPjwvZHM6U2lnbmVkSW5mbz48ZHM6U2lnbmF0dXJlVmFs
-dWUgSWQ9Il9mNDE1MTJjNC01MzAyLTQyOTktYjllZS1iZDQ3MzUxNzJiYTgiPnE4c00rTVNiamc0
-blNMdUN2TUFBVHc3aWVadlM0NGV1OWhaYzBVdlIwNlYyVHc4Nm9KMTZNbTVqb1grSERkeDVVdWRn
-bFhuUmM1MGQKRVZldm9ram5oNnJNZlZCVGZxYkZLMnpVSEhDNUU3aTBDbUU3eDdXSFJRbktCNldo
-MHhraEI3a0VhdVBWb2FqZ0J1a3RPSXVKV0hPRwpnTXdsQlhwb1dQeVZrSm9VcHNhT0VOME50NWlw
-ZmtQUzR6RFcyQjFoaHdDWDhuNUVabDJxem9CWUlLMitoeko0NVlEZ3EvaGhXdnphCnllYTVxbjV4
-V1pwMTFTQ3RuSCtaM09FN3dScjY2d2pmejlSa1UrOFBjMFRZVnI4cEdwRy9XNVI2UjM3ZU1CMHZq
-WFRib3NibHlHZUsKVnVCSm9Xenh2bGJxOUF4dmlsVWVlTEdzZTVaMEhaajc4UmJ5Snc9PTwvZHM6
-U2lnbmF0dXJlVmFsdWU+PGRzOktleUluZm8gSWQ9Il9jMzUxNmQ4ZC1hMTEyLTRiZjUtOTQ1MS0x
-NjRjZWI5MTU1MTIiPjxkczpYNTA5RGF0YT48ZHM6WDUwOUNlcnRpZmljYXRlPk1JSUZPekNDQkNP
-Z0F3SUJBZ0lnTHJBYmV2b2FlNTJ5M2Y2QzJ0QjBTbjNwN1hKbTBUMDJGb2d4S0NmTmhaY3dEUVlK
-S29aSWh2Y04KQVFFTEJRQXdmREVMTUFrR0ExVUVCaE1DVlZNeFBEQTZCZ05WQkFvVE0wbHVkR1Z5
-Ym1WMElFTnZjbkJ2Y21GMGFXOXVJR1p2Y2lCQgpjM05wWjI1bFpDQk9ZVzFsY3lCaGJtUWdUblZ0
-WW1WeWN6RXZNQzBHQTFVRUF4TW1TVU5CVGs0Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5CmFXNW5hRzkx
-YzJVZ1VHbHNiM1FnUTBFd0hoY05NVGd3TWpJNE1EQXdNREF3V2hjTk1qTXdNekF4TWpNMU9UVTVX
-akNCanpFTE1Ba0cKQTFVRUJoTUNRa1V4SURBZUJnTlZCQWdURjBKeWRYTnpaV3h6TFVOaGNHbDBZ
-V3dnVW1WbmFXOXVNUkV3RHdZRFZRUUhFd2hDY25WegpjMlZzY3pFUk1BOEdBMVVFQ2hNSVJHVnNi
-MmwwZEdVeE9EQTJCZ05WQkFNVEwwbERRVTVPSUZSTlEwZ2dRWFYwYUc5eWFYcGxaQ0JVCmNtRmta
-VzFoY21zZ1VHbHNiM1FnVm1Gc2FXUmhkRzl5TUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FR
-OEFNSUlCQ2dLQ0FRRUEKeGxwM0twWUhYM1d5QXNGaFNrM0x3V2ZuR2x4blVERnFGWkEzVW91TVlq
-L1hpZ2JNa05lRVhJamxrUk9LVDRPUEdmUngvTEF5UmxRUQpqQ012NHFoYmtjWDFwN2FyNjNmbHE0
-U1pOVmNsMTVsN2gwdVQ1OEZ6U2ZubHowdTVya0hmSkltRDQzK21hUC84Z3YzNkZSMjdqVzhSCjl3
-WTRoaytXczRJQjBpRlNkOFNYdjFLcjh3L0ptTVFTRGtpdUcrUmZJaXVid1EvZnk3RWtqNVFXaFBa
-dyttTXhOS25IVUx5M3hZejIKTHdWZmZ0andVdWVhY3ZxTlJDa01YbENsT0FEcWZUOG9TWm9lRFhl
-aEh2bFBzTENlbUdCb1RLdXJza0lTNjlGMHlQRUg1Z3plMEgrZgo4RlJPc0lvS1NzVlEzNEI0Uy9q
-b0U2N25wc0pQVGRLc05QSlR5UUlEQVFBQm80SUJrekNDQVk4d0RBWURWUjBUQVFIL0JBSXdBREFk
-CkJnTlZIUTRFRmdRVW9GcFk3NnA1eW9ORFJHdFFwelZ1UjgxVVdRMHdnY1lHQTFVZEl3U0J2akNC
-dTRBVXc2MCtwdFlSQUVXQVhEcFgKU29wdDNERU5ubkdoZ1lDa2ZqQjhNUXN3Q1FZRFZRUUdFd0pW
-VXpFOE1Eb0dBMVVFQ2hNelNXNTBaWEp1WlhRZ1EyOXljRzl5WVhScApiMjRnWm05eUlFRnpjMmxu
-Ym1Wa0lFNWhiV1Z6SUdGdVpDQk9kVzFpWlhKek1TOHdMUVlEVlFRREV5WkpRMEZPVGlCVWNtRmta
-VzFoCmNtc2dRMnhsWVhKcGJtZG9iM1Z6WlNCUWFXeHZkQ0JEUVlJZ0xyQWJldm9hZTUyeTNmNkMy
-dEIwU24zcDdYSm0wVDAyRm9neEtDZk4KaFhrd0RnWURWUjBQQVFIL0JBUURBZ2VBTURRR0ExVWRI
-d1F0TUNzd0thQW5vQ1dHSTJoMGRIQTZMeTlqY213dWFXTmhibTR1YjNKbgpMM1J0WTJoZmNHbHNi
-M1F1WTNKc01GRUdBMVVkSUFSS01FZ3dFQVlPS3dZQkJBR0N5UnNCQllNN0RBb3dOQVlJS3dZQkJR
-VUhBZ0V3CktEQW1CZ2dyQmdFRkJRY0NBUllhYUhSMGNITTZMeTlqWVM1cFkyRnViaTV2Y21jdmNH
-bHNiM1F3RFFZSktvWklodmNOQVFFTEJRQUQKZ2dFQkFBdWpaMkljUjJEVnJ0YVJyQTU5ZU5ZQ2w0
-eGNzSk11OERRQ0h2MjhmVGZpL0JpWlk0SXI3RjlrRnk5NkQ3T1o4b0xZNXpqZgo0ZEh4RndIUHFI
-OERoNkpXc3pYdUhXMVphM1htbDBQYUh4Q1dSUzBYb2w4V3NISHBOeWdqTUJZZkowb2RWTTg4NVRa
-MUVsOVNpdUVICm55bkZCZ1NtaUZjOTl1UWQvWURSWnVHdi9BMEh5djd5Ujl0a0xFZEQzQTF1TkpC
-VzRQK0hKR3BkS2tZTDFRNXJVNytvSFZQdE1LS0kKM2lGa1VFc2JPNDVBVmQ3dlAvai83SnRBWlBi
-NmtvT1Y1bFppMkgxUkxjY0d3emRlem5oSmdkME45b2JiMHZuRTQxL1VTV2FmZFdSWgpWR2t3UHVx
-VGhsN3NDdHpySkg4WFkweGN1bStjZkx4MkVBSXdVbk9jYWI0PTwvZHM6WDUwOUNlcnRpZmljYXRl
-PjwvZHM6WDUwOURhdGE+PC9kczpLZXlJbmZvPjwvZHM6U2lnbmF0dXJlPjwvc21kOnNpZ25lZE1h
-cms+
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/revoked/smd/Court-Holder-English-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/Court-Holder-English-Revoked.smd
deleted file mode 100644
index f51e22428..000000000
--- a/core/src/test/resources/google/registry/tmch/revoked/smd/Court-Holder-English-Revoked.smd
+++ /dev/null
@@ -1,96 +0,0 @@
-Marks: Test & Validate
-smdID: 000000501526319785645-65535
-U-labels: test---validate, test--validate, test-and-validate, test-andvalidate, test-validate, testand-validate, testandvalidate, testvalidate
-notBefore: 2018-05-14T17:43:05.645Z
-notAfter: 2022-08-21T08:12:19.525Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il83YzFj
-OGE2Yi1mYzNlLTQ5M2UtYjg2Ni1lNzhmODBhMTBmYmIiPjxzbWQ6aWQ+MDAwMDAwNTAxNTI2MzE5
-Nzg1NjQ1LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo0MzowNS42NDVaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0yMVQwODoxMjoxOS41MjVaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazpj
-b3VydD48bWFyazppZD4wMDAxMzYxNTAzMDU2NDc0MTUwMzA1NjQ3NC0xPC9tYXJrOmlkPjxtYXJr
-Om1hcmtOYW1lPlRlc3QgJmFtcDsgVmFsaWRhdGU8L21hcms6bWFya05hbWU+PG1hcms6aG9sZGVy
-IGVudGl0bGVtZW50PSJvd25lciI+PG1hcms6bmFtZT5GcmFuayBXaGl0ZTwvbWFyazpuYW1lPjxt
-YXJrOm9yZz5UZXN0IE9yZ2FuaXphdGlvbjwvbWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpzdHJl
-ZXQ+V2VzdCBBcnF1ZXMgQXZlbnVlIDEwMSA8L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+U3Vubnl2
-YWxlPC9tYXJrOmNpdHk+PG1hcms6c3A+Q0E8L21hcms6c3A+PG1hcms6cGM+MTAwMjMtMzI0MTwv
-bWFyazpwYz48bWFyazpjYz5VUzwvbWFyazpjYz48L21hcms6YWRkcj48bWFyazp2b2ljZT4rMS4z
-MDE0NTU2NjAwPC9tYXJrOnZvaWNlPjxtYXJrOmZheD4rMS4zMDE0NTU2NjAxPC9tYXJrOmZheD48
-bWFyazplbWFpbD5pbmZvQGV4YW1wbGUuZXhhbXBsZTwvbWFyazplbWFpbD48L21hcms6aG9sZGVy
-PjxtYXJrOmxhYmVsPnRlc3QtLS12YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0
-LS12YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0LWFuZC12YWxpZGF0ZTwvbWFy
-azpsYWJlbD48bWFyazpsYWJlbD50ZXN0LWFuZHZhbGlkYXRlPC9tYXJrOmxhYmVsPjxtYXJrOmxh
-YmVsPnRlc3QtdmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+dGVzdGFuZC12YWxpZGF0
-ZTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0YW5kdmFsaWRhdGU8L21hcms6bGFiZWw+PG1h
-cms6bGFiZWw+dGVzdHZhbGlkYXRlPC9tYXJrOmxhYmVsPjxtYXJrOmdvb2RzQW5kU2VydmljZXM+
-Z29sZDwvbWFyazpnb29kc0FuZFNlcnZpY2VzPjxtYXJrOnJlZk51bT4xMjM0PC9tYXJrOnJlZk51
-bT48bWFyazpwcm9EYXRlPjIwMTMtMDEtMDFUMDA6MDA6MDAuMDAwWjwvbWFyazpwcm9EYXRlPjxt
-YXJrOmNjPlVTPC9tYXJrOmNjPjxtYXJrOmNvdXJ0TmFtZT5Ib3ZlPC9tYXJrOmNvdXJ0TmFtZT48
-L21hcms6Y291cnQ+PC9tYXJrOm1hcms+PGRzOlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0cDovL3d3
-dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyIgSWQ9Il8yODUyYmIyMC1mMDc4LTQ2N2UtODJjNy03
-MDMyNzc0Y2I4ZDciPjxkczpTaWduZWRJbmZvPjxkczpDYW5vbmljYWxpemF0aW9uTWV0aG9kIEFs
-Z29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PGRzOlNp
-Z25hdHVyZU1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZHNp
-Zy1tb3JlI3JzYS1zaGEyNTYiLz48ZHM6UmVmZXJlbmNlIFVSST0iI183YzFjOGE2Yi1mYzNlLTQ5
-M2UtYjg2Ni1lNzhmODBhMTBmYmIiPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3Jp
-dGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjZW52ZWxvcGVkLXNpZ25hdHVy
-ZSIvPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3ht
-bC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09
-Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1
-ZT5VblgydUlvVTB6dkx3T1dPQWFDNm5ONW91ZnVKRjFrOEswSjM3M3ZNWlZBPTwvZHM6RGlnZXN0
-VmFsdWU+PC9kczpSZWZlcmVuY2U+PGRzOlJlZmVyZW5jZSBVUkk9IiNfYTY2NjE2NmQtNDNjYS00
-ZmVlLWE3YWItODU4ZGVjZjYzYjg0Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29y
-aXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFu
-c2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAx
-LzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+c2tlckNPUjVWT0Q2d3NtTXNzM3RX
-V0dka2YvWG9lS3Z4UXBNMkVYTkFHOD08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNlPjwv
-ZHM6U2lnbmVkSW5mbz48ZHM6U2lnbmF0dXJlVmFsdWUgSWQ9Il9iNjQ3MTkwMS03MDdhLTRhYzIt
-YjdiOC1kOGU3ZTA4YzFlMmMiPkZ4ZWdBZEVmcWZteTU2UVpsaU1VSkFSWnV4dG8rVE82VkFCUlhW
-dVJYT0pmUWJ6b1pITXlRcFhMMXczaGlldWFwUno5eGNieVlNNjUKMWRLaXpKL0ZMKy9QTmlWMlJN
-UUxFT1dJQ0FaYVcyaktCT2dYbGVRSm5ERk1BT2s4V0NocCtQRUI5QWkvVUdrM2ZhOEFlby9QaTA4
-QwpVSWRKV1JKZUZQa3AzRWlCTlVCMHliUmdETHlJMHk0ZFp2MnEveWlQdWdiMCt0MkRSNk43a2o1
-NzkvWEwvWmowMXluNW8wdGx5SHVQCk8wYnFaeFJKU0pVc2dBb0Y3dzRtQ1hwWlBjY1BhTytoaGFI
-Zm1QVTcvMlZkaXRMTFdVMHB0ODFrTlkvWDFlL214UDAwdmV5REdiZTIKenpjdEQxK0pRWVNtVG9j
-SHY4MFFFSWVNS3lNYXVwWW11THNJL1E9PTwvZHM6U2lnbmF0dXJlVmFsdWU+PGRzOktleUluZm8g
-SWQ9Il9hNjY2MTY2ZC00M2NhLTRmZWUtYTdhYi04NThkZWNmNjNiODQiPjxkczpYNTA5RGF0YT48
-ZHM6WDUwOUNlcnRpZmljYXRlPk1JSUZPekNDQkNPZ0F3SUJBZ0lnTHJBYmV2b2FlNTJ5M2Y2QzJ0
-QjBTbjNwN1hKbTBUMDJGb2d4S0NmTmhaY3dEUVlKS29aSWh2Y04KQVFFTEJRQXdmREVMTUFrR0Ex
-VUVCaE1DVlZNeFBEQTZCZ05WQkFvVE0wbHVkR1Z5Ym1WMElFTnZjbkJ2Y21GMGFXOXVJR1p2Y2lC
-QgpjM05wWjI1bFpDQk9ZVzFsY3lCaGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF4TW1TVU5CVGs0
-Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5CmFXNW5hRzkxYzJVZ1VHbHNiM1FnUTBFd0hoY05NVGd3TWpJ
-NE1EQXdNREF3V2hjTk1qTXdNekF4TWpNMU9UVTVXakNCanpFTE1Ba0cKQTFVRUJoTUNRa1V4SURB
-ZUJnTlZCQWdURjBKeWRYTnpaV3h6TFVOaGNHbDBZV3dnVW1WbmFXOXVNUkV3RHdZRFZRUUhFd2hD
-Y25WegpjMlZzY3pFUk1BOEdBMVVFQ2hNSVJHVnNiMmwwZEdVeE9EQTJCZ05WQkFNVEwwbERRVTVP
-SUZSTlEwZ2dRWFYwYUc5eWFYcGxaQ0JVCmNtRmtaVzFoY21zZ1VHbHNiM1FnVm1Gc2FXUmhkRzl5
-TUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUEKeGxwM0twWUhYM1d5
-QXNGaFNrM0x3V2ZuR2x4blVERnFGWkEzVW91TVlqL1hpZ2JNa05lRVhJamxrUk9LVDRPUEdmUngv
-TEF5UmxRUQpqQ012NHFoYmtjWDFwN2FyNjNmbHE0U1pOVmNsMTVsN2gwdVQ1OEZ6U2ZubHowdTVy
-a0hmSkltRDQzK21hUC84Z3YzNkZSMjdqVzhSCjl3WTRoaytXczRJQjBpRlNkOFNYdjFLcjh3L0pt
-TVFTRGtpdUcrUmZJaXVid1EvZnk3RWtqNVFXaFBadyttTXhOS25IVUx5M3hZejIKTHdWZmZ0andV
-dWVhY3ZxTlJDa01YbENsT0FEcWZUOG9TWm9lRFhlaEh2bFBzTENlbUdCb1RLdXJza0lTNjlGMHlQ
-RUg1Z3plMEgrZgo4RlJPc0lvS1NzVlEzNEI0Uy9qb0U2N25wc0pQVGRLc05QSlR5UUlEQVFBQm80
-SUJrekNDQVk4d0RBWURWUjBUQVFIL0JBSXdBREFkCkJnTlZIUTRFRmdRVW9GcFk3NnA1eW9ORFJH
-dFFwelZ1UjgxVVdRMHdnY1lHQTFVZEl3U0J2akNCdTRBVXc2MCtwdFlSQUVXQVhEcFgKU29wdDNE
-RU5ubkdoZ1lDa2ZqQjhNUXN3Q1FZRFZRUUdFd0pWVXpFOE1Eb0dBMVVFQ2hNelNXNTBaWEp1WlhR
-Z1EyOXljRzl5WVhScApiMjRnWm05eUlFRnpjMmxuYm1Wa0lFNWhiV1Z6SUdGdVpDQk9kVzFpWlhK
-ek1TOHdMUVlEVlFRREV5WkpRMEZPVGlCVWNtRmtaVzFoCmNtc2dRMnhsWVhKcGJtZG9iM1Z6WlNC
-UWFXeHZkQ0JEUVlJZ0xyQWJldm9hZTUyeTNmNkMydEIwU24zcDdYSm0wVDAyRm9neEtDZk4KaFhr
-d0RnWURWUjBQQVFIL0JBUURBZ2VBTURRR0ExVWRId1F0TUNzd0thQW5vQ1dHSTJoMGRIQTZMeTlq
-Y213dWFXTmhibTR1YjNKbgpMM1J0WTJoZmNHbHNiM1F1WTNKc01GRUdBMVVkSUFSS01FZ3dFQVlP
-S3dZQkJBR0N5UnNCQllNN0RBb3dOQVlJS3dZQkJRVUhBZ0V3CktEQW1CZ2dyQmdFRkJRY0NBUllh
-YUhSMGNITTZMeTlqWVM1cFkyRnViaTV2Y21jdmNHbHNiM1F3RFFZSktvWklodmNOQVFFTEJRQUQK
-Z2dFQkFBdWpaMkljUjJEVnJ0YVJyQTU5ZU5ZQ2w0eGNzSk11OERRQ0h2MjhmVGZpL0JpWlk0SXI3
-RjlrRnk5NkQ3T1o4b0xZNXpqZgo0ZEh4RndIUHFIOERoNkpXc3pYdUhXMVphM1htbDBQYUh4Q1dS
-UzBYb2w4V3NISHBOeWdqTUJZZkowb2RWTTg4NVRaMUVsOVNpdUVICm55bkZCZ1NtaUZjOTl1UWQv
-WURSWnVHdi9BMEh5djd5Ujl0a0xFZEQzQTF1TkpCVzRQK0hKR3BkS2tZTDFRNXJVNytvSFZQdE1L
-S0kKM2lGa1VFc2JPNDVBVmQ3dlAvai83SnRBWlBiNmtvT1Y1bFppMkgxUkxjY0d3emRlem5oSmdk
-ME45b2JiMHZuRTQxL1VTV2FmZFdSWgpWR2t3UHVxVGhsN3NDdHpySkg4WFkweGN1bStjZkx4MkVB
-SXdVbk9jYWI0PTwvZHM6WDUwOUNlcnRpZmljYXRlPjwvZHM6WDUwOURhdGE+PC9kczpLZXlJbmZv
-PjwvZHM6U2lnbmF0dXJlPjwvc21kOnNpZ25lZE1hcms+
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/revoked/smd/Court-Holder-French-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/Court-Holder-French-Revoked.smd
deleted file mode 100644
index 3bb7cea36..000000000
--- a/core/src/test/resources/google/registry/tmch/revoked/smd/Court-Holder-French-Revoked.smd
+++ /dev/null
@@ -1,99 +0,0 @@
-Marks: Essai & évaluation
-smdID: 000000631526319792006-65535
-U-labels: xn--essai---valuation-itb, xn--essai--valuation-hqb, xn--essai-and-valuation-kzb, xn--essai-andvaluation-jwb, xn--essai-valuation-gnb, xn--essaiand-valuation-jwb, xn--essaiandvaluation-itb, xn--essaiet-valuation-itb, xn--essaietvaluation-hqb, xn--essaivaluation-fkb
-notBefore: 2018-05-14T17:43:12.006Z
-notAfter: 2022-08-21T08:12:14.116Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il9kNDE2
-YTAxZS1hMTUwLTQ3NWMtODQwZi04ZTQ1Yzk0NWI2ODYiPjxzbWQ6aWQ+MDAwMDAwNjMxNTI2MzE5
-NzkyMDA2LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo0MzoxMi4wMDZaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0yMVQwODoxMjoxNC4xMTZaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazpj
-b3VydD48bWFyazppZD4wMDAxMzgxNTAzMDYwNDk2MTUwMzA2MDQ5Ni0xPC9tYXJrOmlkPjxtYXJr
-Om1hcmtOYW1lPkVzc2FpICZhbXA7IMOpdmFsdWF0aW9uPC9tYXJrOm1hcmtOYW1lPjxtYXJrOmhv
-bGRlciBlbnRpdGxlbWVudD0ib3duZXIiPjxtYXJrOm5hbWU+SmVhbiBMZWJsYW5jPC9tYXJrOm5h
-bWU+PG1hcms6b3JnPk9yYW5pc2F0aW9uIGRlIHRlc3Q8L21hcms6b3JnPjxtYXJrOmFkZHI+PG1h
-cms6c3RyZWV0PlJVRSBST0dORSA0MCA8L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+QVJUT0lTPC9t
-YXJrOmNpdHk+PG1hcms6cGM+MjEzMDE8L21hcms6cGM+PG1hcms6Y2M+RlI8L21hcms6Y2M+PC9t
-YXJrOmFkZHI+PG1hcms6dm9pY2U+KzMzLjI2NDk5NTAzMjwvbWFyazp2b2ljZT48bWFyazpmYXg+
-KzMzLjI2NDk5NTAzMzwvbWFyazpmYXg+PG1hcms6ZW1haWw+aW5mb0BleGFtcGxlLmV4YW1wbGU8
-L21hcms6ZW1haWw+PC9tYXJrOmhvbGRlcj48bWFyazpsYWJlbD54bi0tZXNzYWktLS12YWx1YXRp
-b24taXRiPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1lc3NhaS0tdmFsdWF0aW9uLWhxYjwv
-bWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tZXNzYWktYW5kLXZhbHVhdGlvbi1remI8L21hcms6
-bGFiZWw+PG1hcms6bGFiZWw+eG4tLWVzc2FpLWFuZHZhbHVhdGlvbi1qd2I8L21hcms6bGFiZWw+
-PG1hcms6bGFiZWw+eG4tLWVzc2FpLXZhbHVhdGlvbi1nbmI8L21hcms6bGFiZWw+PG1hcms6bGFi
-ZWw+eG4tLWVzc2FpYW5kLXZhbHVhdGlvbi1qd2I8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4t
-LWVzc2FpYW5kdmFsdWF0aW9uLWl0YjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tZXNzYWll
-dC12YWx1YXRpb24taXRiPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1lc3NhaWV0dmFsdWF0
-aW9uLWhxYjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tZXNzYWl2YWx1YXRpb24tZmtiPC9t
-YXJrOmxhYmVsPjxtYXJrOmdvb2RzQW5kU2VydmljZXM+Z3VpdGFyZTwvbWFyazpnb29kc0FuZFNl
-cnZpY2VzPjxtYXJrOnJlZk51bT4xMjM0PC9tYXJrOnJlZk51bT48bWFyazpwcm9EYXRlPjIwMTMt
-MDEtMDFUMDA6MDA6MDAuMDAwWjwvbWFyazpwcm9EYXRlPjxtYXJrOmNjPlVTPC9tYXJrOmNjPjxt
-YXJrOmNvdXJ0TmFtZT5Ib3ZlPC9tYXJrOmNvdXJ0TmFtZT48L21hcms6Y291cnQ+PC9tYXJrOm1h
-cms+PGRzOlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxk
-c2lnIyIgSWQ9Il8xZmViZjY0OS0zMDQ3LTRhYzUtOGE2YS02ZmZhNzA4NzdiNGMiPjxkczpTaWdu
-ZWRJbmZvPjxkczpDYW5vbmljYWxpemF0aW9uTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53
-My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PGRzOlNpZ25hdHVyZU1ldGhvZCBBbGdvcml0
-aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZHNpZy1tb3JlI3JzYS1zaGEyNTYiLz48
-ZHM6UmVmZXJlbmNlIFVSST0iI19kNDE2YTAxZS1hMTUwLTQ3NWMtODQwZi04ZTQ1Yzk0NWI2ODYi
-PjxkczpUcmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9y
-Zy8yMDAwLzA5L3htbGRzaWcjZW52ZWxvcGVkLXNpZ25hdHVyZSIvPjxkczpUcmFuc2Zvcm0gQWxn
-b3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRy
-YW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIw
-MDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1ZT5zWkhRaDJnVjlLd3V6ZmFCY0Zs
-T3hlbXdVSCtUcDJKZGExTHZHN014d3pvPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+
-PGRzOlJlZmVyZW5jZSBVUkk9IiNfMjU3YmQwY2YtNDcyYS00ZmNjLWIzOTUtZjAzZTU1ZWQ4OGZl
-Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5v
-cmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRo
-b2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48
-ZHM6RGlnZXN0VmFsdWU+TFU0czNvajIyVTdmVWk3UDd3eDhhQzJzOWlpaVdSWFRqb1lDVnBwYzJX
-Yz08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNlPjwvZHM6U2lnbmVkSW5mbz48ZHM6U2ln
-bmF0dXJlVmFsdWUgSWQ9Il80OGFkNmZjMy05NGEyLTRhMDAtOWI4ZS1mNjNlYWJmZmFiYjUiPk1q
-S1FIOXFVRC82YlJObE9qOE4vMVlZaHh2Zk5VVG0zbERBUmEyMmZaRWFKTE1pSERtampPOVJRY3Ur
-Y2NGSGJrZWlPRWNMakpPR0EKK2RXSHIzS3VoaGNpSGs3K1V5QTg2WE1jeHVrdkNReGFZYnptQ01i
-RC9pSk5KZW1NQ2lYWFN4emxySkR6elJMNWJRay9HWVpiVTdEQQpUMDZLeXk0Z0dxV1M2Wi9CaDha
-VnNTYWw4QWpQdFluZU9wM2J6ZEZtYzYvOUoyZ2x0aDZybzBOTGFmS0hxdllCSHFldExqZFdDU01v
-Cjh1VDkrNFJBSkVSaEFleWZ0RnAwSDhzd0VVdTkzdnZka2JaKzUwNmtESldyczJpRkpzNDcySXl4
-Z1RuVG8wbDgwQkRicE84WEt3cTYKeU12TFl4cmxKL3Zmc3dVMGZTb2wxbGYxS01zWU9NSUdYNUla
-YlE9PTwvZHM6U2lnbmF0dXJlVmFsdWU+PGRzOktleUluZm8gSWQ9Il8yNTdiZDBjZi00NzJhLTRm
-Y2MtYjM5NS1mMDNlNTVlZDg4ZmUiPjxkczpYNTA5RGF0YT48ZHM6WDUwOUNlcnRpZmljYXRlPk1J
-SUZPekNDQkNPZ0F3SUJBZ0lnTHJBYmV2b2FlNTJ5M2Y2QzJ0QjBTbjNwN1hKbTBUMDJGb2d4S0Nm
-TmhaY3dEUVlKS29aSWh2Y04KQVFFTEJRQXdmREVMTUFrR0ExVUVCaE1DVlZNeFBEQTZCZ05WQkFv
-VE0wbHVkR1Z5Ym1WMElFTnZjbkJ2Y21GMGFXOXVJR1p2Y2lCQgpjM05wWjI1bFpDQk9ZVzFsY3lC
-aGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF4TW1TVU5CVGs0Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5
-CmFXNW5hRzkxYzJVZ1VHbHNiM1FnUTBFd0hoY05NVGd3TWpJNE1EQXdNREF3V2hjTk1qTXdNekF4
-TWpNMU9UVTVXakNCanpFTE1Ba0cKQTFVRUJoTUNRa1V4SURBZUJnTlZCQWdURjBKeWRYTnpaV3h6
-TFVOaGNHbDBZV3dnVW1WbmFXOXVNUkV3RHdZRFZRUUhFd2hDY25WegpjMlZzY3pFUk1BOEdBMVVF
-Q2hNSVJHVnNiMmwwZEdVeE9EQTJCZ05WQkFNVEwwbERRVTVPSUZSTlEwZ2dRWFYwYUc5eWFYcGxa
-Q0JVCmNtRmtaVzFoY21zZ1VHbHNiM1FnVm1Gc2FXUmhkRzl5TUlJQklqQU5CZ2txaGtpRzl3MEJB
-UUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUEKeGxwM0twWUhYM1d5QXNGaFNrM0x3V2ZuR2x4blVERnFG
-WkEzVW91TVlqL1hpZ2JNa05lRVhJamxrUk9LVDRPUEdmUngvTEF5UmxRUQpqQ012NHFoYmtjWDFw
-N2FyNjNmbHE0U1pOVmNsMTVsN2gwdVQ1OEZ6U2ZubHowdTVya0hmSkltRDQzK21hUC84Z3YzNkZS
-MjdqVzhSCjl3WTRoaytXczRJQjBpRlNkOFNYdjFLcjh3L0ptTVFTRGtpdUcrUmZJaXVid1EvZnk3
-RWtqNVFXaFBadyttTXhOS25IVUx5M3hZejIKTHdWZmZ0andVdWVhY3ZxTlJDa01YbENsT0FEcWZU
-OG9TWm9lRFhlaEh2bFBzTENlbUdCb1RLdXJza0lTNjlGMHlQRUg1Z3plMEgrZgo4RlJPc0lvS1Nz
-VlEzNEI0Uy9qb0U2N25wc0pQVGRLc05QSlR5UUlEQVFBQm80SUJrekNDQVk4d0RBWURWUjBUQVFI
-L0JBSXdBREFkCkJnTlZIUTRFRmdRVW9GcFk3NnA1eW9ORFJHdFFwelZ1UjgxVVdRMHdnY1lHQTFV
-ZEl3U0J2akNCdTRBVXc2MCtwdFlSQUVXQVhEcFgKU29wdDNERU5ubkdoZ1lDa2ZqQjhNUXN3Q1FZ
-RFZRUUdFd0pWVXpFOE1Eb0dBMVVFQ2hNelNXNTBaWEp1WlhRZ1EyOXljRzl5WVhScApiMjRnWm05
-eUlFRnpjMmxuYm1Wa0lFNWhiV1Z6SUdGdVpDQk9kVzFpWlhKek1TOHdMUVlEVlFRREV5WkpRMEZP
-VGlCVWNtRmtaVzFoCmNtc2dRMnhsWVhKcGJtZG9iM1Z6WlNCUWFXeHZkQ0JEUVlJZ0xyQWJldm9h
-ZTUyeTNmNkMydEIwU24zcDdYSm0wVDAyRm9neEtDZk4KaFhrd0RnWURWUjBQQVFIL0JBUURBZ2VB
-TURRR0ExVWRId1F0TUNzd0thQW5vQ1dHSTJoMGRIQTZMeTlqY213dWFXTmhibTR1YjNKbgpMM1J0
-WTJoZmNHbHNiM1F1WTNKc01GRUdBMVVkSUFSS01FZ3dFQVlPS3dZQkJBR0N5UnNCQllNN0RBb3dO
-QVlJS3dZQkJRVUhBZ0V3CktEQW1CZ2dyQmdFRkJRY0NBUllhYUhSMGNITTZMeTlqWVM1cFkyRnVi
-aTV2Y21jdmNHbHNiM1F3RFFZSktvWklodmNOQVFFTEJRQUQKZ2dFQkFBdWpaMkljUjJEVnJ0YVJy
-QTU5ZU5ZQ2w0eGNzSk11OERRQ0h2MjhmVGZpL0JpWlk0SXI3RjlrRnk5NkQ3T1o4b0xZNXpqZgo0
-ZEh4RndIUHFIOERoNkpXc3pYdUhXMVphM1htbDBQYUh4Q1dSUzBYb2w4V3NISHBOeWdqTUJZZkow
-b2RWTTg4NVRaMUVsOVNpdUVICm55bkZCZ1NtaUZjOTl1UWQvWURSWnVHdi9BMEh5djd5Ujl0a0xF
-ZEQzQTF1TkpCVzRQK0hKR3BkS2tZTDFRNXJVNytvSFZQdE1LS0kKM2lGa1VFc2JPNDVBVmQ3dlAv
-ai83SnRBWlBiNmtvT1Y1bFppMkgxUkxjY0d3emRlem5oSmdkME45b2JiMHZuRTQxL1VTV2FmZFdS
-WgpWR2t3UHVxVGhsN3NDdHpySkg4WFkweGN1bStjZkx4MkVBSXdVbk9jYWI0PTwvZHM6WDUwOUNl
-cnRpZmljYXRlPjwvZHM6WDUwOURhdGE+PC9kczpLZXlJbmZvPjwvZHM6U2lnbmF0dXJlPjwvc21k
-OnNpZ25lZE1hcms+
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/revoked/smd/Court-Holder-Russian-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/Court-Holder-Russian-Revoked.smd
deleted file mode 100644
index d058bc4fd..000000000
--- a/core/src/test/resources/google/registry/tmch/revoked/smd/Court-Holder-Russian-Revoked.smd
+++ /dev/null
@@ -1,99 +0,0 @@
-Marks: Сертификация & логотип
-smdID: 000000671526319797729-65535
-U-labels: xn------5cdshvabepr3bbqcpum2a9b4n, xn-----6kcogsabdop0bbpcotl1a7b8m, xn---and--3ve0aj1aabgrv9bbscrwo4a3c9n, xn---and-43dwiyabfqt6bbrcqvn3a1c0o, xn----7sbkfpabcnn7abocnsk0a5bzn, xn--and--43dwiyabfqt6bbrcqvn3a1c0o, xn--and-5cdshvabepr3bbqcpum2a9b4n, xn--80agemabbml4abncmrjz3b2m
-notBefore: 2018-05-14T17:43:17.729Z
-notAfter: 2022-08-21T08:12:08.921Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il80MzA4
-ZTZiMy02OGQ4LTQxNGQtYmNmNS0wYzQwZDAxNTQ1OWYiPjxzbWQ6aWQ+MDAwMDAwNjcxNTI2MzE5
-Nzk3NzI5LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo0MzoxNy43MjlaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0yMVQwODoxMjowOC45MjFaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazpj
-b3VydD48bWFyazppZD4wMDAxNDAxNTAzMDYzMjQ3MTUwMzA2MzI0Ny0xPC9tYXJrOmlkPjxtYXJr
-Om1hcmtOYW1lPtCh0LXRgNGC0LjRhNC40LrQsNGG0LjRjyAmYW1wOyDQu9C+0LPQvtGC0LjQvzwv
-bWFyazptYXJrTmFtZT48bWFyazpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpuYW1l
-PtCd0LDRgtCw0LvRjNGPINCQ0L3RgtC+0L3QvtCy0LA8L21hcms6bmFtZT48bWFyazpvcmc+0JDQ
-vdGC0L7QvdC+0LLQsDwvbWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpzdHJlZXQ+0J/RgNC+0YHQ
-v9C10LrRgiDQktC10YDQvdCw0LTRgdC60L7Qs9C+IDE1PC9tYXJrOnN0cmVldD48bWFyazpjaXR5
-PtCc0L7RgdC60LLQsDwvbWFyazpjaXR5PjxtYXJrOnBjPjExNzQ4NTwvbWFyazpwYz48bWFyazpj
-Yz5SVTwvbWFyazpjYz48L21hcms6YWRkcj48bWFyazp2b2ljZT4rNy45MTg4MjIxNjc0PC9tYXJr
-OnZvaWNlPjxtYXJrOmVtYWlsPmluZm9AZXhhbXBsZS5leGFtcGxlPC9tYXJrOmVtYWlsPjwvbWFy
-azpob2xkZXI+PG1hcms6bGFiZWw+eG4tLS0tLS01Y2RzaHZhYmVwcjNiYnFjcHVtMmE5YjRuPC9t
-YXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS0tLS02a2NvZ3NhYmRvcDBiYnBjb3RsMWE3YjhtPC9t
-YXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS0tYW5kLS0zdmUwYWoxYWFiZ3J2OWJic2Nyd280YTNj
-OW48L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLS1hbmQtNDNkd2l5YWJmcXQ2YmJyY3F2bjNh
-MWMwbzwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tLS03c2JrZnBhYmNubjdhYm9jbnNrMGE1
-YnpuPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1hbmQtLTQzZHdpeWFiZnF0NmJicmNxdm4z
-YTFjMG88L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLWFuZC01Y2RzaHZhYmVwcjNiYnFjcHVt
-MmE5YjRuPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS04MGFnZW1hYmJtbDRhYm5jbXJqejNi
-Mm08L21hcms6bGFiZWw+PG1hcms6Z29vZHNBbmRTZXJ2aWNlcz5ndWl0YXI8L21hcms6Z29vZHNB
-bmRTZXJ2aWNlcz48bWFyazpyZWZOdW0+MTIzNDwvbWFyazpyZWZOdW0+PG1hcms6cHJvRGF0ZT4y
-MDEzLTAxLTAxVDAwOjAwOjAwLjAwMFo8L21hcms6cHJvRGF0ZT48bWFyazpjYz5VUzwvbWFyazpj
-Yz48bWFyazpjb3VydE5hbWU+SG92ZTwvbWFyazpjb3VydE5hbWU+PC9tYXJrOmNvdXJ0PjwvbWFy
-azptYXJrPjxkczpTaWduYXR1cmUgeG1sbnM6ZHM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkv
-eG1sZHNpZyMiIElkPSJfNWU0YzM1OTItNWE1ZC00NWViLTk5MTctMjc5N2UwZDA3MGJkIj48ZHM6
-U2lnbmVkSW5mbz48ZHM6Q2Fub25pY2FsaXphdGlvbk1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93
-d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjxkczpTaWduYXR1cmVNZXRob2QgQWxn
-b3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGRzaWctbW9yZSNyc2Etc2hhMjU2
-Ii8+PGRzOlJlZmVyZW5jZSBVUkk9IiNfNDMwOGU2YjMtNjhkOC00MTRkLWJjZjUtMGM0MGQwMTU0
-NTlmIj48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53
-My5vcmcvMjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48ZHM6VHJhbnNmb3Jt
-IEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9k
-czpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9y
-Zy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+SEFxMWxuUEdLc0F4UHB3
-bElINlVCYXlTWWE1TDVEM3JsR01xSFNBTVNkYz08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJl
-bmNlPjxkczpSZWZlcmVuY2UgVVJJPSIjXzIzZjhiYzViLWQ4M2QtNDQxZC04ZjExLWRjZGVlY2Y5
-ODMzNCI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cu
-dzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6RGlnZXN0
-TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxlbmMjc2hhMjU2
-Ii8+PGRzOkRpZ2VzdFZhbHVlPi9ZdGNwQlhWZnYyZGMzVkd2UUs0d1lYL21aWWNqV081ZkltaTFF
-bkdVT289PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48L2RzOlNpZ25lZEluZm8+PGRz
-OlNpZ25hdHVyZVZhbHVlIElkPSJfOWJmNGYyZGItMjI0NS00NTM0LWIyODMtM2QwMTM5Mzc1Yjk5
-Ij5vQyt0QmZHU1l0Snl4b0Qza1pwcEhsWER4N29CTEN0OGJKem8xR0wzdGhSWTFIaG5WV2pFK25S
-SnNtQ1BacGZnT2xpSUZKOGdGelNVCndwNGlGVnNtbno0TFZONnQ2MHVMellwWlpCSDJqOEZnV2o0
-RUVFN2t6Z1V3clZidElUa2RkTncyRk1KczlvUnozTldnd1didUxOTnYKMXNTVGlxVWhuKzBJNExx
-RmI5eXk0ZEtIUk1rU1B6WlI4dVdGRzBva3hSTVNXVG1QUGVtdXl3VktXdDlwb0l5bGdqbHZuaE10
-VVUwcAp4Q0k4cjlYT0tOV081aytjU1VIVUNhL2F1aDNyTWFEdlE3eUlsUEplcVRXWUNkcTVydjFy
-aHhSNXptNDBOV0pma0NDYWxoWG9XWm1lClFhcXUxUVAyZUV2ck8yd0owTE52ZjZuYVY2NFpNejJS
-eVRjSjNRPT08L2RzOlNpZ25hdHVyZVZhbHVlPjxkczpLZXlJbmZvIElkPSJfMjNmOGJjNWItZDgz
-ZC00NDFkLThmMTEtZGNkZWVjZjk4MzM0Ij48ZHM6WDUwOURhdGE+PGRzOlg1MDlDZXJ0aWZpY2F0
-ZT5NSUlGT3pDQ0JDT2dBd0lCQWdJZ0xyQWJldm9hZTUyeTNmNkMydEIwU24zcDdYSm0wVDAyRm9n
-eEtDZk5oWmN3RFFZSktvWklodmNOCkFRRUxCUUF3ZkRFTE1Ba0dBMVVFQmhNQ1ZWTXhQREE2QmdO
-VkJBb1RNMGx1ZEdWeWJtVjBJRU52Y25CdmNtRjBhVzl1SUdadmNpQkIKYzNOcFoyNWxaQ0JPWVcx
-bGN5QmhibVFnVG5WdFltVnljekV2TUMwR0ExVUVBeE1tU1VOQlRrNGdWSEpoWkdWdFlYSnJJRU5z
-WldGeQphVzVuYUc5MWMyVWdVR2xzYjNRZ1EwRXdIaGNOTVRnd01qSTRNREF3TURBd1doY05Nak13
-TXpBeE1qTTFPVFU1V2pDQmp6RUxNQWtHCkExVUVCaE1DUWtVeElEQWVCZ05WQkFnVEYwSnlkWE56
-Wld4ekxVTmhjR2wwWVd3Z1VtVm5hVzl1TVJFd0R3WURWUVFIRXdoQ2NuVnoKYzJWc2N6RVJNQThH
-QTFVRUNoTUlSR1ZzYjJsMGRHVXhPREEyQmdOVkJBTVRMMGxEUVU1T0lGUk5RMGdnUVhWMGFHOXlh
-WHBsWkNCVQpjbUZrWlcxaGNtc2dVR2xzYjNRZ1ZtRnNhV1JoZEc5eU1JSUJJakFOQmdrcWhraUc5
-dzBCQVFFRkFBT0NBUThBTUlJQkNnS0NBUUVBCnhscDNLcFlIWDNXeUFzRmhTazNMd1dmbkdseG5V
-REZxRlpBM1VvdU1Zai9YaWdiTWtOZUVYSWpsa1JPS1Q0T1BHZlJ4L0xBeVJsUVEKakNNdjRxaGJr
-Y1gxcDdhcjYzZmxxNFNaTlZjbDE1bDdoMHVUNThGelNmbmx6MHU1cmtIZkpJbUQ0MyttYVAvOGd2
-MzZGUjI3alc4Ugo5d1k0aGsrV3M0SUIwaUZTZDhTWHYxS3I4dy9KbU1RU0RraXVHK1JmSWl1YndR
-L2Z5N0VrajVRV2hQWncrbU14TktuSFVMeTN4WXoyCkx3VmZmdGp3VXVlYWN2cU5SQ2tNWGxDbE9B
-RHFmVDhvU1pvZURYZWhIdmxQc0xDZW1HQm9US3Vyc2tJUzY5RjB5UEVINWd6ZTBIK2YKOEZST3NJ
-b0tTc1ZRMzRCNFMvam9FNjducHNKUFRkS3NOUEpUeVFJREFRQUJvNElCa3pDQ0FZOHdEQVlEVlIw
-VEFRSC9CQUl3QURBZApCZ05WSFE0RUZnUVVvRnBZNzZwNXlvTkRSR3RRcHpWdVI4MVVXUTB3Z2NZ
-R0ExVWRJd1NCdmpDQnU0QVV3NjArcHRZUkFFV0FYRHBYClNvcHQzREVObm5HaGdZQ2tmakI4TVFz
-d0NRWURWUVFHRXdKVlV6RThNRG9HQTFVRUNoTXpTVzUwWlhKdVpYUWdRMjl5Y0c5eVlYUnAKYjI0
-Z1ptOXlJRUZ6YzJsbmJtVmtJRTVoYldWeklHRnVaQ0JPZFcxaVpYSnpNUzh3TFFZRFZRUURFeVpK
-UTBGT1RpQlVjbUZrWlcxaApjbXNnUTJ4bFlYSnBibWRvYjNWelpTQlFhV3h2ZENCRFFZSWdMckFi
-ZXZvYWU1MnkzZjZDMnRCMFNuM3A3WEptMFQwMkZvZ3hLQ2ZOCmhYa3dEZ1lEVlIwUEFRSC9CQVFE
-QWdlQU1EUUdBMVVkSHdRdE1Dc3dLYUFub0NXR0kyaDBkSEE2THk5amNtd3VhV05oYm00dWIzSm4K
-TDNSdFkyaGZjR2xzYjNRdVkzSnNNRkVHQTFVZElBUktNRWd3RUFZT0t3WUJCQUdDeVJzQkJZTTdE
-QW93TkFZSUt3WUJCUVVIQWdFdwpLREFtQmdnckJnRUZCUWNDQVJZYWFIUjBjSE02THk5allTNXBZ
-MkZ1Ymk1dmNtY3ZjR2xzYjNRd0RRWUpLb1pJaHZjTkFRRUxCUUFECmdnRUJBQXVqWjJJY1IyRFZy
-dGFSckE1OWVOWUNsNHhjc0pNdThEUUNIdjI4ZlRmaS9CaVpZNElyN0Y5a0Z5OTZEN09aOG9MWTV6
-amYKNGRIeEZ3SFBxSDhEaDZKV3N6WHVIVzFaYTNYbWwwUGFIeENXUlMwWG9sOFdzSEhwTnlnak1C
-WWZKMG9kVk04ODVUWjFFbDlTaXVFSApueW5GQmdTbWlGYzk5dVFkL1lEUlp1R3YvQTBIeXY3eVI5
-dGtMRWREM0ExdU5KQlc0UCtISkdwZEtrWUwxUTVyVTcrb0hWUHRNS0tJCjNpRmtVRXNiTzQ1QVZk
-N3ZQL2ovN0p0QVpQYjZrb09WNWxaaTJIMVJMY2NHd3pkZXpuaEpnZDBOOW9iYjB2bkU0MS9VU1dh
-ZmRXUloKVkdrd1B1cVRobDdzQ3R6ckpIOFhZMHhjdW0rY2ZMeDJFQUl3VW5PY2FiND08L2RzOlg1
-MDlDZXJ0aWZpY2F0ZT48L2RzOlg1MDlEYXRhPjwvZHM6S2V5SW5mbz48L2RzOlNpZ25hdHVyZT48
-L3NtZDpzaWduZWRNYXJrPg==
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/revoked/smd/Trademark-Agent-Arab-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/Trademark-Agent-Arab-Revoked.smd
deleted file mode 100644
index cfb0822b0..000000000
--- a/core/src/test/resources/google/registry/tmch/revoked/smd/Trademark-Agent-Arab-Revoked.smd
+++ /dev/null
@@ -1,99 +0,0 @@
-Marks: الاختبار & لتقييم
-smdID: 000000771526319816766-65535
-U-labels: xn------nzeaagpf7azb2ppajr3fa, xn-----btdaafne4a7azpoaiq8ea, xn----ymcaaeld1a4a6onahp3ea, xn--mgbaadjcy1a8mmago8da
-notBefore: 2018-05-14T17:43:36.766Z
-notAfter: 2022-08-18T14:27:18.209Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il84MmNj
-MTdkNi00ZWM1LTRjMWEtYTE1NC0wOTgyYmNhMDExYzUiPjxzbWQ6aWQ+MDAwMDAwNzcxNTI2MzE5
-ODE2NzY2LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo0MzozNi43NjZaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0xOFQxNDoyNzoxOC4yMDlaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
-cmFkZW1hcms+PG1hcms6aWQ+MDAwMTQ0MTUwMzA2NjE5NTE1MDMwNjYxOTUtMTwvbWFyazppZD48
-bWFyazptYXJrTmFtZT7Yp9mE2KfYrtiq2KjYp9ixICZhbXA7INmE2KrZgtmK2YrZhTwvbWFyazpt
-YXJrTmFtZT48bWFyazpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpuYW1lPtmF2YfZ
-htiv2LMg2KfZhNmF2LnZhNmI2YXYp9iq2YrYqTwvbWFyazpuYW1lPjxtYXJrOmFkZHI+PG1hcms6
-c3RyZWV0Ptis2LnZgdixINin2KjZhiDYs9mK2YbYp9ihIDc1PC9tYXJrOnN0cmVldD48bWFyazpj
-aXR5PtmF2YPZhtin2LM8L21hcms6Y2l0eT48bWFyazpwYz4yOTAwPC9tYXJrOnBjPjxtYXJrOmNj
-Pk1BPC9tYXJrOmNjPjwvbWFyazphZGRyPjwvbWFyazpob2xkZXI+PG1hcms6Y29udGFjdCB0eXBl
-PSJhZ2VudCI+PG1hcms6bmFtZT7ZhdmH2YbYr9izINin2YTZhdi52YTZiNmF2KfYqtmK2Kk8L21h
-cms6bmFtZT48bWFyazpvcmc+2YjZg9in2YTYqTwvbWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpz
-dHJlZXQ+2LTYp9ix2Lkg2KzYudmB2LEg2KfYqNmGINiz2YrZhtin2KEgNzU8L21hcms6c3RyZWV0
-PjxtYXJrOmNpdHk+2YXZg9mG2KfYszwvbWFyazpjaXR5PjxtYXJrOnBjPjI5MDA8L21hcms6cGM+
-PG1hcms6Y2M+TUE8L21hcms6Y2M+PC9tYXJrOmFkZHI+PG1hcms6dm9pY2U+KzIxMi41MjI1Mzkw
-NDA8L21hcms6dm9pY2U+PG1hcms6ZmF4PisyMTIuNTIyNTM5MDQxPC9tYXJrOmZheD48bWFyazpl
-bWFpbD5pbmZvQGFnZW5jeS1tYXJvY2NvLmNvbTwvbWFyazplbWFpbD48L21hcms6Y29udGFjdD48
-bWFyazpqdXJpc2RpY3Rpb24+VVM8L21hcms6anVyaXNkaWN0aW9uPjxtYXJrOmNsYXNzPjE1PC9t
-YXJrOmNsYXNzPjxtYXJrOmxhYmVsPnhuLS0tLS0tbnplYWFncGY3YXpiMnBwYWpyM2ZhPC9tYXJr
-OmxhYmVsPjxtYXJrOmxhYmVsPnhuLS0tLS1idGRhYWZuZTRhN2F6cG9haXE4ZWE8L21hcms6bGFi
-ZWw+PG1hcms6bGFiZWw+eG4tLS0teW1jYWFlbGQxYTRhNm9uYWhwM2VhPC9tYXJrOmxhYmVsPjxt
-YXJrOmxhYmVsPnhuLS1tZ2JhYWRqY3kxYThtbWFnbzhkYTwvbWFyazpsYWJlbD48bWFyazpnb29k
-c0FuZFNlcnZpY2VzPti62YrYqtin2LE8L21hcms6Z29vZHNBbmRTZXJ2aWNlcz48bWFyazpyZWdO
-dW0+MTIzNDwvbWFyazpyZWdOdW0+PG1hcms6cmVnRGF0ZT4yMDEzLTAxLTAxVDAwOjAwOjAwLjAw
-MFo8L21hcms6cmVnRGF0ZT48L21hcms6dHJhZGVtYXJrPjwvbWFyazptYXJrPjxkczpTaWduYXR1
-cmUgeG1sbnM6ZHM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1sZHNpZyMiIElkPSJfNzQ2
-ZTE1ZWQtNWU2Mi00ZDMyLTlkZmMtNDZiY2JlNDQ0ZDU3Ij48ZHM6U2lnbmVkSW5mbz48ZHM6Q2Fu
-b25pY2FsaXphdGlvbk1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAv
-eG1sLWV4Yy1jMTRuIyIvPjxkczpTaWduYXR1cmVNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3
-LnczLm9yZy8yMDAxLzA0L3htbGRzaWctbW9yZSNyc2Etc2hhMjU2Ii8+PGRzOlJlZmVyZW5jZSBV
-Ukk9IiNfODJjYzE3ZDYtNGVjNS00YzFhLWExNTQtMDk4MmJjYTAxMWM1Ij48ZHM6VHJhbnNmb3Jt
-cz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxk
-c2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDov
-L3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpE
-aWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNz
-aGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+aUZFTDJ2UGplMnBtczlKNVNCbWl1NFdXYkhaNUpBazdB
-SldPeGtyVlFxaz08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNlPjxkczpSZWZlcmVuY2Ug
-VVJJPSIjXzBkNjcyNWQyLTRkNzUtNDM2Ny1hZGNlLTExMDFlNjNhNWI1OSI+PGRzOlRyYW5zZm9y
-bXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1s
-LWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0i
-aHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxlbmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVl
-PmViZEx0Y0w1T0pBK0ptL21MeFdyZHlNL3JXREZtTlpXRHh0UzBrRktEc1E9PC9kczpEaWdlc3RW
-YWx1ZT48L2RzOlJlZmVyZW5jZT48L2RzOlNpZ25lZEluZm8+PGRzOlNpZ25hdHVyZVZhbHVlIElk
-PSJfM2NjMTZhMjgtMzUzNS00ZGNiLThiOTQtYTBjYmY3Yjk3YzRjIj5BNVJ1UFJaZThXaGpzOUFJ
-bnpNMnluUWJXSzFFellQT3N2cm4wdFh0WERRMXJkUWhDZXVVaGREZS9GWkpkRWhHMEhzNEpER2RM
-Q2ZoCm9JbjhweWhHM3ZsOGZ1VDBJNTZFNE1NUFJHK3VsUER1ejJNeTBWaW11Z1NXcUR0QmErZ0x6
-UUFVT24ya3ZzYVZrWjZ1am43UmhFbk8KQ2ZtanBCdEcwMkxlanlZNDFQYWQ3R0hyVmlLLyt1cTV2
-QTJBbG00a20yOWlPTThQL2RvUnB0WlkxamE1ODRvdUJvaXVnbFBPcEgyUgo4YUdJWnNMU0hzc1c2
-bkgva0ovaEVBbTNxaHNzckVMbm13alExNFNrTjR6Uk1YN3JUb3M2NGJUdTdCcVZ3SFcxaFkwYkUw
-Vm9oMHFzCmpOS09hNHZmSzRVbjNnUnlJbURmR1dZdjl6MEZGTU1xSE1qekdRPT08L2RzOlNpZ25h
-dHVyZVZhbHVlPjxkczpLZXlJbmZvIElkPSJfMGQ2NzI1ZDItNGQ3NS00MzY3LWFkY2UtMTEwMWU2
-M2E1YjU5Ij48ZHM6WDUwOURhdGE+PGRzOlg1MDlDZXJ0aWZpY2F0ZT5NSUlGT3pDQ0JDT2dBd0lC
-QWdJZ0xyQWJldm9hZTUyeTNmNkMydEIwU24zcDdYSm0wVDAyRm9neEtDZk5oWmN3RFFZSktvWklo
-dmNOCkFRRUxCUUF3ZkRFTE1Ba0dBMVVFQmhNQ1ZWTXhQREE2QmdOVkJBb1RNMGx1ZEdWeWJtVjBJ
-RU52Y25CdmNtRjBhVzl1SUdadmNpQkIKYzNOcFoyNWxaQ0JPWVcxbGN5QmhibVFnVG5WdFltVnlj
-ekV2TUMwR0ExVUVBeE1tU1VOQlRrNGdWSEpoWkdWdFlYSnJJRU5zWldGeQphVzVuYUc5MWMyVWdV
-R2xzYjNRZ1EwRXdIaGNOTVRnd01qSTRNREF3TURBd1doY05Nak13TXpBeE1qTTFPVFU1V2pDQmp6
-RUxNQWtHCkExVUVCaE1DUWtVeElEQWVCZ05WQkFnVEYwSnlkWE56Wld4ekxVTmhjR2wwWVd3Z1Vt
-Vm5hVzl1TVJFd0R3WURWUVFIRXdoQ2NuVnoKYzJWc2N6RVJNQThHQTFVRUNoTUlSR1ZzYjJsMGRH
-VXhPREEyQmdOVkJBTVRMMGxEUVU1T0lGUk5RMGdnUVhWMGFHOXlhWHBsWkNCVQpjbUZrWlcxaGNt
-c2dVR2xzYjNRZ1ZtRnNhV1JoZEc5eU1JSUJJakFOQmdrcWhraUc5dzBCQVFFRkFBT0NBUThBTUlJ
-QkNnS0NBUUVBCnhscDNLcFlIWDNXeUFzRmhTazNMd1dmbkdseG5VREZxRlpBM1VvdU1Zai9YaWdi
-TWtOZUVYSWpsa1JPS1Q0T1BHZlJ4L0xBeVJsUVEKakNNdjRxaGJrY1gxcDdhcjYzZmxxNFNaTlZj
-bDE1bDdoMHVUNThGelNmbmx6MHU1cmtIZkpJbUQ0MyttYVAvOGd2MzZGUjI3alc4Ugo5d1k0aGsr
-V3M0SUIwaUZTZDhTWHYxS3I4dy9KbU1RU0RraXVHK1JmSWl1YndRL2Z5N0VrajVRV2hQWncrbU14
-TktuSFVMeTN4WXoyCkx3VmZmdGp3VXVlYWN2cU5SQ2tNWGxDbE9BRHFmVDhvU1pvZURYZWhIdmxQ
-c0xDZW1HQm9US3Vyc2tJUzY5RjB5UEVINWd6ZTBIK2YKOEZST3NJb0tTc1ZRMzRCNFMvam9FNjdu
-cHNKUFRkS3NOUEpUeVFJREFRQUJvNElCa3pDQ0FZOHdEQVlEVlIwVEFRSC9CQUl3QURBZApCZ05W
-SFE0RUZnUVVvRnBZNzZwNXlvTkRSR3RRcHpWdVI4MVVXUTB3Z2NZR0ExVWRJd1NCdmpDQnU0QVV3
-NjArcHRZUkFFV0FYRHBYClNvcHQzREVObm5HaGdZQ2tmakI4TVFzd0NRWURWUVFHRXdKVlV6RThN
-RG9HQTFVRUNoTXpTVzUwWlhKdVpYUWdRMjl5Y0c5eVlYUnAKYjI0Z1ptOXlJRUZ6YzJsbmJtVmtJ
-RTVoYldWeklHRnVaQ0JPZFcxaVpYSnpNUzh3TFFZRFZRUURFeVpKUTBGT1RpQlVjbUZrWlcxaApj
-bXNnUTJ4bFlYSnBibWRvYjNWelpTQlFhV3h2ZENCRFFZSWdMckFiZXZvYWU1MnkzZjZDMnRCMFNu
-M3A3WEptMFQwMkZvZ3hLQ2ZOCmhYa3dEZ1lEVlIwUEFRSC9CQVFEQWdlQU1EUUdBMVVkSHdRdE1D
-c3dLYUFub0NXR0kyaDBkSEE2THk5amNtd3VhV05oYm00dWIzSm4KTDNSdFkyaGZjR2xzYjNRdVkz
-SnNNRkVHQTFVZElBUktNRWd3RUFZT0t3WUJCQUdDeVJzQkJZTTdEQW93TkFZSUt3WUJCUVVIQWdF
-dwpLREFtQmdnckJnRUZCUWNDQVJZYWFIUjBjSE02THk5allTNXBZMkZ1Ymk1dmNtY3ZjR2xzYjNR
-d0RRWUpLb1pJaHZjTkFRRUxCUUFECmdnRUJBQXVqWjJJY1IyRFZydGFSckE1OWVOWUNsNHhjc0pN
-dThEUUNIdjI4ZlRmaS9CaVpZNElyN0Y5a0Z5OTZEN09aOG9MWTV6amYKNGRIeEZ3SFBxSDhEaDZK
-V3N6WHVIVzFaYTNYbWwwUGFIeENXUlMwWG9sOFdzSEhwTnlnak1CWWZKMG9kVk04ODVUWjFFbDlT
-aXVFSApueW5GQmdTbWlGYzk5dVFkL1lEUlp1R3YvQTBIeXY3eVI5dGtMRWREM0ExdU5KQlc0UCtI
-SkdwZEtrWUwxUTVyVTcrb0hWUHRNS0tJCjNpRmtVRXNiTzQ1QVZkN3ZQL2ovN0p0QVpQYjZrb09W
-NWxaaTJIMVJMY2NHd3pkZXpuaEpnZDBOOW9iYjB2bkU0MS9VU1dhZmRXUloKVkdrd1B1cVRobDdz
-Q3R6ckpIOFhZMHhjdW0rY2ZMeDJFQUl3VW5PY2FiND08L2RzOlg1MDlDZXJ0aWZpY2F0ZT48L2Rz
-Olg1MDlEYXRhPjwvZHM6S2V5SW5mbz48L2RzOlNpZ25hdHVyZT48L3NtZDpzaWduZWRNYXJrPg==
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/revoked/smd/Trademark-Agent-Chinese-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/Trademark-Agent-Chinese-Revoked.smd
deleted file mode 100644
index dcc7a1516..000000000
--- a/core/src/test/resources/google/registry/tmch/revoked/smd/Trademark-Agent-Chinese-Revoked.smd
+++ /dev/null
@@ -1,98 +0,0 @@
-Marks: 审判&错误
-smdID: 000000801526319822461-65535
-U-labels: xn----ke8al50aln4ceuj, xn--and-ui2eu74b9t4egon, xn--et-pg5cw37ax04dfrl, xn--fcr14u8t4bdxh
-notBefore: 2018-05-14T17:43:42.461Z
-notAfter: 2022-08-18T14:36:50.931Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il9jMjdh
-ZmQ4YS04NWNmLTRlNWYtYWU4ZS1mZTNkZGM0Njg1YmYiPjxzbWQ6aWQ+MDAwMDAwODAxNTI2MzE5
-ODIyNDYxLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo0Mzo0Mi40NjFaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0xOFQxNDozNjo1MC45MzFaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
-cmFkZW1hcms+PG1hcms6aWQ+MDAwMTQ2MTUwMzA2Njc5NTE1MDMwNjY3OTUtMTwvbWFyazppZD48
-bWFyazptYXJrTmFtZT7lrqHliKQmYW1wO+mUmeivrzwvbWFyazptYXJrTmFtZT48bWFyazpob2xk
-ZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpvcmc+5bel56iL5aSEPC9tYXJrOm9yZz48bWFy
-azphZGRyPjxtYXJrOnN0cmVldD7pppnmuK/kuJzot6825Y+377yMNeWPt+alvO+8jDjlj7flrqQ8
-L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+6Z2S5bKb5biCPC9tYXJrOmNpdHk+PG1hcms6cGM+MzUw
-MDwvbWFyazpwYz48bWFyazpjYz5DTjwvbWFyazpjYz48L21hcms6YWRkcj48L21hcms6aG9sZGVy
-PjxtYXJrOmNvbnRhY3QgdHlwZT0iYWdlbnQiPjxtYXJrOm5hbWU+5p2O5bCP5pa5PC9tYXJrOm5h
-bWU+PG1hcms6b3JnPuW3peeoi+WkhDwvbWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpzdHJlZXQ+
-6aaZ5riv5Lic6LevNuWPt++8jDXlj7fmpbzvvIw45Y+35a6kPC9tYXJrOnN0cmVldD48bWFyazpj
-aXR5PumdkuWym+W4gjwvbWFyazpjaXR5PjxtYXJrOnBjPjM1MDA8L21hcms6cGM+PG1hcms6Y2M+
-Q048L21hcms6Y2M+PC9tYXJrOmFkZHI+PG1hcms6dm9pY2U+Kzg2LjEwODQ2NTcxNzM8L21hcms6
-dm9pY2U+PG1hcms6ZmF4Pis4Ni4xMDg0NjU3MTc1PC9tYXJrOmZheD48bWFyazplbWFpbD5pbmZv
-QGNoaW5lc2UtYWdlbmN5LmNvbTwvbWFyazplbWFpbD48L21hcms6Y29udGFjdD48bWFyazpqdXJp
-c2RpY3Rpb24+VVM8L21hcms6anVyaXNkaWN0aW9uPjxtYXJrOmNsYXNzPjE1PC9tYXJrOmNsYXNz
-PjxtYXJrOmxhYmVsPnhuLS0tLWtlOGFsNTBhbG40Y2V1ajwvbWFyazpsYWJlbD48bWFyazpsYWJl
-bD54bi0tYW5kLXVpMmV1NzRiOXQ0ZWdvbjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tZXQt
-cGc1Y3czN2F4MDRkZnJsPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1mY3IxNHU4dDRiZHho
-PC9tYXJrOmxhYmVsPjxtYXJrOmdvb2RzQW5kU2VydmljZXM+5ZCJ5LuWPC9tYXJrOmdvb2RzQW5k
-U2VydmljZXM+PG1hcms6cmVnTnVtPjEyMzQ8L21hcms6cmVnTnVtPjxtYXJrOnJlZ0RhdGU+MjAx
-My0wMS0wMVQwMDowMDowMC4wMDBaPC9tYXJrOnJlZ0RhdGU+PC9tYXJrOnRyYWRlbWFyaz48L21h
-cms6bWFyaz48ZHM6U2lnbmF0dXJlIHhtbG5zOmRzPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5
-L3htbGRzaWcjIiBJZD0iX2RjMTE4ODY5LTU4ZGUtNGJlMi1hZTcwLTNiYTk5N2RhMjNhYSI+PGRz
-OlNpZ25lZEluZm8+PGRzOkNhbm9uaWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGhtPSJodHRwOi8v
-d3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJlTWV0aG9kIEFs
-Z29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxkc2lnLW1vcmUjcnNhLXNoYTI1
-NiIvPjxkczpSZWZlcmVuY2UgVVJJPSIjX2MyN2FmZDhhLTg1Y2YtNGU1Zi1hZThlLWZlM2RkYzQ2
-ODViZiI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cu
-dzMub3JnLzIwMDAvMDkveG1sZHNpZyNlbnZlbG9wZWQtc2lnbmF0dXJlIi8+PGRzOlRyYW5zZm9y
-bSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwv
-ZHM6VHJhbnNmb3Jtcz48ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5v
-cmcvMjAwMS8wNC94bWxlbmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPkFPS2g5T1o2VEFJWXF6
-SXhWWU5VTWEzalNzdHpEZ2JjYkdoamFUVWRxTFU9PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVy
-ZW5jZT48ZHM6UmVmZXJlbmNlIFVSST0iI18yYTBjOTY0Ni1hNTNlLTQzN2YtYTE4Ny1kMmYyZTRm
-ZmQyNWIiPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3
-LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2Vz
-dE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1
-NiIvPjxkczpEaWdlc3RWYWx1ZT5Hcjl1M051WXVwelNpME15Rjd5S3FSVlpkTUhFdC9ZMVh4WUdV
-d2JTclhFPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PC9kczpTaWduZWRJbmZvPjxk
-czpTaWduYXR1cmVWYWx1ZSBJZD0iX2JiNzBjYzIwLWQ2OWYtNDE0MS05ZTFjLWJjMTMxMjYzMTky
-NCI+ZkdDQk1mOHZnQWVBbGozOWFrZ3RxUW9VbU5NWDVuYlRpQ0JOb05PQlZ1clQ4b3h2UE5OK053
-ejd0VkhBUlk0bHlpUUN2TTAvVzQybQpGaGVYNHl4bkpGeVc3czRaa2VOd2M2Ry9pTFFnL051SVVQ
-N1YyaTExZStBYjk4ZjhHSnNjQ2MwZklrdjdoblFsd211ZmkvczNmUEpWClBZdGg0U1JnUWJ4cy9X
-YzQ2WGowS0llZSt5Uyt5Q09NUzZCa3hORnZUVXRBUnhCTU16dElPRDFrbi9FRExENVREaGZEWXNK
-RE0xMXcKVVJKUjhTdFFoT3hjRTNqZlBOcHpKTnd2MkNFT0ErRkZreFdWOWpFMUk5cEV0emlCQ0Er
-YWRjdU1pSDJUeEpNOURBZ0hTRFRtSVQyTQpFZWxMM3A0K3pGWlBRVWIxRFlTUnM0VCtxZ29nb2cw
-dlhWV3FjQT09PC9kczpTaWduYXR1cmVWYWx1ZT48ZHM6S2V5SW5mbyBJZD0iXzJhMGM5NjQ2LWE1
-M2UtNDM3Zi1hMTg3LWQyZjJlNGZmZDI1YiI+PGRzOlg1MDlEYXRhPjxkczpYNTA5Q2VydGlmaWNh
-dGU+TUlJRk96Q0NCQ09nQXdJQkFnSWdMckFiZXZvYWU1MnkzZjZDMnRCMFNuM3A3WEptMFQwMkZv
-Z3hLQ2ZOaFpjd0RRWUpLb1pJaHZjTgpBUUVMQlFBd2ZERUxNQWtHQTFVRUJoTUNWVk14UERBNkJn
-TlZCQW9UTTBsdWRHVnlibVYwSUVOdmNuQnZjbUYwYVc5dUlHWnZjaUJCCmMzTnBaMjVsWkNCT1lX
-MWxjeUJoYm1RZ1RuVnRZbVZ5Y3pFdk1DMEdBMVVFQXhNbVNVTkJUazRnVkhKaFpHVnRZWEpySUVO
-c1pXRnkKYVc1bmFHOTFjMlVnVUdsc2IzUWdRMEV3SGhjTk1UZ3dNakk0TURBd01EQXdXaGNOTWpN
-d016QXhNak0xT1RVNVdqQ0JqekVMTUFrRwpBMVVFQmhNQ1FrVXhJREFlQmdOVkJBZ1RGMEp5ZFhO
-elpXeHpMVU5oY0dsMFlXd2dVbVZuYVc5dU1SRXdEd1lEVlFRSEV3aENjblZ6CmMyVnNjekVSTUE4
-R0ExVUVDaE1JUkdWc2IybDBkR1V4T0RBMkJnTlZCQU1UTDBsRFFVNU9JRlJOUTBnZ1FYVjBhRzl5
-YVhwbFpDQlUKY21Ga1pXMWhjbXNnVUdsc2IzUWdWbUZzYVdSaGRHOXlNSUlCSWpBTkJna3Foa2lH
-OXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQQp4bHAzS3BZSFgzV3lBc0ZoU2szTHdXZm5HbHhu
-VURGcUZaQTNVb3VNWWovWGlnYk1rTmVFWElqbGtST0tUNE9QR2ZSeC9MQXlSbFFRCmpDTXY0cWhi
-a2NYMXA3YXI2M2ZscTRTWk5WY2wxNWw3aDB1VDU4RnpTZm5sejB1NXJrSGZKSW1ENDMrbWFQLzhn
-djM2RlIyN2pXOFIKOXdZNGhrK1dzNElCMGlGU2Q4U1h2MUtyOHcvSm1NUVNEa2l1RytSZklpdWJ3
-US9meTdFa2o1UVdoUFp3K21NeE5LbkhVTHkzeFl6MgpMd1ZmZnRqd1V1ZWFjdnFOUkNrTVhsQ2xP
-QURxZlQ4b1Nab2VEWGVoSHZsUHNMQ2VtR0JvVEt1cnNrSVM2OUYweVBFSDVnemUwSCtmCjhGUk9z
-SW9LU3NWUTM0QjRTL2pvRTY3bnBzSlBUZEtzTlBKVHlRSURBUUFCbzRJQmt6Q0NBWTh3REFZRFZS
-MFRBUUgvQkFJd0FEQWQKQmdOVkhRNEVGZ1FVb0ZwWTc2cDV5b05EUkd0UXB6VnVSODFVV1Ewd2dj
-WUdBMVVkSXdTQnZqQ0J1NEFVdzYwK3B0WVJBRVdBWERwWApTb3B0M0RFTm5uR2hnWUNrZmpCOE1R
-c3dDUVlEVlFRR0V3SlZVekU4TURvR0ExVUVDaE16U1c1MFpYSnVaWFFnUTI5eWNHOXlZWFJwCmIy
-NGdabTl5SUVGemMybG5ibVZrSUU1aGJXVnpJR0Z1WkNCT2RXMWlaWEp6TVM4d0xRWURWUVFERXla
-SlEwRk9UaUJVY21Ga1pXMWgKY21zZ1EyeGxZWEpwYm1kb2IzVnpaU0JRYVd4dmRDQkRRWUlnTHJB
-YmV2b2FlNTJ5M2Y2QzJ0QjBTbjNwN1hKbTBUMDJGb2d4S0NmTgpoWGt3RGdZRFZSMFBBUUgvQkFR
-REFnZUFNRFFHQTFVZEh3UXRNQ3N3S2FBbm9DV0dJMmgwZEhBNkx5OWpjbXd1YVdOaGJtNHViM0pu
-CkwzUnRZMmhmY0dsc2IzUXVZM0pzTUZFR0ExVWRJQVJLTUVnd0VBWU9Ld1lCQkFHQ3lSc0JCWU03
-REFvd05BWUlLd1lCQlFVSEFnRXcKS0RBbUJnZ3JCZ0VGQlFjQ0FSWWFhSFIwY0hNNkx5OWpZUzVw
-WTJGdWJpNXZjbWN2Y0dsc2IzUXdEUVlKS29aSWh2Y05BUUVMQlFBRApnZ0VCQUF1aloySWNSMkRW
-cnRhUnJBNTllTllDbDR4Y3NKTXU4RFFDSHYyOGZUZmkvQmlaWTRJcjdGOWtGeTk2RDdPWjhvTFk1
-empmCjRkSHhGd0hQcUg4RGg2Sldzelh1SFcxWmEzWG1sMFBhSHhDV1JTMFhvbDhXc0hIcE55Z2pN
-QllmSjBvZFZNODg1VFoxRWw5U2l1RUgKbnluRkJnU21pRmM5OXVRZC9ZRFJadUd2L0EwSHl2N3lS
-OXRrTEVkRDNBMXVOSkJXNFArSEpHcGRLa1lMMVE1clU3K29IVlB0TUtLSQozaUZrVUVzYk80NUFW
-ZDd2UC9qLzdKdEFaUGI2a29PVjVsWmkySDFSTGNjR3d6ZGV6bmhKZ2QwTjlvYmIwdm5FNDEvVVNX
-YWZkV1JaClZHa3dQdXFUaGw3c0N0enJKSDhYWTB4Y3VtK2NmTHgyRUFJd1VuT2NhYjQ9PC9kczpY
-NTA5Q2VydGlmaWNhdGU+PC9kczpYNTA5RGF0YT48L2RzOktleUluZm8+PC9kczpTaWduYXR1cmU+
-PC9zbWQ6c2lnbmVkTWFyaz4=
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/revoked/smd/Trademark-Agent-English-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/Trademark-Agent-English-Revoked.smd
deleted file mode 100644
index 0091ada8c..000000000
--- a/core/src/test/resources/google/registry/tmch/revoked/smd/Trademark-Agent-English-Revoked.smd
+++ /dev/null
@@ -1,102 +0,0 @@
-Marks: Test & Validate
-smdID: 000000871526319833901-65535
-U-labels: test---validate, test--validate, test-and-validate, test-andvalidate, test-validate, testand-validate, testandvalidate, testet-validate, testetvalidate, testvalidate
-notBefore: 2018-05-14T17:43:53.901Z
-notAfter: 2022-08-18T14:57:36.681Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il85OWYz
-NDQxNy1hM2E0LTRlMzMtYmEyMS04OGYyNDA0MTMwZDMiPjxzbWQ6aWQ+MDAwMDAwODcxNTI2MzE5
-ODMzOTAxLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo0Mzo1My45MDFaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0xOFQxNDo1NzozNi42ODFaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
-cmFkZW1hcms+PG1hcms6aWQ+MDAwMTM3MTUwMzA2ODA0OTE1MDMwNjgwNDktMTwvbWFyazppZD48
-bWFyazptYXJrTmFtZT5UZXN0ICZhbXA7IFZhbGlkYXRlPC9tYXJrOm1hcmtOYW1lPjxtYXJrOmhv
-bGRlciBlbnRpdGxlbWVudD0ib3duZXIiPjxtYXJrOm5hbWU+VG9ueSBIb2xsYW5kPC9tYXJrOm5h
-bWU+PG1hcms6b3JnPkFnIGNvcnBvcmF0aW9uPC9tYXJrOm9yZz48bWFyazphZGRyPjxtYXJrOnN0
-cmVldD4xMzA1IEJyaWdodCBBdmVudWU8L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+QXJjYWRpYTwv
-bWFyazpjaXR5PjxtYXJrOnBjPjkwMDI4PC9tYXJrOnBjPjxtYXJrOmNjPlVTPC9tYXJrOmNjPjwv
-bWFyazphZGRyPjwvbWFyazpob2xkZXI+PG1hcms6Y29udGFjdCB0eXBlPSJhZ2VudCI+PG1hcms6
-bmFtZT5Ub255IEhvbGxhbmQ8L21hcms6bmFtZT48bWFyazpvcmc+QWcgY29ycG9yYXRpb248L21h
-cms6b3JnPjxtYXJrOmFkZHI+PG1hcms6c3RyZWV0PkJyaWdodCBBdmVudWUgMTMwNSA8L21hcms6
-c3RyZWV0PjxtYXJrOmNpdHk+QXJjYWRpYTwvbWFyazpjaXR5PjxtYXJrOnNwPkNBPC9tYXJrOnNw
-PjxtYXJrOnBjPjkwMDI4PC9tYXJrOnBjPjxtYXJrOmNjPlVTPC9tYXJrOmNjPjwvbWFyazphZGRy
-PjxtYXJrOnZvaWNlPisxLjIwMjU1NjIzMDI8L21hcms6dm9pY2U+PG1hcms6ZmF4PisxLjIwMjU1
-NjIzMDE8L21hcms6ZmF4PjxtYXJrOmVtYWlsPmluZm9AYWdjb3Jwb3JhdGlvbi5jb208L21hcms6
-ZW1haWw+PC9tYXJrOmNvbnRhY3Q+PG1hcms6anVyaXNkaWN0aW9uPlVTPC9tYXJrOmp1cmlzZGlj
-dGlvbj48bWFyazpjbGFzcz4xNTwvbWFyazpjbGFzcz48bWFyazpsYWJlbD50ZXN0LS0tdmFsaWRh
-dGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+dGVzdC0tdmFsaWRhdGU8L21hcms6bGFiZWw+PG1h
-cms6bGFiZWw+dGVzdC1hbmQtdmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+dGVzdC1h
-bmR2YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0LXZhbGlkYXRlPC9tYXJrOmxh
-YmVsPjxtYXJrOmxhYmVsPnRlc3RhbmQtdmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+
-dGVzdGFuZHZhbGlkYXRlPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnRlc3RldC12YWxpZGF0ZTwv
-bWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0ZXR2YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazps
-YWJlbD50ZXN0dmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6Z29vZHNBbmRTZXJ2aWNlcz5ndWl0
-YXI8L21hcms6Z29vZHNBbmRTZXJ2aWNlcz48bWFyazpyZWdOdW0+MTIzNDwvbWFyazpyZWdOdW0+
-PG1hcms6cmVnRGF0ZT4yMDEzLTAxLTAxVDAwOjAwOjAwLjAwMFo8L21hcms6cmVnRGF0ZT48L21h
-cms6dHJhZGVtYXJrPjwvbWFyazptYXJrPjxkczpTaWduYXR1cmUgeG1sbnM6ZHM9Imh0dHA6Ly93
-d3cudzMub3JnLzIwMDAvMDkveG1sZHNpZyMiIElkPSJfNjMzNzgxYWYtMDI5OS00ODBiLTk0ZjMt
-ZDE3NDUxNTFiOWYzIj48ZHM6U2lnbmVkSW5mbz48ZHM6Q2Fub25pY2FsaXphdGlvbk1ldGhvZCBB
-bGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjxkczpT
-aWduYXR1cmVNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGRz
-aWctbW9yZSNyc2Etc2hhMjU2Ii8+PGRzOlJlZmVyZW5jZSBVUkk9IiNfOTlmMzQ0MTctYTNhNC00
-ZTMzLWJhMjEtODhmMjQwNDEzMGQzIj48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29y
-aXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1
-cmUiLz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94
-bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGht
-PSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFs
-dWU+Nm45eTdJNDhvZUM3L2NOQSt0WmtvUmxodCtNVSs1Q2xuRnArU0hxSlkzND08L2RzOkRpZ2Vz
-dFZhbHVlPjwvZHM6UmVmZXJlbmNlPjxkczpSZWZlcmVuY2UgVVJJPSIjXzY1NGQ2NzRkLWM3ZmMt
-NDFkYi1iNzI0LTUyY2UwN2U1ZDZhNiI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdv
-cml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJh
-bnNmb3Jtcz48ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAw
-MS8wNC94bWxlbmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPjlWUkw1Q1ZicVorVkUzaHl6NlJX
-cjdBSWh1dS9LeEE2MjBSOEtuRjVzOW89PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48
-L2RzOlNpZ25lZEluZm8+PGRzOlNpZ25hdHVyZVZhbHVlIElkPSJfNGU5M2M2ZjItNzdhYi00Mjkx
-LTg1NmYtZjBjNjllNjU1NzFkIj5JL0FCV04rS0lwWGVCZDlBQ2tpQUM2QlhzMFhNZmhVS29HWXJB
-V0JHamFvWDRWYlRLTy85Q3ZUNUROUFFpclpzUGdDeGNmZFlrMzFjClBNNUZsaFRvVzJtMHdkWTFP
-aG4xNlZNcUZDN3BULzArQkplMzViOFQ1TEo0ZlRhMDIzcmFhR0FuQW5VSVI2SGNGTE1yYUVJSVFK
-eFYKcm9nb0E5Ym9tSXJFQi8rR0dJSW5wbXNQTXVUQnZKRFk4OUtLZEtKckFTeURlTHBMNktRNUIx
-bFZjVEliM0tFcnp4TVpwcjBKQmVtMQpDUjh6bTFwSTZFR2JTSGtEUVdPV1dYWUtFMG9ORUdab05P
-bnFVajhNNkZ3eVpFMXRESTdJY2pLcjZXRHlQM2QyZHRURy9OOFNEUGsrCk9ORFNqY2l0RjRIQzJV
-YkE3aXpScUN0QS96VTJwVFpuek5pd253PT08L2RzOlNpZ25hdHVyZVZhbHVlPjxkczpLZXlJbmZv
-IElkPSJfNjU0ZDY3NGQtYzdmYy00MWRiLWI3MjQtNTJjZTA3ZTVkNmE2Ij48ZHM6WDUwOURhdGE+
-PGRzOlg1MDlDZXJ0aWZpY2F0ZT5NSUlGT3pDQ0JDT2dBd0lCQWdJZ0xyQWJldm9hZTUyeTNmNkMy
-dEIwU24zcDdYSm0wVDAyRm9neEtDZk5oWmN3RFFZSktvWklodmNOCkFRRUxCUUF3ZkRFTE1Ba0dB
-MVVFQmhNQ1ZWTXhQREE2QmdOVkJBb1RNMGx1ZEdWeWJtVjBJRU52Y25CdmNtRjBhVzl1SUdadmNp
-QkIKYzNOcFoyNWxaQ0JPWVcxbGN5QmhibVFnVG5WdFltVnljekV2TUMwR0ExVUVBeE1tU1VOQlRr
-NGdWSEpoWkdWdFlYSnJJRU5zWldGeQphVzVuYUc5MWMyVWdVR2xzYjNRZ1EwRXdIaGNOTVRnd01q
-STRNREF3TURBd1doY05Nak13TXpBeE1qTTFPVFU1V2pDQmp6RUxNQWtHCkExVUVCaE1DUWtVeElE
-QWVCZ05WQkFnVEYwSnlkWE56Wld4ekxVTmhjR2wwWVd3Z1VtVm5hVzl1TVJFd0R3WURWUVFIRXdo
-Q2NuVnoKYzJWc2N6RVJNQThHQTFVRUNoTUlSR1ZzYjJsMGRHVXhPREEyQmdOVkJBTVRMMGxEUVU1
-T0lGUk5RMGdnUVhWMGFHOXlhWHBsWkNCVQpjbUZrWlcxaGNtc2dVR2xzYjNRZ1ZtRnNhV1JoZEc5
-eU1JSUJJakFOQmdrcWhraUc5dzBCQVFFRkFBT0NBUThBTUlJQkNnS0NBUUVBCnhscDNLcFlIWDNX
-eUFzRmhTazNMd1dmbkdseG5VREZxRlpBM1VvdU1Zai9YaWdiTWtOZUVYSWpsa1JPS1Q0T1BHZlJ4
-L0xBeVJsUVEKakNNdjRxaGJrY1gxcDdhcjYzZmxxNFNaTlZjbDE1bDdoMHVUNThGelNmbmx6MHU1
-cmtIZkpJbUQ0MyttYVAvOGd2MzZGUjI3alc4Ugo5d1k0aGsrV3M0SUIwaUZTZDhTWHYxS3I4dy9K
-bU1RU0RraXVHK1JmSWl1YndRL2Z5N0VrajVRV2hQWncrbU14TktuSFVMeTN4WXoyCkx3VmZmdGp3
-VXVlYWN2cU5SQ2tNWGxDbE9BRHFmVDhvU1pvZURYZWhIdmxQc0xDZW1HQm9US3Vyc2tJUzY5RjB5
-UEVINWd6ZTBIK2YKOEZST3NJb0tTc1ZRMzRCNFMvam9FNjducHNKUFRkS3NOUEpUeVFJREFRQUJv
-NElCa3pDQ0FZOHdEQVlEVlIwVEFRSC9CQUl3QURBZApCZ05WSFE0RUZnUVVvRnBZNzZwNXlvTkRS
-R3RRcHpWdVI4MVVXUTB3Z2NZR0ExVWRJd1NCdmpDQnU0QVV3NjArcHRZUkFFV0FYRHBYClNvcHQz
-REVObm5HaGdZQ2tmakI4TVFzd0NRWURWUVFHRXdKVlV6RThNRG9HQTFVRUNoTXpTVzUwWlhKdVpY
-UWdRMjl5Y0c5eVlYUnAKYjI0Z1ptOXlJRUZ6YzJsbmJtVmtJRTVoYldWeklHRnVaQ0JPZFcxaVpY
-SnpNUzh3TFFZRFZRUURFeVpKUTBGT1RpQlVjbUZrWlcxaApjbXNnUTJ4bFlYSnBibWRvYjNWelpT
-QlFhV3h2ZENCRFFZSWdMckFiZXZvYWU1MnkzZjZDMnRCMFNuM3A3WEptMFQwMkZvZ3hLQ2ZOCmhY
-a3dEZ1lEVlIwUEFRSC9CQVFEQWdlQU1EUUdBMVVkSHdRdE1Dc3dLYUFub0NXR0kyaDBkSEE2THk5
-amNtd3VhV05oYm00dWIzSm4KTDNSdFkyaGZjR2xzYjNRdVkzSnNNRkVHQTFVZElBUktNRWd3RUFZ
-T0t3WUJCQUdDeVJzQkJZTTdEQW93TkFZSUt3WUJCUVVIQWdFdwpLREFtQmdnckJnRUZCUWNDQVJZ
-YWFIUjBjSE02THk5allTNXBZMkZ1Ymk1dmNtY3ZjR2xzYjNRd0RRWUpLb1pJaHZjTkFRRUxCUUFE
-CmdnRUJBQXVqWjJJY1IyRFZydGFSckE1OWVOWUNsNHhjc0pNdThEUUNIdjI4ZlRmaS9CaVpZNEly
-N0Y5a0Z5OTZEN09aOG9MWTV6amYKNGRIeEZ3SFBxSDhEaDZKV3N6WHVIVzFaYTNYbWwwUGFIeENX
-UlMwWG9sOFdzSEhwTnlnak1CWWZKMG9kVk04ODVUWjFFbDlTaXVFSApueW5GQmdTbWlGYzk5dVFk
-L1lEUlp1R3YvQTBIeXY3eVI5dGtMRWREM0ExdU5KQlc0UCtISkdwZEtrWUwxUTVyVTcrb0hWUHRN
-S0tJCjNpRmtVRXNiTzQ1QVZkN3ZQL2ovN0p0QVpQYjZrb09WNWxaaTJIMVJMY2NHd3pkZXpuaEpn
-ZDBOOW9iYjB2bkU0MS9VU1dhZmRXUloKVkdrd1B1cVRobDdzQ3R6ckpIOFhZMHhjdW0rY2ZMeDJF
-QUl3VW5PY2FiND08L2RzOlg1MDlDZXJ0aWZpY2F0ZT48L2RzOlg1MDlEYXRhPjwvZHM6S2V5SW5m
-bz48L2RzOlNpZ25hdHVyZT48L3NtZDpzaWduZWRNYXJrPg==
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/revoked/smd/Trademark-Agent-French-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/Trademark-Agent-French-Revoked.smd
deleted file mode 100644
index 035c529fc..000000000
--- a/core/src/test/resources/google/registry/tmch/revoked/smd/Trademark-Agent-French-Revoked.smd
+++ /dev/null
@@ -1,103 +0,0 @@
-Marks: Essai & évaluation
-smdID: 000000831526319828198-65535
-U-labels: xn--essai---valuation-itb, xn--essai--valuation-hqb, xn--essai-and-valuation-kzb, xn--essai-andvaluation-jwb, xn--essai-valuation-gnb, xn--essaiand-valuation-jwb, xn--essaiandvaluation-itb, xn--essaiet-valuation-itb, xn--essaietvaluation-hqb, xn--essaivaluation-fkb
-notBefore: 2018-05-14T17:43:48.198Z
-notAfter: 2022-08-18T14:46:53.013Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il85YTEx
-NzNkOS0xZDEyLTRlYzYtYWE1Mi03Nzc1MGE0ODkwY2UiPjxzbWQ6aWQ+MDAwMDAwODMxNTI2MzE5
-ODI4MTk4LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo0Mzo0OC4xOThaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0xOFQxNDo0Njo1My4wMTNaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
-cmFkZW1hcms+PG1hcms6aWQ+MDAwMTM5MTUwMzA2NzM4MjE1MDMwNjczODItMTwvbWFyazppZD48
-bWFyazptYXJrTmFtZT5Fc3NhaSAmYW1wOyDDqXZhbHVhdGlvbjwvbWFyazptYXJrTmFtZT48bWFy
-azpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpvcmc+QWdlbmNlIGVuIEZyYW5jZTwv
-bWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpzdHJlZXQ+MTAgQXZlbnVlIFJvdXNzZWF1eDwvbWFy
-azpzdHJlZXQ+PG1hcms6Y2l0eT5WZXJzYWlsbGVzPC9tYXJrOmNpdHk+PG1hcms6cGM+MzMwODE8
-L21hcms6cGM+PG1hcms6Y2M+RlI8L21hcms6Y2M+PC9tYXJrOmFkZHI+PC9tYXJrOmhvbGRlcj48
-bWFyazpjb250YWN0IHR5cGU9ImFnZW50Ij48bWFyazpuYW1lPkZyYW5jIExlYnJ1bjwvbWFyazpu
-YW1lPjxtYXJrOm9yZz5BZ2VuY2UgZW4gRnJhbmNlPC9tYXJrOm9yZz48bWFyazphZGRyPjxtYXJr
-OnN0cmVldD5BdmVudWUgUm91c3NlYXV4IDEwIDwvbWFyazpzdHJlZXQ+PG1hcms6Y2l0eT5WZXJz
-YWlsbGVzPC9tYXJrOmNpdHk+PG1hcms6cGM+MzMwODE8L21hcms6cGM+PG1hcms6Y2M+RlI8L21h
-cms6Y2M+PC9tYXJrOmFkZHI+PG1hcms6dm9pY2U+KzMzLjEyNTc4MTI1MDwvbWFyazp2b2ljZT48
-bWFyazpmYXg+KzMzLjEyNTc4MTI1MTwvbWFyazpmYXg+PG1hcms6ZW1haWw+aW5mb0BhZ2VuY2Ut
-ZW4tZnJhbmNlLmZyPC9tYXJrOmVtYWlsPjwvbWFyazpjb250YWN0PjxtYXJrOmp1cmlzZGljdGlv
-bj5VUzwvbWFyazpqdXJpc2RpY3Rpb24+PG1hcms6Y2xhc3M+MTU8L21hcms6Y2xhc3M+PG1hcms6
-bGFiZWw+eG4tLWVzc2FpLS0tdmFsdWF0aW9uLWl0YjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54
-bi0tZXNzYWktLXZhbHVhdGlvbi1ocWI8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLWVzc2Fp
-LWFuZC12YWx1YXRpb24ta3piPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1lc3NhaS1hbmR2
-YWx1YXRpb24tandiPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1lc3NhaS12YWx1YXRpb24t
-Z25iPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1lc3NhaWFuZC12YWx1YXRpb24tandiPC9t
-YXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1lc3NhaWFuZHZhbHVhdGlvbi1pdGI8L21hcms6bGFi
-ZWw+PG1hcms6bGFiZWw+eG4tLWVzc2FpZXQtdmFsdWF0aW9uLWl0YjwvbWFyazpsYWJlbD48bWFy
-azpsYWJlbD54bi0tZXNzYWlldHZhbHVhdGlvbi1ocWI8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+
-eG4tLWVzc2FpdmFsdWF0aW9uLWZrYjwvbWFyazpsYWJlbD48bWFyazpnb29kc0FuZFNlcnZpY2Vz
-Pmd1aXRhcjwvbWFyazpnb29kc0FuZFNlcnZpY2VzPjxtYXJrOnJlZ051bT4xMjM0PC9tYXJrOnJl
-Z051bT48bWFyazpyZWdEYXRlPjIwMTMtMDEtMDFUMDA6MDA6MDAuMDAwWjwvbWFyazpyZWdEYXRl
-PjwvbWFyazp0cmFkZW1hcms+PC9tYXJrOm1hcms+PGRzOlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0
-cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyIgSWQ9Il8wYTQ5MDI0Ni1hMWIyLTQ0YzYt
-OWVlNi04MWY2NGE4OGZhMzIiPjxkczpTaWduZWRJbmZvPjxkczpDYW5vbmljYWxpemF0aW9uTWV0
-aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+
-PGRzOlNpZ25hdHVyZU1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQv
-eG1sZHNpZy1tb3JlI3JzYS1zaGEyNTYiLz48ZHM6UmVmZXJlbmNlIFVSST0iI185YTExNzNkOS0x
-ZDEyLTRlYzYtYWE1Mi03Nzc1MGE0ODkwY2UiPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0g
-QWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjZW52ZWxvcGVkLXNp
-Z25hdHVyZSIvPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAx
-LzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdv
-cml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdl
-c3RWYWx1ZT5vTURYTTRoSHpJUll5U25ubDBzNDIzUWQwWGRkdVE5UGlhYnBUbVprUHNrPTwvZHM6
-RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PGRzOlJlZmVyZW5jZSBVUkk9IiNfNWEzYTQzNWMt
-MDc2YS00ZWY3LThhZDctYWRiODVjMDZkMzg2Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3Jt
-IEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9k
-czpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9y
-Zy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+MEpuS1hsaVM1SkxseWRD
-ZGVEb2ViU3VnYXd4NS9Hb2xXdmNBQXR1SmlSbz08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJl
-bmNlPjwvZHM6U2lnbmVkSW5mbz48ZHM6U2lnbmF0dXJlVmFsdWUgSWQ9Il8zZWI1MzAxMC03ZGFm
-LTRlNmItYjRjZi04ODIyYTEwNTFjNWEiPk9UbjMxNjRpeHllbHdNV3dwbEpKSHNnZExteU1OSDdP
-L3E1RTdCSkl4SGlzN2xBNGpURDEwdUh6NUVOU0txZlFBSEtZS2FrTzFIM1IKTW1zNzUyMVIvb3cz
-WGJoRTZYRXlLbVkwUXhUcGtwNHVKMFp5K1c3RjR1eTlLT3c1Wm11bUQyQVNFazAxcC9IZ0RqQVVF
-eWtZbVRHVApLTGpkek1wcXVlVjM1YXgrR2NIaXhJaDR1OHkzdXZueDZ2MjZRR25CdHplbXdHT0c5
-SUgwWkREL0c5YUczQnpYdmdsM1hXcHJUdzByClNEYTFtdmdydk1hejJBdndFcTNjcGJOdHAzMUQ1
-V2Mram5WZ2VYQTNNWndQYVNvUDJrSWZKRmdRbGNnTlR5RGtyakFRTEpMSWU4SEsKdER2b2Fua3lv
-RXR0YnhoTitmTURMTFN5bk9Td2JLazU2MHNZc2c9PTwvZHM6U2lnbmF0dXJlVmFsdWU+PGRzOktl
-eUluZm8gSWQ9Il81YTNhNDM1Yy0wNzZhLTRlZjctOGFkNy1hZGI4NWMwNmQzODYiPjxkczpYNTA5
-RGF0YT48ZHM6WDUwOUNlcnRpZmljYXRlPk1JSUZPekNDQkNPZ0F3SUJBZ0lnTHJBYmV2b2FlNTJ5
-M2Y2QzJ0QjBTbjNwN1hKbTBUMDJGb2d4S0NmTmhaY3dEUVlKS29aSWh2Y04KQVFFTEJRQXdmREVM
-TUFrR0ExVUVCaE1DVlZNeFBEQTZCZ05WQkFvVE0wbHVkR1Z5Ym1WMElFTnZjbkJ2Y21GMGFXOXVJ
-R1p2Y2lCQgpjM05wWjI1bFpDQk9ZVzFsY3lCaGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF4TW1T
-VU5CVGs0Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5CmFXNW5hRzkxYzJVZ1VHbHNiM1FnUTBFd0hoY05N
-VGd3TWpJNE1EQXdNREF3V2hjTk1qTXdNekF4TWpNMU9UVTVXakNCanpFTE1Ba0cKQTFVRUJoTUNR
-a1V4SURBZUJnTlZCQWdURjBKeWRYTnpaV3h6TFVOaGNHbDBZV3dnVW1WbmFXOXVNUkV3RHdZRFZR
-UUhFd2hDY25WegpjMlZzY3pFUk1BOEdBMVVFQ2hNSVJHVnNiMmwwZEdVeE9EQTJCZ05WQkFNVEww
-bERRVTVPSUZSTlEwZ2dRWFYwYUc5eWFYcGxaQ0JVCmNtRmtaVzFoY21zZ1VHbHNiM1FnVm1Gc2FX
-UmhkRzl5TUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUEKeGxwM0tw
-WUhYM1d5QXNGaFNrM0x3V2ZuR2x4blVERnFGWkEzVW91TVlqL1hpZ2JNa05lRVhJamxrUk9LVDRP
-UEdmUngvTEF5UmxRUQpqQ012NHFoYmtjWDFwN2FyNjNmbHE0U1pOVmNsMTVsN2gwdVQ1OEZ6U2Zu
-bHowdTVya0hmSkltRDQzK21hUC84Z3YzNkZSMjdqVzhSCjl3WTRoaytXczRJQjBpRlNkOFNYdjFL
-cjh3L0ptTVFTRGtpdUcrUmZJaXVid1EvZnk3RWtqNVFXaFBadyttTXhOS25IVUx5M3hZejIKTHdW
-ZmZ0andVdWVhY3ZxTlJDa01YbENsT0FEcWZUOG9TWm9lRFhlaEh2bFBzTENlbUdCb1RLdXJza0lT
-NjlGMHlQRUg1Z3plMEgrZgo4RlJPc0lvS1NzVlEzNEI0Uy9qb0U2N25wc0pQVGRLc05QSlR5UUlE
-QVFBQm80SUJrekNDQVk4d0RBWURWUjBUQVFIL0JBSXdBREFkCkJnTlZIUTRFRmdRVW9GcFk3NnA1
-eW9ORFJHdFFwelZ1UjgxVVdRMHdnY1lHQTFVZEl3U0J2akNCdTRBVXc2MCtwdFlSQUVXQVhEcFgK
-U29wdDNERU5ubkdoZ1lDa2ZqQjhNUXN3Q1FZRFZRUUdFd0pWVXpFOE1Eb0dBMVVFQ2hNelNXNTBa
-WEp1WlhRZ1EyOXljRzl5WVhScApiMjRnWm05eUlFRnpjMmxuYm1Wa0lFNWhiV1Z6SUdGdVpDQk9k
-VzFpWlhKek1TOHdMUVlEVlFRREV5WkpRMEZPVGlCVWNtRmtaVzFoCmNtc2dRMnhsWVhKcGJtZG9i
-M1Z6WlNCUWFXeHZkQ0JEUVlJZ0xyQWJldm9hZTUyeTNmNkMydEIwU24zcDdYSm0wVDAyRm9neEtD
-Zk4KaFhrd0RnWURWUjBQQVFIL0JBUURBZ2VBTURRR0ExVWRId1F0TUNzd0thQW5vQ1dHSTJoMGRI
-QTZMeTlqY213dWFXTmhibTR1YjNKbgpMM1J0WTJoZmNHbHNiM1F1WTNKc01GRUdBMVVkSUFSS01F
-Z3dFQVlPS3dZQkJBR0N5UnNCQllNN0RBb3dOQVlJS3dZQkJRVUhBZ0V3CktEQW1CZ2dyQmdFRkJR
-Y0NBUllhYUhSMGNITTZMeTlqWVM1cFkyRnViaTV2Y21jdmNHbHNiM1F3RFFZSktvWklodmNOQVFF
-TEJRQUQKZ2dFQkFBdWpaMkljUjJEVnJ0YVJyQTU5ZU5ZQ2w0eGNzSk11OERRQ0h2MjhmVGZpL0Jp
-Wlk0SXI3RjlrRnk5NkQ3T1o4b0xZNXpqZgo0ZEh4RndIUHFIOERoNkpXc3pYdUhXMVphM1htbDBQ
-YUh4Q1dSUzBYb2w4V3NISHBOeWdqTUJZZkowb2RWTTg4NVRaMUVsOVNpdUVICm55bkZCZ1NtaUZj
-OTl1UWQvWURSWnVHdi9BMEh5djd5Ujl0a0xFZEQzQTF1TkpCVzRQK0hKR3BkS2tZTDFRNXJVNytv
-SFZQdE1LS0kKM2lGa1VFc2JPNDVBVmQ3dlAvai83SnRBWlBiNmtvT1Y1bFppMkgxUkxjY0d3emRl
-em5oSmdkME45b2JiMHZuRTQxL1VTV2FmZFdSWgpWR2t3UHVxVGhsN3NDdHpySkg4WFkweGN1bStj
-Zkx4MkVBSXdVbk9jYWI0PTwvZHM6WDUwOUNlcnRpZmljYXRlPjwvZHM6WDUwOURhdGE+PC9kczpL
-ZXlJbmZvPjwvZHM6U2lnbmF0dXJlPjwvc21kOnNpZ25lZE1hcms+
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/revoked/smd/Trademark-Agent-Russian-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/Trademark-Agent-Russian-Revoked.smd
deleted file mode 100644
index 1f6fd904d..000000000
--- a/core/src/test/resources/google/registry/tmch/revoked/smd/Trademark-Agent-Russian-Revoked.smd
+++ /dev/null
@@ -1,104 +0,0 @@
-Marks: суда & ошибки
-smdID: 000000741526319811053-65535
-U-labels: xn------5cdin6abr1b1ay5e, xn-----6kcgl1abp7azaw9d, xn---and--3vemr6bbv9b5a2a7f, xn---and-43dkp1bbt5b3a0a1f, xn----7sbejwbn3axu3d, xn--and--43dkp1bbt5b3a0a1f, xn--and-5cdin6abr1b1ay5e, xn--et--5cdin6abr1b1ay5e, xn--et-6kcgl1abp7azaw9d, xn--80achrblzvs7c
-notBefore: 2018-05-14T17:43:31.053Z
-notAfter: 2022-08-18T14:16:55.554Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il80ZDkx
-MDNiMC0xMGRhLTQxOTctOGQ3OS1hMDA4NGU0NzU5NzQiPjxzbWQ6aWQ+MDAwMDAwNzQxNTI2MzE5
-ODExMDUzLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo0MzozMS4wNTNaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0xOFQxNDoxNjo1NS41NTRaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
-cmFkZW1hcms+PG1hcms6aWQ+MDAwMTQxMTUwMzA2NTU1MDE1MDMwNjU1NTAtMTwvbWFyazppZD48
-bWFyazptYXJrTmFtZT7RgdGD0LTQsCAmYW1wOyDQvtGI0LjQsdC60Lg8L21hcms6bWFya05hbWU+
-PG1hcms6aG9sZGVyIGVudGl0bGVtZW50PSJvd25lciI+PG1hcms6b3JnPtCQ0LPQtdC90YLRgdGC
-0LLQvjwvbWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpzdHJlZXQ+0J/RgNC+0YHQv9C10LrRgiDQ
-ktC10YDQvdCw0LTRgdC60L7Qs9C+IDE1PC9tYXJrOnN0cmVldD48bWFyazpjaXR5PtCc0L7RgdC6
-0LLQsDwvbWFyazpjaXR5PjxtYXJrOnBjPjExNzQ4NTwvbWFyazpwYz48bWFyazpjYz5SVTwvbWFy
-azpjYz48L21hcms6YWRkcj48L21hcms6aG9sZGVyPjxtYXJrOmNvbnRhY3QgdHlwZT0iYWdlbnQi
-PjxtYXJrOm5hbWU+0J3QsNGC0LDQu9GM0Y8g0JDQvdGC0L7QvdC+0LLQsDwvbWFyazpuYW1lPjxt
-YXJrOm9yZz7QkNCz0LXQvdGC0YHRgtCy0L48L21hcms6b3JnPjxtYXJrOmFkZHI+PG1hcms6c3Ry
-ZWV0PtCf0YDQvtGB0L/QtdC60YIg0JLQtdGA0L3QsNC00YHQutC+0LPQviAxNTwvbWFyazpzdHJl
-ZXQ+PG1hcms6Y2l0eT7QnNC+0YHQutCy0LA8L21hcms6Y2l0eT48bWFyazpwYz4xMTc0ODU8L21h
-cms6cGM+PG1hcms6Y2M+UlU8L21hcms6Y2M+PC9tYXJrOmFkZHI+PG1hcms6dm9pY2U+KzcuOTE4
-ODIyMTY3NDwvbWFyazp2b2ljZT48bWFyazpmYXg+KzcuOTE4ODIyMTY3MzwvbWFyazpmYXg+PG1h
-cms6ZW1haWw+aW5mb0BhZ2VuY3kucnU8L21hcms6ZW1haWw+PC9tYXJrOmNvbnRhY3Q+PG1hcms6
-anVyaXNkaWN0aW9uPlVTPC9tYXJrOmp1cmlzZGljdGlvbj48bWFyazpjbGFzcz4xNTwvbWFyazpj
-bGFzcz48bWFyazpsYWJlbD54bi0tLS0tLTVjZGluNmFicjFiMWF5NWU8L21hcms6bGFiZWw+PG1h
-cms6bGFiZWw+eG4tLS0tLTZrY2dsMWFicDdhemF3OWQ8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+
-eG4tLS1hbmQtLTN2ZW1yNmJidjliNWEyYTdmPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS0t
-YW5kLTQzZGtwMWJidDViM2EwYTFmPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS0tLTdzYmVq
-d2JuM2F4dTNkPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1hbmQtLTQzZGtwMWJidDViM2Ew
-YTFmPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1hbmQtNWNkaW42YWJyMWIxYXk1ZTwvbWFy
-azpsYWJlbD48bWFyazpsYWJlbD54bi0tZXQtLTVjZGluNmFicjFiMWF5NWU8L21hcms6bGFiZWw+
-PG1hcms6bGFiZWw+eG4tLWV0LTZrY2dsMWFicDdhemF3OWQ8L21hcms6bGFiZWw+PG1hcms6bGFi
-ZWw+eG4tLTgwYWNocmJsenZzN2M8L21hcms6bGFiZWw+PG1hcms6Z29vZHNBbmRTZXJ2aWNlcz7Q
-s9C40YLQsNGA0LAgPC9tYXJrOmdvb2RzQW5kU2VydmljZXM+PG1hcms6cmVnTnVtPjEyMzQ8L21h
-cms6cmVnTnVtPjxtYXJrOnJlZ0RhdGU+MjAxMy0wMS0wMVQwMDowMDowMC4wMDBaPC9tYXJrOnJl
-Z0RhdGU+PC9tYXJrOnRyYWRlbWFyaz48L21hcms6bWFyaz48ZHM6U2lnbmF0dXJlIHhtbG5zOmRz
-PSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjIiBJZD0iXzBjMjVhNzY5LTIyZTgt
-NGE3NC1iOTAwLWE2NGUxMzgwYWI4MyI+PGRzOlNpZ25lZEluZm8+PGRzOkNhbm9uaWNhbGl6YXRp
-b25NZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0
-biMiLz48ZHM6U2lnbmF0dXJlTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAw
-MS8wNC94bWxkc2lnLW1vcmUjcnNhLXNoYTI1NiIvPjxkczpSZWZlcmVuY2UgVVJJPSIjXzRkOTEw
-M2IwLTEwZGEtNDE5Ny04ZDc5LWEwMDg0ZTQ3NTk3NCI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5z
-Zm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1sZHNpZyNlbnZlbG9w
-ZWQtc2lnbmF0dXJlIi8+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3Jn
-LzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6RGlnZXN0TWV0aG9k
-IEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxlbmMjc2hhMjU2Ii8+PGRz
-OkRpZ2VzdFZhbHVlPlZiQ2czMHBEbTVSZ0hZWG5zRFVrUGFFQVRZK1A1SlMrWitSUW55NEZrdk09
-PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48ZHM6UmVmZXJlbmNlIFVSST0iI18xZTNh
-NjE3ZC1jMjY1LTRiNzYtYmRmOS0wMmJiMTljMjk2M2EiPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFu
-c2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMi
-Lz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cu
-dzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1ZT4veVo4Ynh6L2po
-YzU3aFlsQmc3N2RpeFFmRWd1RlovRVVjeEpxK3kvSndZPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpS
-ZWZlcmVuY2U+PC9kczpTaWduZWRJbmZvPjxkczpTaWduYXR1cmVWYWx1ZSBJZD0iXzk1Y2FlNmRi
-LWM4NTEtNGE2My05NDZlLTgxZTNkNmUyNTg4ZCI+STdZU3JHVWQzUCs2czhvN3ZkVHoyc0lvcGZj
-VGZBTStxT0pJRDBSVlRaMFZYNDRvZDhjQWRzS3JtOHVKandmZnlvczRROHN1aVJBUgp3aWRqZWVz
-T2tmVkhYYTF1NDY2SjZzZHNEd3BMdFFIMnY2d04yN0lNR3BNUVUyZGp0M3BhT1RBRnFQdlBQUlpo
-NHlIZ1k5bUN3UXpHCjFSUjViM0UvcjZabWpRS0djd3NFTHhjbzFmMzhuWTQxSlEydmFPalMzOFdJ
-TmhJWDA3WEpld0Vja3FESHFBWWlDYjB3d0Q5bnVTMmwKc2RKV2l2NWdMSlp3WEJieTNXMDdZRHJy
-ekdpTGxKcGVtN2RpU1hoMjVMU3NKL0hNcVNLeDVlSUY1S0EyOTF1TFlPRzc4RXJGTUtqLwpFRXBE
-bkpzVnRxbEwzWFl4OGRrdXMwYmw1b3BvL1BkS3E0ZkkzZz09PC9kczpTaWduYXR1cmVWYWx1ZT48
-ZHM6S2V5SW5mbyBJZD0iXzFlM2E2MTdkLWMyNjUtNGI3Ni1iZGY5LTAyYmIxOWMyOTYzYSI+PGRz
-Olg1MDlEYXRhPjxkczpYNTA5Q2VydGlmaWNhdGU+TUlJRk96Q0NCQ09nQXdJQkFnSWdMckFiZXZv
-YWU1MnkzZjZDMnRCMFNuM3A3WEptMFQwMkZvZ3hLQ2ZOaFpjd0RRWUpLb1pJaHZjTgpBUUVMQlFB
-d2ZERUxNQWtHQTFVRUJoTUNWVk14UERBNkJnTlZCQW9UTTBsdWRHVnlibVYwSUVOdmNuQnZjbUYw
-YVc5dUlHWnZjaUJCCmMzTnBaMjVsWkNCT1lXMWxjeUJoYm1RZ1RuVnRZbVZ5Y3pFdk1DMEdBMVVF
-QXhNbVNVTkJUazRnVkhKaFpHVnRZWEpySUVOc1pXRnkKYVc1bmFHOTFjMlVnVUdsc2IzUWdRMEV3
-SGhjTk1UZ3dNakk0TURBd01EQXdXaGNOTWpNd016QXhNak0xT1RVNVdqQ0JqekVMTUFrRwpBMVVF
-QmhNQ1FrVXhJREFlQmdOVkJBZ1RGMEp5ZFhOelpXeHpMVU5oY0dsMFlXd2dVbVZuYVc5dU1SRXdE
-d1lEVlFRSEV3aENjblZ6CmMyVnNjekVSTUE4R0ExVUVDaE1JUkdWc2IybDBkR1V4T0RBMkJnTlZC
-QU1UTDBsRFFVNU9JRlJOUTBnZ1FYVjBhRzl5YVhwbFpDQlUKY21Ga1pXMWhjbXNnVUdsc2IzUWdW
-bUZzYVdSaGRHOXlNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQQp4
-bHAzS3BZSFgzV3lBc0ZoU2szTHdXZm5HbHhuVURGcUZaQTNVb3VNWWovWGlnYk1rTmVFWElqbGtS
-T0tUNE9QR2ZSeC9MQXlSbFFRCmpDTXY0cWhia2NYMXA3YXI2M2ZscTRTWk5WY2wxNWw3aDB1VDU4
-RnpTZm5sejB1NXJrSGZKSW1ENDMrbWFQLzhndjM2RlIyN2pXOFIKOXdZNGhrK1dzNElCMGlGU2Q4
-U1h2MUtyOHcvSm1NUVNEa2l1RytSZklpdWJ3US9meTdFa2o1UVdoUFp3K21NeE5LbkhVTHkzeFl6
-MgpMd1ZmZnRqd1V1ZWFjdnFOUkNrTVhsQ2xPQURxZlQ4b1Nab2VEWGVoSHZsUHNMQ2VtR0JvVEt1
-cnNrSVM2OUYweVBFSDVnemUwSCtmCjhGUk9zSW9LU3NWUTM0QjRTL2pvRTY3bnBzSlBUZEtzTlBK
-VHlRSURBUUFCbzRJQmt6Q0NBWTh3REFZRFZSMFRBUUgvQkFJd0FEQWQKQmdOVkhRNEVGZ1FVb0Zw
-WTc2cDV5b05EUkd0UXB6VnVSODFVV1Ewd2djWUdBMVVkSXdTQnZqQ0J1NEFVdzYwK3B0WVJBRVdB
-WERwWApTb3B0M0RFTm5uR2hnWUNrZmpCOE1Rc3dDUVlEVlFRR0V3SlZVekU4TURvR0ExVUVDaE16
-U1c1MFpYSnVaWFFnUTI5eWNHOXlZWFJwCmIyNGdabTl5SUVGemMybG5ibVZrSUU1aGJXVnpJR0Z1
-WkNCT2RXMWlaWEp6TVM4d0xRWURWUVFERXlaSlEwRk9UaUJVY21Ga1pXMWgKY21zZ1EyeGxZWEpw
-Ym1kb2IzVnpaU0JRYVd4dmRDQkRRWUlnTHJBYmV2b2FlNTJ5M2Y2QzJ0QjBTbjNwN1hKbTBUMDJG
-b2d4S0NmTgpoWGt3RGdZRFZSMFBBUUgvQkFRREFnZUFNRFFHQTFVZEh3UXRNQ3N3S2FBbm9DV0dJ
-MmgwZEhBNkx5OWpjbXd1YVdOaGJtNHViM0puCkwzUnRZMmhmY0dsc2IzUXVZM0pzTUZFR0ExVWRJ
-QVJLTUVnd0VBWU9Ld1lCQkFHQ3lSc0JCWU03REFvd05BWUlLd1lCQlFVSEFnRXcKS0RBbUJnZ3JC
-Z0VGQlFjQ0FSWWFhSFIwY0hNNkx5OWpZUzVwWTJGdWJpNXZjbWN2Y0dsc2IzUXdEUVlKS29aSWh2
-Y05BUUVMQlFBRApnZ0VCQUF1aloySWNSMkRWcnRhUnJBNTllTllDbDR4Y3NKTXU4RFFDSHYyOGZU
-ZmkvQmlaWTRJcjdGOWtGeTk2RDdPWjhvTFk1empmCjRkSHhGd0hQcUg4RGg2Sldzelh1SFcxWmEz
-WG1sMFBhSHhDV1JTMFhvbDhXc0hIcE55Z2pNQllmSjBvZFZNODg1VFoxRWw5U2l1RUgKbnluRkJn
-U21pRmM5OXVRZC9ZRFJadUd2L0EwSHl2N3lSOXRrTEVkRDNBMXVOSkJXNFArSEpHcGRLa1lMMVE1
-clU3K29IVlB0TUtLSQozaUZrVUVzYk80NUFWZDd2UC9qLzdKdEFaUGI2a29PVjVsWmkySDFSTGNj
-R3d6ZGV6bmhKZ2QwTjlvYmIwdm5FNDEvVVNXYWZkV1JaClZHa3dQdXFUaGw3c0N0enJKSDhYWTB4
-Y3VtK2NmTHgyRUFJd1VuT2NhYjQ9PC9kczpYNTA5Q2VydGlmaWNhdGU+PC9kczpYNTA5RGF0YT48
-L2RzOktleUluZm8+PC9kczpTaWduYXR1cmU+PC9zbWQ6c2lnbmVkTWFyaz4=
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/revoked/smd/Trademark-Holder-Arab-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/Trademark-Holder-Arab-Revoked.smd
deleted file mode 100644
index b9f16f3b9..000000000
--- a/core/src/test/resources/google/registry/tmch/revoked/smd/Trademark-Holder-Arab-Revoked.smd
+++ /dev/null
@@ -1,99 +0,0 @@
-Marks: الاختبار & لتقييم
-smdID: 000000901526319837700-65535
-U-labels: xn------nzeaagpf7azb2ppajr3fa, xn-----btdaafne4a7azpoaiq8ea, xn----ymcaaeld1a4a6onahp3ea, xn-----btdaafne4a7azpoaiq4byba, xn----ymcaaeld1a4a6onahp2b7aa, xn--mgbaadjcy1a8mmago8da, xn----ymcaaeld1a4a6onahp1b8aa, xn--mgbaadjcy1a8mmago9a5aa
-notBefore: 2018-05-14T17:43:57.700Z
-notAfter: 2022-08-21T08:59:34.305Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il9hM2Y2
-YWZjZi0xNDNiLTRmMTUtYWJjOS0xOWFjYzg5ZTdlNmYiPjxzbWQ6aWQ+MDAwMDAwOTAxNTI2MzE5
-ODM3NzAwLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo0Mzo1Ny43MDBaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0yMVQwODo1OTozNC4zMDVaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
-cmFkZW1hcms+PG1hcms6aWQ+MDAwMTQyMTUwMzMwNTI5OTE1MDMzMDUyOTktMTwvbWFyazppZD48
-bWFyazptYXJrTmFtZT7Yp9mE2KfYrtiq2KjYp9ixICZhbXA7INmE2KrZgtmK2YrZhTwvbWFyazpt
-YXJrTmFtZT48bWFyazpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpuYW1lPtmF2YfZ
-htiv2LMg2KfZhNmF2LnZhNmI2YXYp9iq2YrYqTwvbWFyazpuYW1lPjxtYXJrOm9yZz7Yp9iu2KrY
-qNin2LE8L21hcms6b3JnPjxtYXJrOmFkZHI+PG1hcms6c3RyZWV0Ptis2LnZgdixINin2KjZhiDY
-s9mK2YbYp9ihIDc1PC9tYXJrOnN0cmVldD48bWFyazpjaXR5PtmF2YPZhtin2LM8L21hcms6Y2l0
-eT48bWFyazpwYz4yOTAwPC9tYXJrOnBjPjxtYXJrOmNjPk1BPC9tYXJrOmNjPjwvbWFyazphZGRy
-PjxtYXJrOnZvaWNlPisyMTIuNTIyNTM5MDQwPC9tYXJrOnZvaWNlPjxtYXJrOmZheD4rMjEyLjUy
-MjUzOTA0MTwvbWFyazpmYXg+PG1hcms6ZW1haWw+aW5mb0BleGFtcGxlLmV4YW1wbGU8L21hcms6
-ZW1haWw+PC9tYXJrOmhvbGRlcj48bWFyazpqdXJpc2RpY3Rpb24+TUE8L21hcms6anVyaXNkaWN0
-aW9uPjxtYXJrOmNsYXNzPjE1PC9tYXJrOmNsYXNzPjxtYXJrOmxhYmVsPnhuLS0tLS0tbnplYWFn
-cGY3YXpiMnBwYWpyM2ZhPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS0tLS1idGRhYWZuZTRh
-N2F6cG9haXE4ZWE8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLS0teW1jYWFlbGQxYTRhNm9u
-YWhwM2VhPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS0tLS1idGRhYWZuZTRhN2F6cG9haXE0
-YnliYTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tLS15bWNhYWVsZDFhNGE2b25haHAyYjdh
-YTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tbWdiYWFkamN5MWE4bW1hZ284ZGE8L21hcms6
-bGFiZWw+PG1hcms6bGFiZWw+eG4tLS0teW1jYWFlbGQxYTRhNm9uYWhwMWI4YWE8L21hcms6bGFi
-ZWw+PG1hcms6bGFiZWw+eG4tLW1nYmFhZGpjeTFhOG1tYWdvOWE1YWE8L21hcms6bGFiZWw+PG1h
-cms6Z29vZHNBbmRTZXJ2aWNlcz7YutmK2KrYp9ixPC9tYXJrOmdvb2RzQW5kU2VydmljZXM+PG1h
-cms6cmVnTnVtPjEyMzQ8L21hcms6cmVnTnVtPjxtYXJrOnJlZ0RhdGU+MjAxMy0wMS0wMVQwMDow
-MDowMC4wMDBaPC9tYXJrOnJlZ0RhdGU+PC9tYXJrOnRyYWRlbWFyaz48L21hcms6bWFyaz48ZHM6
-U2lnbmF0dXJlIHhtbG5zOmRzPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjIiBJ
-ZD0iXzc3MGQzNmU3LWI5ZDYtNGZkOS1iZTAyLTk1NjU5NjlhMDJkYyI+PGRzOlNpZ25lZEluZm8+
-PGRzOkNhbm9uaWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8y
-MDAxLzEwL3htbC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJlTWV0aG9kIEFsZ29yaXRobT0iaHR0
-cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxkc2lnLW1vcmUjcnNhLXNoYTI1NiIvPjxkczpSZWZl
-cmVuY2UgVVJJPSIjX2EzZjZhZmNmLTE0M2ItNGYxNS1hYmM5LTE5YWNjODllN2U2ZiI+PGRzOlRy
-YW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDAv
-MDkveG1sZHNpZyNlbnZlbG9wZWQtc2lnbmF0dXJlIi8+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09
-Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jt
-cz48ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94
-bWxlbmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPjUrcEdpa051YTY3dHlHdjJKN3loRGxIQWxB
-cTVUaXlUai9NTnpzMEZYTVE9PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48ZHM6UmVm
-ZXJlbmNlIFVSST0iI180YWFiNWI5Ny0wZjZlLTRlMzMtOGEzMS02NmJlMzE5OTg0ZjUiPjxkczpU
-cmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAx
-LzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdv
-cml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdl
-c3RWYWx1ZT55c0pQUUIwZTloR281Ui9Va203eGp2ZXVZY2p3WHF0UjEzdnF4bFVqcFBVPTwvZHM6
-RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PC9kczpTaWduZWRJbmZvPjxkczpTaWduYXR1cmVW
-YWx1ZSBJZD0iX2I3MGEzODM5LThhYjUtNDUyYS04OTY3LTcyNTZjOTNhODdjYiI+VUJSWXRwU3Mv
-aTBEMnlCRlh1M1JYaEkrN1dFcUdKQnJ0bmZyS1FjT1FTY0U2ODU2elFjeG1PdFR6bldFTWdDSWJU
-WWkxclYrK21keApXQjRtQTFVVzhVUHFsaHJLdGtSTk1GZW1oRkxwNDRJZjVYejRiRmVsQ052dzl6
-SFFOUDBqRzJ0OXlsS0g4UURRS1R5aXlmOStrNU5aCmtFcEVOSXl0RGh2TXJFTktqaURQb3pXemxY
-UXdlVmxvNXNFdkhiVFcyc3d4VUtWQ2FOYVNGamxkTTNmcXMrSEJSTjNQS1c1bnV3M24KRW8yN09L
-V1BDYWV0d1M3dnpOWFBJb2RQNnRXNVYrZHBCZG5DSTBucXVzWWdvTFZ6R0xwY0JHVGZzTzNtcUc3
-VVdkQWdYMHdkQkxuNAptdDhHM2JMMERkZ0dwV2VPdnNvRlZoQkM3NkUrVXRwWGo4Sko3Zz09PC9k
-czpTaWduYXR1cmVWYWx1ZT48ZHM6S2V5SW5mbyBJZD0iXzRhYWI1Yjk3LTBmNmUtNGUzMy04YTMx
-LTY2YmUzMTk5ODRmNSI+PGRzOlg1MDlEYXRhPjxkczpYNTA5Q2VydGlmaWNhdGU+TUlJRk96Q0NC
-Q09nQXdJQkFnSWdMckFiZXZvYWU1MnkzZjZDMnRCMFNuM3A3WEptMFQwMkZvZ3hLQ2ZOaFpjd0RR
-WUpLb1pJaHZjTgpBUUVMQlFBd2ZERUxNQWtHQTFVRUJoTUNWVk14UERBNkJnTlZCQW9UTTBsdWRH
-VnlibVYwSUVOdmNuQnZjbUYwYVc5dUlHWnZjaUJCCmMzTnBaMjVsWkNCT1lXMWxjeUJoYm1RZ1Ru
-VnRZbVZ5Y3pFdk1DMEdBMVVFQXhNbVNVTkJUazRnVkhKaFpHVnRZWEpySUVOc1pXRnkKYVc1bmFH
-OTFjMlVnVUdsc2IzUWdRMEV3SGhjTk1UZ3dNakk0TURBd01EQXdXaGNOTWpNd016QXhNak0xT1RV
-NVdqQ0JqekVMTUFrRwpBMVVFQmhNQ1FrVXhJREFlQmdOVkJBZ1RGMEp5ZFhOelpXeHpMVU5oY0ds
-MFlXd2dVbVZuYVc5dU1SRXdEd1lEVlFRSEV3aENjblZ6CmMyVnNjekVSTUE4R0ExVUVDaE1JUkdW
-c2IybDBkR1V4T0RBMkJnTlZCQU1UTDBsRFFVNU9JRlJOUTBnZ1FYVjBhRzl5YVhwbFpDQlUKY21G
-a1pXMWhjbXNnVUdsc2IzUWdWbUZzYVdSaGRHOXlNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9D
-QVE4QU1JSUJDZ0tDQVFFQQp4bHAzS3BZSFgzV3lBc0ZoU2szTHdXZm5HbHhuVURGcUZaQTNVb3VN
-WWovWGlnYk1rTmVFWElqbGtST0tUNE9QR2ZSeC9MQXlSbFFRCmpDTXY0cWhia2NYMXA3YXI2M2Zs
-cTRTWk5WY2wxNWw3aDB1VDU4RnpTZm5sejB1NXJrSGZKSW1ENDMrbWFQLzhndjM2RlIyN2pXOFIK
-OXdZNGhrK1dzNElCMGlGU2Q4U1h2MUtyOHcvSm1NUVNEa2l1RytSZklpdWJ3US9meTdFa2o1UVdo
-UFp3K21NeE5LbkhVTHkzeFl6MgpMd1ZmZnRqd1V1ZWFjdnFOUkNrTVhsQ2xPQURxZlQ4b1Nab2VE
-WGVoSHZsUHNMQ2VtR0JvVEt1cnNrSVM2OUYweVBFSDVnemUwSCtmCjhGUk9zSW9LU3NWUTM0QjRT
-L2pvRTY3bnBzSlBUZEtzTlBKVHlRSURBUUFCbzRJQmt6Q0NBWTh3REFZRFZSMFRBUUgvQkFJd0FE
-QWQKQmdOVkhRNEVGZ1FVb0ZwWTc2cDV5b05EUkd0UXB6VnVSODFVV1Ewd2djWUdBMVVkSXdTQnZq
-Q0J1NEFVdzYwK3B0WVJBRVdBWERwWApTb3B0M0RFTm5uR2hnWUNrZmpCOE1Rc3dDUVlEVlFRR0V3
-SlZVekU4TURvR0ExVUVDaE16U1c1MFpYSnVaWFFnUTI5eWNHOXlZWFJwCmIyNGdabTl5SUVGemMy
-bG5ibVZrSUU1aGJXVnpJR0Z1WkNCT2RXMWlaWEp6TVM4d0xRWURWUVFERXlaSlEwRk9UaUJVY21G
-a1pXMWgKY21zZ1EyeGxZWEpwYm1kb2IzVnpaU0JRYVd4dmRDQkRRWUlnTHJBYmV2b2FlNTJ5M2Y2
-QzJ0QjBTbjNwN1hKbTBUMDJGb2d4S0NmTgpoWGt3RGdZRFZSMFBBUUgvQkFRREFnZUFNRFFHQTFV
-ZEh3UXRNQ3N3S2FBbm9DV0dJMmgwZEhBNkx5OWpjbXd1YVdOaGJtNHViM0puCkwzUnRZMmhmY0ds
-c2IzUXVZM0pzTUZFR0ExVWRJQVJLTUVnd0VBWU9Ld1lCQkFHQ3lSc0JCWU03REFvd05BWUlLd1lC
-QlFVSEFnRXcKS0RBbUJnZ3JCZ0VGQlFjQ0FSWWFhSFIwY0hNNkx5OWpZUzVwWTJGdWJpNXZjbWN2
-Y0dsc2IzUXdEUVlKS29aSWh2Y05BUUVMQlFBRApnZ0VCQUF1aloySWNSMkRWcnRhUnJBNTllTllD
-bDR4Y3NKTXU4RFFDSHYyOGZUZmkvQmlaWTRJcjdGOWtGeTk2RDdPWjhvTFk1empmCjRkSHhGd0hQ
-cUg4RGg2Sldzelh1SFcxWmEzWG1sMFBhSHhDV1JTMFhvbDhXc0hIcE55Z2pNQllmSjBvZFZNODg1
-VFoxRWw5U2l1RUgKbnluRkJnU21pRmM5OXVRZC9ZRFJadUd2L0EwSHl2N3lSOXRrTEVkRDNBMXVO
-SkJXNFArSEpHcGRLa1lMMVE1clU3K29IVlB0TUtLSQozaUZrVUVzYk80NUFWZDd2UC9qLzdKdEFa
-UGI2a29PVjVsWmkySDFSTGNjR3d6ZGV6bmhKZ2QwTjlvYmIwdm5FNDEvVVNXYWZkV1JaClZHa3dQ
-dXFUaGw3c0N0enJKSDhYWTB4Y3VtK2NmTHgyRUFJd1VuT2NhYjQ9PC9kczpYNTA5Q2VydGlmaWNh
-dGU+PC9kczpYNTA5RGF0YT48L2RzOktleUluZm8+PC9kczpTaWduYXR1cmU+PC9zbWQ6c2lnbmVk
-TWFyaz4=
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/revoked/smd/Trademark-Holder-Chinese-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/Trademark-Holder-Chinese-Revoked.smd
deleted file mode 100644
index 8db3b808e..000000000
--- a/core/src/test/resources/google/registry/tmch/revoked/smd/Trademark-Holder-Chinese-Revoked.smd
+++ /dev/null
@@ -1,94 +0,0 @@
-Marks: 试验&用例
-smdID: 000000711526319805343-65535
-U-labels: xn----lb7ao71jn7sf0q, xn--and-xc0em33obp2aosv, xn--et-rt3cn04lhyx1ps, xn--fsqv03gtrpson
-notBefore: 2018-05-14T17:43:25.343Z
-notAfter: 2022-08-21T08:12:01.925Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il9lYjI2
-OWZlZS1jY2IxLTQ5OTItOWQ5YS02ZGVjMTU1NTY5OTMiPjxzbWQ6aWQ+MDAwMDAwNzExNTI2MzE5
-ODA1MzQzLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo0MzoyNS4zNDNaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0yMVQwODoxMjowMS45MjVaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
-cmFkZW1hcms+PG1hcms6aWQ+MDAwMTQ1MTUwMzA2NDc4NDE1MDMwNjQ3ODQtMTwvbWFyazppZD48
-bWFyazptYXJrTmFtZT7or5XpqowmYW1wO+eUqOS+izwvbWFyazptYXJrTmFtZT48bWFyazpob2xk
-ZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpuYW1lPuadjuWwj+aWuTwvbWFyazpuYW1lPjxt
-YXJrOm9yZz7mtYvor5U8L21hcms6b3JnPjxtYXJrOmFkZHI+PG1hcms6c3RyZWV0Pummmea4r+S4
-nOi3rzblj7fvvIw15Y+35qW877yMOOWPt+WupCA8L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+6Z2S
-5bKb5biCPC9tYXJrOmNpdHk+PG1hcms6cGM+MTAwMDwvbWFyazpwYz48bWFyazpjYz5DTjwvbWFy
-azpjYz48L21hcms6YWRkcj48bWFyazp2b2ljZT4rODYuMTA4NDY1NzE3MzwvbWFyazp2b2ljZT48
-bWFyazpmYXg+Kzg2LjEwODQ2NTcxNzM8L21hcms6ZmF4PjxtYXJrOmVtYWlsPmluZm9AZXhhbXBs
-ZS5leGFtcGxlPC9tYXJrOmVtYWlsPjwvbWFyazpob2xkZXI+PG1hcms6anVyaXNkaWN0aW9uPlVT
-PC9tYXJrOmp1cmlzZGljdGlvbj48bWFyazpjbGFzcz4xNTwvbWFyazpjbGFzcz48bWFyazpsYWJl
-bD54bi0tLS1sYjdhbzcxam43c2YwcTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tYW5kLXhj
-MGVtMzNvYnAyYW9zdjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tZXQtcnQzY24wNGxoeXgx
-cHM8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLWZzcXYwM2d0cnBzb248L21hcms6bGFiZWw+
-PG1hcms6Z29vZHNBbmRTZXJ2aWNlcz4g5ZCJ5LuWPC9tYXJrOmdvb2RzQW5kU2VydmljZXM+PG1h
-cms6cmVnTnVtPjEyMzQ8L21hcms6cmVnTnVtPjxtYXJrOnJlZ0RhdGU+MjAxMy0wMS0wMVQwMDow
-MDowMC4wMDBaPC9tYXJrOnJlZ0RhdGU+PC9tYXJrOnRyYWRlbWFyaz48L21hcms6bWFyaz48ZHM6
-U2lnbmF0dXJlIHhtbG5zOmRzPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjIiBJ
-ZD0iXzI5M2VjNDQ2LThhODItNDEyNi1iYTAxLTEwMDI3N2I5NjVhNiI+PGRzOlNpZ25lZEluZm8+
-PGRzOkNhbm9uaWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8y
-MDAxLzEwL3htbC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJlTWV0aG9kIEFsZ29yaXRobT0iaHR0
-cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxkc2lnLW1vcmUjcnNhLXNoYTI1NiIvPjxkczpSZWZl
-cmVuY2UgVVJJPSIjX2ViMjY5ZmVlLWNjYjEtNDk5Mi05ZDlhLTZkZWMxNTU1Njk5MyI+PGRzOlRy
-YW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDAv
-MDkveG1sZHNpZyNlbnZlbG9wZWQtc2lnbmF0dXJlIi8+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09
-Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jt
-cz48ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94
-bWxlbmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPkYzeXlhUXMxR0trOXRTZCtNa2ZTeGp5NXZz
-Skt3NUtCRUd5NWZrNjRkbTg9PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48ZHM6UmVm
-ZXJlbmNlIFVSST0iI19lNzgxZjdkYi1mMWVmLTQ4M2UtYThmZi02N2E4ODRiZTNlZDYiPjxkczpU
-cmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAx
-LzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdv
-cml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdl
-c3RWYWx1ZT43aVQ0QzdoNXBXaG9aQVFlZzc0SUVURHFiVWxSN0ozRFdnN2FSUXA5cUYwPTwvZHM6
-RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PC9kczpTaWduZWRJbmZvPjxkczpTaWduYXR1cmVW
-YWx1ZSBJZD0iXzI1MDFiOTgzLTMxNGMtNGVjOC1iYWY4LWYzZmYxYzlhYjJjMCI+UXRkd2pYRXFY
-c3dITFVGNkxEZVNMNmxvVEhnRitHSnBMb0NEaEo0R1h0c201dE02anMwNE9reXBQLzMrVkVaU1lY
-bHg1MFR4c2IwawpReitSZUhwbDZCQnBtOVU2YjBFZEZtMzN6Smk3UGd2VDM0ZWNZK2RVZzNGcmNW
-bHRUK21IM3VwSWN3cUwyL0U0WFhlSER5c2tCa3g5Cm40Q1FLb29FU1ZRTlBCT0tlalZGcjlWVlB2
-dTRXM1RyS3M0Yzl5Y3NYMG1nUXc4NlpQa1VxRjNDNjVUSGFKOXZuVkhyVUlPcU53alYKRlZGd2FW
-ZEVtN2JOU21WTmpBOTU0MVRBV1gzRmtlK1psN0xVenhGQmZTS3Q2cFpzUCsybnN4OGtOeGM1eWJi
-UWZBSWJFb3ExV2YzaQpIQU1DbmdFeVhvSWV3NlVhSlhMQ0NHKzJDZXNPYVQwaXRJK3ZFUT09PC9k
-czpTaWduYXR1cmVWYWx1ZT48ZHM6S2V5SW5mbyBJZD0iX2U3ODFmN2RiLWYxZWYtNDgzZS1hOGZm
-LTY3YTg4NGJlM2VkNiI+PGRzOlg1MDlEYXRhPjxkczpYNTA5Q2VydGlmaWNhdGU+TUlJRk96Q0NC
-Q09nQXdJQkFnSWdMckFiZXZvYWU1MnkzZjZDMnRCMFNuM3A3WEptMFQwMkZvZ3hLQ2ZOaFpjd0RR
-WUpLb1pJaHZjTgpBUUVMQlFBd2ZERUxNQWtHQTFVRUJoTUNWVk14UERBNkJnTlZCQW9UTTBsdWRH
-VnlibVYwSUVOdmNuQnZjbUYwYVc5dUlHWnZjaUJCCmMzTnBaMjVsWkNCT1lXMWxjeUJoYm1RZ1Ru
-VnRZbVZ5Y3pFdk1DMEdBMVVFQXhNbVNVTkJUazRnVkhKaFpHVnRZWEpySUVOc1pXRnkKYVc1bmFH
-OTFjMlVnVUdsc2IzUWdRMEV3SGhjTk1UZ3dNakk0TURBd01EQXdXaGNOTWpNd016QXhNak0xT1RV
-NVdqQ0JqekVMTUFrRwpBMVVFQmhNQ1FrVXhJREFlQmdOVkJBZ1RGMEp5ZFhOelpXeHpMVU5oY0ds
-MFlXd2dVbVZuYVc5dU1SRXdEd1lEVlFRSEV3aENjblZ6CmMyVnNjekVSTUE4R0ExVUVDaE1JUkdW
-c2IybDBkR1V4T0RBMkJnTlZCQU1UTDBsRFFVNU9JRlJOUTBnZ1FYVjBhRzl5YVhwbFpDQlUKY21G
-a1pXMWhjbXNnVUdsc2IzUWdWbUZzYVdSaGRHOXlNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9D
-QVE4QU1JSUJDZ0tDQVFFQQp4bHAzS3BZSFgzV3lBc0ZoU2szTHdXZm5HbHhuVURGcUZaQTNVb3VN
-WWovWGlnYk1rTmVFWElqbGtST0tUNE9QR2ZSeC9MQXlSbFFRCmpDTXY0cWhia2NYMXA3YXI2M2Zs
-cTRTWk5WY2wxNWw3aDB1VDU4RnpTZm5sejB1NXJrSGZKSW1ENDMrbWFQLzhndjM2RlIyN2pXOFIK
-OXdZNGhrK1dzNElCMGlGU2Q4U1h2MUtyOHcvSm1NUVNEa2l1RytSZklpdWJ3US9meTdFa2o1UVdo
-UFp3K21NeE5LbkhVTHkzeFl6MgpMd1ZmZnRqd1V1ZWFjdnFOUkNrTVhsQ2xPQURxZlQ4b1Nab2VE
-WGVoSHZsUHNMQ2VtR0JvVEt1cnNrSVM2OUYweVBFSDVnemUwSCtmCjhGUk9zSW9LU3NWUTM0QjRT
-L2pvRTY3bnBzSlBUZEtzTlBKVHlRSURBUUFCbzRJQmt6Q0NBWTh3REFZRFZSMFRBUUgvQkFJd0FE
-QWQKQmdOVkhRNEVGZ1FVb0ZwWTc2cDV5b05EUkd0UXB6VnVSODFVV1Ewd2djWUdBMVVkSXdTQnZq
-Q0J1NEFVdzYwK3B0WVJBRVdBWERwWApTb3B0M0RFTm5uR2hnWUNrZmpCOE1Rc3dDUVlEVlFRR0V3
-SlZVekU4TURvR0ExVUVDaE16U1c1MFpYSnVaWFFnUTI5eWNHOXlZWFJwCmIyNGdabTl5SUVGemMy
-bG5ibVZrSUU1aGJXVnpJR0Z1WkNCT2RXMWlaWEp6TVM4d0xRWURWUVFERXlaSlEwRk9UaUJVY21G
-a1pXMWgKY21zZ1EyeGxZWEpwYm1kb2IzVnpaU0JRYVd4dmRDQkRRWUlnTHJBYmV2b2FlNTJ5M2Y2
-QzJ0QjBTbjNwN1hKbTBUMDJGb2d4S0NmTgpoWGt3RGdZRFZSMFBBUUgvQkFRREFnZUFNRFFHQTFV
-ZEh3UXRNQ3N3S2FBbm9DV0dJMmgwZEhBNkx5OWpjbXd1YVdOaGJtNHViM0puCkwzUnRZMmhmY0ds
-c2IzUXVZM0pzTUZFR0ExVWRJQVJLTUVnd0VBWU9Ld1lCQkFHQ3lSc0JCWU03REFvd05BWUlLd1lC
-QlFVSEFnRXcKS0RBbUJnZ3JCZ0VGQlFjQ0FSWWFhSFIwY0hNNkx5OWpZUzVwWTJGdWJpNXZjbWN2
-Y0dsc2IzUXdEUVlKS29aSWh2Y05BUUVMQlFBRApnZ0VCQUF1aloySWNSMkRWcnRhUnJBNTllTllD
-bDR4Y3NKTXU4RFFDSHYyOGZUZmkvQmlaWTRJcjdGOWtGeTk2RDdPWjhvTFk1empmCjRkSHhGd0hQ
-cUg4RGg2Sldzelh1SFcxWmEzWG1sMFBhSHhDV1JTMFhvbDhXc0hIcE55Z2pNQllmSjBvZFZNODg1
-VFoxRWw5U2l1RUgKbnluRkJnU21pRmM5OXVRZC9ZRFJadUd2L0EwSHl2N3lSOXRrTEVkRDNBMXVO
-SkJXNFArSEpHcGRLa1lMMVE1clU3K29IVlB0TUtLSQozaUZrVUVzYk80NUFWZDd2UC9qLzdKdEFa
-UGI2a29PVjVsWmkySDFSTGNjR3d6ZGV6bmhKZ2QwTjlvYmIwdm5FNDEvVVNXYWZkV1JaClZHa3dQ
-dXFUaGw3c0N0enJKSDhYWTB4Y3VtK2NmTHgyRUFJd1VuT2NhYjQ9PC9kczpYNTA5Q2VydGlmaWNh
-dGU+PC9kczpYNTA5RGF0YT48L2RzOktleUluZm8+PC9kczpTaWduYXR1cmU+PC9zbWQ6c2lnbmVk
-TWFyaz4=
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/revoked/smd/Trademark-Holder-English-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/Trademark-Holder-English-Revoked.smd
deleted file mode 100644
index e168ed9e7..000000000
--- a/core/src/test/resources/google/registry/tmch/revoked/smd/Trademark-Holder-English-Revoked.smd
+++ /dev/null
@@ -1,99 +0,0 @@
-Marks: Test & Validate
-smdID: 000000541526319788162-65535
-U-labels: test---validate, test--validate, test-et-validate, test-etvalidate, test-validate, testand-validate, testandvalidate, testet-validate, testetvalidate, testvalidate
-notBefore: 2018-05-14T17:43:08.162Z
-notAfter: 2022-08-21T08:12:19.525Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il84NzVh
-MmZhYi01ZDhjLTQ0MDEtOGRjZC1jNzQ1NmRmYzNhODIiPjxzbWQ6aWQ+MDAwMDAwNTQxNTI2MzE5
-Nzg4MTYyLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo0MzowOC4xNjJaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0yMVQwODoxMjoxOS41MjVaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
-cmFkZW1hcms+PG1hcms6aWQ+MDAwMTM2MTUwMzA1NjkwOTE1MDMwNTY5MDktMTwvbWFyazppZD48
-bWFyazptYXJrTmFtZT5UZXN0ICZhbXA7IFZhbGlkYXRlPC9tYXJrOm1hcmtOYW1lPjxtYXJrOmhv
-bGRlciBlbnRpdGxlbWVudD0ib3duZXIiPjxtYXJrOm5hbWU+RnJhbmsgV2hpdGU8L21hcms6bmFt
-ZT48bWFyazpvcmc+VGVzdCBPcmdhbml6YXRpb248L21hcms6b3JnPjxtYXJrOmFkZHI+PG1hcms6
-c3RyZWV0Pldlc3QgQXJxdWVzIEF2ZW51ZSAxMDEgPC9tYXJrOnN0cmVldD48bWFyazpjaXR5PlN1
-bm55dmFsZTwvbWFyazpjaXR5PjxtYXJrOnNwPkNBPC9tYXJrOnNwPjxtYXJrOnBjPjEwMDIzLTMy
-NDE8L21hcms6cGM+PG1hcms6Y2M+VVM8L21hcms6Y2M+PC9tYXJrOmFkZHI+PG1hcms6dm9pY2U+
-KzEuMzAxNDU1NjYwMDwvbWFyazp2b2ljZT48bWFyazpmYXg+KzEuMzAxNDU1NjYwMTwvbWFyazpm
-YXg+PG1hcms6ZW1haWw+aW5mb0BleGFtcGxlLmV4YW1wbGU8L21hcms6ZW1haWw+PC9tYXJrOmhv
-bGRlcj48bWFyazpqdXJpc2RpY3Rpb24+VVM8L21hcms6anVyaXNkaWN0aW9uPjxtYXJrOmNsYXNz
-PjE1PC9tYXJrOmNsYXNzPjxtYXJrOmxhYmVsPnRlc3QtLS12YWxpZGF0ZTwvbWFyazpsYWJlbD48
-bWFyazpsYWJlbD50ZXN0LS12YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0LWV0
-LXZhbGlkYXRlPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnRlc3QtZXR2YWxpZGF0ZTwvbWFyazps
-YWJlbD48bWFyazpsYWJlbD50ZXN0LXZhbGlkYXRlPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnRl
-c3RhbmQtdmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+dGVzdGFuZHZhbGlkYXRlPC9t
-YXJrOmxhYmVsPjxtYXJrOmxhYmVsPnRlc3RldC12YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazps
-YWJlbD50ZXN0ZXR2YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0dmFsaWRhdGU8
-L21hcms6bGFiZWw+PG1hcms6Z29vZHNBbmRTZXJ2aWNlcz5ndWl0YXI8L21hcms6Z29vZHNBbmRT
-ZXJ2aWNlcz48bWFyazpyZWdOdW0+MTIzNDwvbWFyazpyZWdOdW0+PG1hcms6cmVnRGF0ZT4yMDEz
-LTAxLTAxVDAwOjAwOjAwLjAwMFo8L21hcms6cmVnRGF0ZT48bWFyazpleERhdGU+MjAxNC0xMS0w
-NVQwMDowMDowMC4wMDBaPC9tYXJrOmV4RGF0ZT48L21hcms6dHJhZGVtYXJrPjwvbWFyazptYXJr
-PjxkczpTaWduYXR1cmUgeG1sbnM6ZHM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1sZHNp
-ZyMiIElkPSJfNWFmNTFiOGYtYzEyYi00MjExLWFhZTItODg1NmQ4MGY2MTM2Ij48ZHM6U2lnbmVk
-SW5mbz48ZHM6Q2Fub25pY2FsaXphdGlvbk1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMu
-b3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjxkczpTaWduYXR1cmVNZXRob2QgQWxnb3JpdGht
-PSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGRzaWctbW9yZSNyc2Etc2hhMjU2Ii8+PGRz
-OlJlZmVyZW5jZSBVUkk9IiNfODc1YTJmYWItNWQ4Yy00NDAxLThkY2QtYzc0NTZkZmMzYTgyIj48
-ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcv
-MjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48ZHM6VHJhbnNmb3JtIEFsZ29y
-aXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFu
-c2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAx
-LzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+UnA3TVcxMTJ6RERmdXJEV1ZTc3h4
-RXQwQVlLdjZlMUVnNHgxUi9BQ2hiND08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNlPjxk
-czpSZWZlcmVuY2UgVVJJPSIjX2Y2NGJhZGJiLTZkZWEtNGM2ZS1hNTY4LTViZTJkMmI1NTEwNSI+
-PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3Jn
-LzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6RGlnZXN0TWV0aG9k
-IEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxlbmMjc2hhMjU2Ii8+PGRz
-OkRpZ2VzdFZhbHVlPmF5VGdQWUpmU2JKRTE0aEVYeEkwYzBHaFBQZkRxNjh4Mmk4cnVaSkFsWkk9
-PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48L2RzOlNpZ25lZEluZm8+PGRzOlNpZ25h
-dHVyZVZhbHVlIElkPSJfYmZmMzkyOWItZGNkYy00MTY1LWFjNDctMGZhZmI5ZGU1NTdhIj5tMGhE
-bDJUc1ZqdVV6VkY4M01QOG9wanFSTWcwQVBDa2hlekNIeTVtMGRBMFpZRGFIcVVSR2pVUkRDblZB
-T0JFSHFoeU1oRWN2cDRwCjlKL2tSZ3RteG52RzNwNFI4L0hVRjJMOEp0Q3lQajNvMHhiTFJrdDRX
-YTNuRE5ZaHRDYm42SGk2czFYcUlZbDl5cVNBZGsxdEdiSTAKSkpicUxZdDNrZnEzQ0oyREN1bGF0
-WVVkajRRTWJ6aDBzT2lpUWRPZmxpOTRIM1JjdE5HRzR0aFlmWithYWkxa25qUlpqMmhtYlU4awpT
-TjN6azJ2RkY4VTFJeXAvY1YwTHJ1alF2ckNHWmxsZzltZlBSYW9DR2tzNFlKb2UwWmtsVzF6V2U3
-cCt5blFCMldaVEgvR2FGU2luCkxQM3Z5S3A2K0VLRXEyQ2EzUHhOME9oVHZDalJxeEUvUDd5ell3
-PT08L2RzOlNpZ25hdHVyZVZhbHVlPjxkczpLZXlJbmZvIElkPSJfZjY0YmFkYmItNmRlYS00YzZl
-LWE1NjgtNWJlMmQyYjU1MTA1Ij48ZHM6WDUwOURhdGE+PGRzOlg1MDlDZXJ0aWZpY2F0ZT5NSUlG
-T3pDQ0JDT2dBd0lCQWdJZ0xyQWJldm9hZTUyeTNmNkMydEIwU24zcDdYSm0wVDAyRm9neEtDZk5o
-WmN3RFFZSktvWklodmNOCkFRRUxCUUF3ZkRFTE1Ba0dBMVVFQmhNQ1ZWTXhQREE2QmdOVkJBb1RN
-MGx1ZEdWeWJtVjBJRU52Y25CdmNtRjBhVzl1SUdadmNpQkIKYzNOcFoyNWxaQ0JPWVcxbGN5Qmhi
-bVFnVG5WdFltVnljekV2TUMwR0ExVUVBeE1tU1VOQlRrNGdWSEpoWkdWdFlYSnJJRU5zWldGeQph
-VzVuYUc5MWMyVWdVR2xzYjNRZ1EwRXdIaGNOTVRnd01qSTRNREF3TURBd1doY05Nak13TXpBeE1q
-TTFPVFU1V2pDQmp6RUxNQWtHCkExVUVCaE1DUWtVeElEQWVCZ05WQkFnVEYwSnlkWE56Wld4ekxV
-TmhjR2wwWVd3Z1VtVm5hVzl1TVJFd0R3WURWUVFIRXdoQ2NuVnoKYzJWc2N6RVJNQThHQTFVRUNo
-TUlSR1ZzYjJsMGRHVXhPREEyQmdOVkJBTVRMMGxEUVU1T0lGUk5RMGdnUVhWMGFHOXlhWHBsWkNC
-VQpjbUZrWlcxaGNtc2dVR2xzYjNRZ1ZtRnNhV1JoZEc5eU1JSUJJakFOQmdrcWhraUc5dzBCQVFF
-RkFBT0NBUThBTUlJQkNnS0NBUUVBCnhscDNLcFlIWDNXeUFzRmhTazNMd1dmbkdseG5VREZxRlpB
-M1VvdU1Zai9YaWdiTWtOZUVYSWpsa1JPS1Q0T1BHZlJ4L0xBeVJsUVEKakNNdjRxaGJrY1gxcDdh
-cjYzZmxxNFNaTlZjbDE1bDdoMHVUNThGelNmbmx6MHU1cmtIZkpJbUQ0MyttYVAvOGd2MzZGUjI3
-alc4Ugo5d1k0aGsrV3M0SUIwaUZTZDhTWHYxS3I4dy9KbU1RU0RraXVHK1JmSWl1YndRL2Z5N0Vr
-ajVRV2hQWncrbU14TktuSFVMeTN4WXoyCkx3VmZmdGp3VXVlYWN2cU5SQ2tNWGxDbE9BRHFmVDhv
-U1pvZURYZWhIdmxQc0xDZW1HQm9US3Vyc2tJUzY5RjB5UEVINWd6ZTBIK2YKOEZST3NJb0tTc1ZR
-MzRCNFMvam9FNjducHNKUFRkS3NOUEpUeVFJREFRQUJvNElCa3pDQ0FZOHdEQVlEVlIwVEFRSC9C
-QUl3QURBZApCZ05WSFE0RUZnUVVvRnBZNzZwNXlvTkRSR3RRcHpWdVI4MVVXUTB3Z2NZR0ExVWRJ
-d1NCdmpDQnU0QVV3NjArcHRZUkFFV0FYRHBYClNvcHQzREVObm5HaGdZQ2tmakI4TVFzd0NRWURW
-UVFHRXdKVlV6RThNRG9HQTFVRUNoTXpTVzUwWlhKdVpYUWdRMjl5Y0c5eVlYUnAKYjI0Z1ptOXlJ
-RUZ6YzJsbmJtVmtJRTVoYldWeklHRnVaQ0JPZFcxaVpYSnpNUzh3TFFZRFZRUURFeVpKUTBGT1Rp
-QlVjbUZrWlcxaApjbXNnUTJ4bFlYSnBibWRvYjNWelpTQlFhV3h2ZENCRFFZSWdMckFiZXZvYWU1
-MnkzZjZDMnRCMFNuM3A3WEptMFQwMkZvZ3hLQ2ZOCmhYa3dEZ1lEVlIwUEFRSC9CQVFEQWdlQU1E
-UUdBMVVkSHdRdE1Dc3dLYUFub0NXR0kyaDBkSEE2THk5amNtd3VhV05oYm00dWIzSm4KTDNSdFky
-aGZjR2xzYjNRdVkzSnNNRkVHQTFVZElBUktNRWd3RUFZT0t3WUJCQUdDeVJzQkJZTTdEQW93TkFZ
-SUt3WUJCUVVIQWdFdwpLREFtQmdnckJnRUZCUWNDQVJZYWFIUjBjSE02THk5allTNXBZMkZ1Ymk1
-dmNtY3ZjR2xzYjNRd0RRWUpLb1pJaHZjTkFRRUxCUUFECmdnRUJBQXVqWjJJY1IyRFZydGFSckE1
-OWVOWUNsNHhjc0pNdThEUUNIdjI4ZlRmaS9CaVpZNElyN0Y5a0Z5OTZEN09aOG9MWTV6amYKNGRI
-eEZ3SFBxSDhEaDZKV3N6WHVIVzFaYTNYbWwwUGFIeENXUlMwWG9sOFdzSEhwTnlnak1CWWZKMG9k
-Vk04ODVUWjFFbDlTaXVFSApueW5GQmdTbWlGYzk5dVFkL1lEUlp1R3YvQTBIeXY3eVI5dGtMRWRE
-M0ExdU5KQlc0UCtISkdwZEtrWUwxUTVyVTcrb0hWUHRNS0tJCjNpRmtVRXNiTzQ1QVZkN3ZQL2ov
-N0p0QVpQYjZrb09WNWxaaTJIMVJMY2NHd3pkZXpuaEpnZDBOOW9iYjB2bkU0MS9VU1dhZmRXUloK
-Vkdrd1B1cVRobDdzQ3R6ckpIOFhZMHhjdW0rY2ZMeDJFQUl3VW5PY2FiND08L2RzOlg1MDlDZXJ0
-aWZpY2F0ZT48L2RzOlg1MDlEYXRhPjwvZHM6S2V5SW5mbz48L2RzOlNpZ25hdHVyZT48L3NtZDpz
-aWduZWRNYXJrPg==
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/revoked/smd/Trademark-Holder-French-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/Trademark-Holder-French-Revoked.smd
deleted file mode 100644
index 3da649c22..000000000
--- a/core/src/test/resources/google/registry/tmch/revoked/smd/Trademark-Holder-French-Revoked.smd
+++ /dev/null
@@ -1,99 +0,0 @@
-Marks: Essai & évaluation
-smdID: 000000651526319793910-65535
-U-labels: xn--essai---valuation-itb, xn--essai--valuation-hqb, xn--essai-and-valuation-kzb, xn--essai-andvaluation-jwb, xn--essai-valuation-gnb, xn--essaiand-valuation-jwb, xn--essaiandvaluation-itb, xn--essaiet-valuation-itb, xn--essaietvaluation-hqb, xn--essaivaluation-fkb
-notBefore: 2018-05-14T17:43:13.910Z
-notAfter: 2022-08-21T08:12:14.116Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il9hODUw
-NjNhZi0xYTNiLTQ1NDMtOWU1MS1lY2RkNzY1Yzc2ODQiPjxzbWQ6aWQ+MDAwMDAwNjUxNTI2MzE5
-NzkzOTEwLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo0MzoxMy45MTBaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0yMVQwODoxMjoxNC4xMTZaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
-cmFkZW1hcms+PG1hcms6aWQ+MDAwMTM4MTUwMzA2MDc4MjE1MDMwNjA3ODItMTwvbWFyazppZD48
-bWFyazptYXJrTmFtZT5Fc3NhaSAmYW1wOyDDqXZhbHVhdGlvbjwvbWFyazptYXJrTmFtZT48bWFy
-azpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpuYW1lPkplYW4gTGVibGFuYzwvbWFy
-azpuYW1lPjxtYXJrOm9yZz5PcmFuaXNhdGlvbiBkZSB0ZXN0PC9tYXJrOm9yZz48bWFyazphZGRy
-PjxtYXJrOnN0cmVldD5SVUUgUk9HTkUgNDAgPC9tYXJrOnN0cmVldD48bWFyazpjaXR5PkFSVE9J
-UzwvbWFyazpjaXR5PjxtYXJrOnBjPjIxMzAxPC9tYXJrOnBjPjxtYXJrOmNjPkZSPC9tYXJrOmNj
-PjwvbWFyazphZGRyPjxtYXJrOnZvaWNlPiszMy4yNjQ5OTUwMzI8L21hcms6dm9pY2U+PG1hcms6
-ZmF4PiszMy4yNjQ5OTUwMzM8L21hcms6ZmF4PjxtYXJrOmVtYWlsPmluZm9AZXhhbXBsZS5leGFt
-cGxlPC9tYXJrOmVtYWlsPjwvbWFyazpob2xkZXI+PG1hcms6anVyaXNkaWN0aW9uPlVTPC9tYXJr
-Omp1cmlzZGljdGlvbj48bWFyazpjbGFzcz4xNTwvbWFyazpjbGFzcz48bWFyazpsYWJlbD54bi0t
-ZXNzYWktLS12YWx1YXRpb24taXRiPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1lc3NhaS0t
-dmFsdWF0aW9uLWhxYjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tZXNzYWktYW5kLXZhbHVh
-dGlvbi1remI8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLWVzc2FpLWFuZHZhbHVhdGlvbi1q
-d2I8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLWVzc2FpLXZhbHVhdGlvbi1nbmI8L21hcms6
-bGFiZWw+PG1hcms6bGFiZWw+eG4tLWVzc2FpYW5kLXZhbHVhdGlvbi1qd2I8L21hcms6bGFiZWw+
-PG1hcms6bGFiZWw+eG4tLWVzc2FpYW5kdmFsdWF0aW9uLWl0YjwvbWFyazpsYWJlbD48bWFyazps
-YWJlbD54bi0tZXNzYWlldC12YWx1YXRpb24taXRiPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhu
-LS1lc3NhaWV0dmFsdWF0aW9uLWhxYjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tZXNzYWl2
-YWx1YXRpb24tZmtiPC9tYXJrOmxhYmVsPjxtYXJrOmdvb2RzQW5kU2VydmljZXM+Z3VpdGFyZTwv
-bWFyazpnb29kc0FuZFNlcnZpY2VzPjxtYXJrOnJlZ051bT4xMjM0PC9tYXJrOnJlZ051bT48bWFy
-azpyZWdEYXRlPjIwMTMtMDEtMDFUMDA6MDA6MDAuMDAwWjwvbWFyazpyZWdEYXRlPjwvbWFyazp0
-cmFkZW1hcms+PC9tYXJrOm1hcms+PGRzOlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0cDovL3d3dy53
-My5vcmcvMjAwMC8wOS94bWxkc2lnIyIgSWQ9Il9lZDYwNmM5Ny0wYmI5LTQ4NTItYTA3ZC0wOTAx
-NTFlNjM0OWMiPjxkczpTaWduZWRJbmZvPjxkczpDYW5vbmljYWxpemF0aW9uTWV0aG9kIEFsZ29y
-aXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PGRzOlNpZ25h
-dHVyZU1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZHNpZy1t
-b3JlI3JzYS1zaGEyNTYiLz48ZHM6UmVmZXJlbmNlIFVSST0iI19hODUwNjNhZi0xYTNiLTQ1NDMt
-OWU1MS1lY2RkNzY1Yzc2ODQiPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGht
-PSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjZW52ZWxvcGVkLXNpZ25hdHVyZSIv
-PjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1l
-eGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0
-dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1ZT5V
-SEV5QzZTaTQrZDFqZlhGWFlUL2JNSzU5VjljSml6Q1ViQXI0RytvU0owPTwvZHM6RGlnZXN0VmFs
-dWU+PC9kczpSZWZlcmVuY2U+PGRzOlJlZmVyZW5jZSBVUkk9IiNfZmRiMGY3MTItYWUyMC00NzYx
-LTg5NjctYTBjNWE5YjdmOGFkIj48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRo
-bT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zv
-cm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0
-L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+cHZ1OVhXdEp2RW5BWWxDTVZyUjg1NGpI
-ZmNnb0ZOYWpPZTY4akc5WmdxYz08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNlPjwvZHM6
-U2lnbmVkSW5mbz48ZHM6U2lnbmF0dXJlVmFsdWUgSWQ9Il8wYmZhNDAzMC0zNzVlLTQzZTItODMy
-YS05MTdkNThhYjVjYjgiPmxvSlI2ekcyQ1kxWGJlZkV1K2lJZmFUV01INGh3QVBFZnN4b2ppMDA1
-NlBsbGpicEtSSGZOSGxtdmxnWjBua3gwTVA0M1EwTEJxdTYKTFByWGM5VG5rcUZQNUNWV1NWYWpD
-UlJtUi8yaVEvS2g1YnljMDExU1UyMTJpTGw1UDduaDk3Vi82U0o2OHNiQzVxY3dyOUhNOVoyWgpP
-T01PVGtrOFhiczR4RWdyYjhTbGlZTEpUc2ZzQ1lRcFdKbU1mbitJdFJFL2g5MTBOTlJKZmxFVTF6
-ZnhyVTlBVmdsM0x1WXdmdzJwCmJuK05WSTRPemZ2T1RpK2VmV3ZKM01VRFVzNXdTb0VNTEVMV2k5
-MXpqWFBUdDk2enpxeGNkdzFFL3pIWWNKbGhjVDJQVHRaWmdBZ28KUGRPaktuLzh6U1Z2N3YwajdM
-SHZxUnJJSTFhc0YvUE0ycjNlTnc9PTwvZHM6U2lnbmF0dXJlVmFsdWU+PGRzOktleUluZm8gSWQ9
-Il9mZGIwZjcxMi1hZTIwLTQ3NjEtODk2Ny1hMGM1YTliN2Y4YWQiPjxkczpYNTA5RGF0YT48ZHM6
-WDUwOUNlcnRpZmljYXRlPk1JSUZPekNDQkNPZ0F3SUJBZ0lnTHJBYmV2b2FlNTJ5M2Y2QzJ0QjBT
-bjNwN1hKbTBUMDJGb2d4S0NmTmhaY3dEUVlKS29aSWh2Y04KQVFFTEJRQXdmREVMTUFrR0ExVUVC
-aE1DVlZNeFBEQTZCZ05WQkFvVE0wbHVkR1Z5Ym1WMElFTnZjbkJ2Y21GMGFXOXVJR1p2Y2lCQgpj
-M05wWjI1bFpDQk9ZVzFsY3lCaGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF4TW1TVU5CVGs0Z1ZI
-SmhaR1Z0WVhKcklFTnNaV0Z5CmFXNW5hRzkxYzJVZ1VHbHNiM1FnUTBFd0hoY05NVGd3TWpJNE1E
-QXdNREF3V2hjTk1qTXdNekF4TWpNMU9UVTVXakNCanpFTE1Ba0cKQTFVRUJoTUNRa1V4SURBZUJn
-TlZCQWdURjBKeWRYTnpaV3h6TFVOaGNHbDBZV3dnVW1WbmFXOXVNUkV3RHdZRFZRUUhFd2hDY25W
-egpjMlZzY3pFUk1BOEdBMVVFQ2hNSVJHVnNiMmwwZEdVeE9EQTJCZ05WQkFNVEwwbERRVTVPSUZS
-TlEwZ2dRWFYwYUc5eWFYcGxaQ0JVCmNtRmtaVzFoY21zZ1VHbHNiM1FnVm1Gc2FXUmhkRzl5TUlJ
-QklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUEKeGxwM0twWUhYM1d5QXNG
-aFNrM0x3V2ZuR2x4blVERnFGWkEzVW91TVlqL1hpZ2JNa05lRVhJamxrUk9LVDRPUEdmUngvTEF5
-UmxRUQpqQ012NHFoYmtjWDFwN2FyNjNmbHE0U1pOVmNsMTVsN2gwdVQ1OEZ6U2ZubHowdTVya0hm
-SkltRDQzK21hUC84Z3YzNkZSMjdqVzhSCjl3WTRoaytXczRJQjBpRlNkOFNYdjFLcjh3L0ptTVFT
-RGtpdUcrUmZJaXVid1EvZnk3RWtqNVFXaFBadyttTXhOS25IVUx5M3hZejIKTHdWZmZ0andVdWVh
-Y3ZxTlJDa01YbENsT0FEcWZUOG9TWm9lRFhlaEh2bFBzTENlbUdCb1RLdXJza0lTNjlGMHlQRUg1
-Z3plMEgrZgo4RlJPc0lvS1NzVlEzNEI0Uy9qb0U2N25wc0pQVGRLc05QSlR5UUlEQVFBQm80SUJr
-ekNDQVk4d0RBWURWUjBUQVFIL0JBSXdBREFkCkJnTlZIUTRFRmdRVW9GcFk3NnA1eW9ORFJHdFFw
-elZ1UjgxVVdRMHdnY1lHQTFVZEl3U0J2akNCdTRBVXc2MCtwdFlSQUVXQVhEcFgKU29wdDNERU5u
-bkdoZ1lDa2ZqQjhNUXN3Q1FZRFZRUUdFd0pWVXpFOE1Eb0dBMVVFQ2hNelNXNTBaWEp1WlhRZ1Ey
-OXljRzl5WVhScApiMjRnWm05eUlFRnpjMmxuYm1Wa0lFNWhiV1Z6SUdGdVpDQk9kVzFpWlhKek1T
-OHdMUVlEVlFRREV5WkpRMEZPVGlCVWNtRmtaVzFoCmNtc2dRMnhsWVhKcGJtZG9iM1Z6WlNCUWFX
-eHZkQ0JEUVlJZ0xyQWJldm9hZTUyeTNmNkMydEIwU24zcDdYSm0wVDAyRm9neEtDZk4KaFhrd0Rn
-WURWUjBQQVFIL0JBUURBZ2VBTURRR0ExVWRId1F0TUNzd0thQW5vQ1dHSTJoMGRIQTZMeTlqY213
-dWFXTmhibTR1YjNKbgpMM1J0WTJoZmNHbHNiM1F1WTNKc01GRUdBMVVkSUFSS01FZ3dFQVlPS3dZ
-QkJBR0N5UnNCQllNN0RBb3dOQVlJS3dZQkJRVUhBZ0V3CktEQW1CZ2dyQmdFRkJRY0NBUllhYUhS
-MGNITTZMeTlqWVM1cFkyRnViaTV2Y21jdmNHbHNiM1F3RFFZSktvWklodmNOQVFFTEJRQUQKZ2dF
-QkFBdWpaMkljUjJEVnJ0YVJyQTU5ZU5ZQ2w0eGNzSk11OERRQ0h2MjhmVGZpL0JpWlk0SXI3Rjlr
-Rnk5NkQ3T1o4b0xZNXpqZgo0ZEh4RndIUHFIOERoNkpXc3pYdUhXMVphM1htbDBQYUh4Q1dSUzBY
-b2w4V3NISHBOeWdqTUJZZkowb2RWTTg4NVRaMUVsOVNpdUVICm55bkZCZ1NtaUZjOTl1UWQvWURS
-WnVHdi9BMEh5djd5Ujl0a0xFZEQzQTF1TkpCVzRQK0hKR3BkS2tZTDFRNXJVNytvSFZQdE1LS0kK
-M2lGa1VFc2JPNDVBVmQ3dlAvai83SnRBWlBiNmtvT1Y1bFppMkgxUkxjY0d3emRlem5oSmdkME45
-b2JiMHZuRTQxL1VTV2FmZFdSWgpWR2t3UHVxVGhsN3NDdHpySkg4WFkweGN1bStjZkx4MkVBSXdV
-bk9jYWI0PTwvZHM6WDUwOUNlcnRpZmljYXRlPjwvZHM6WDUwOURhdGE+PC9kczpLZXlJbmZvPjwv
-ZHM6U2lnbmF0dXJlPjwvc21kOnNpZ25lZE1hcms+
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/revoked/smd/Trademark-Holder-Russian-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/Trademark-Holder-Russian-Revoked.smd
deleted file mode 100644
index 5fb380283..000000000
--- a/core/src/test/resources/google/registry/tmch/revoked/smd/Trademark-Holder-Russian-Revoked.smd
+++ /dev/null
@@ -1,94 +0,0 @@
-Marks: Тест&случай
-smdID: 000000681526319799634-65535
-U-labels: xn----8sbnsi8abecn8b, xn--and-8cdv2am8bdecr6c, xn--et-8kcrxk3bcecp2c, xn--80ajng3aaecl4b
-notBefore: 2018-05-14T17:43:19.634Z
-notAfter: 2022-08-21T08:12:08.921Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il8yZWFk
-ODc2Ny03ZjBkLTRiMTUtODIxMy02NDBjODBkZjVjZjYiPjxzbWQ6aWQ+MDAwMDAwNjgxNTI2MzE5
-Nzk5NjM0LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo0MzoxOS42MzRaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0yMVQwODoxMjowOC45MjFaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
-cmFkZW1hcms+PG1hcms6aWQ+MDAwMTQwMTUwMzA2MzYxMzE1MDMwNjM2MTMtMTwvbWFyazppZD48
-bWFyazptYXJrTmFtZT7QotC10YHRgiZhbXA70YHQu9GD0YfQsNC5PC9tYXJrOm1hcmtOYW1lPjxt
-YXJrOmhvbGRlciBlbnRpdGxlbWVudD0ib3duZXIiPjxtYXJrOm5hbWU+0J3QsNGC0LDQu9GM0Y8g
-0JDQvdGC0L7QvdC+0LLQsDwvbWFyazpuYW1lPjxtYXJrOm9yZz7QkNC90YLQvtC90L7QstCwPC9t
-YXJrOm9yZz48bWFyazphZGRyPjxtYXJrOnN0cmVldD7Qn9GA0L7RgdC/0LXQutGCINCS0LXRgNC9
-0LDQtNGB0LrQvtCz0L4gMTU8L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+0JzQvtGB0LrQstCwPC9t
-YXJrOmNpdHk+PG1hcms6cGM+MTE3NDg1PC9tYXJrOnBjPjxtYXJrOmNjPlJVPC9tYXJrOmNjPjwv
-bWFyazphZGRyPjxtYXJrOnZvaWNlPis3LjkxODgyMjE2NzQ8L21hcms6dm9pY2U+PG1hcms6ZW1h
-aWw+aW5mb0BleGFtcGxlLmV4YW1wbGU8L21hcms6ZW1haWw+PC9tYXJrOmhvbGRlcj48bWFyazpq
-dXJpc2RpY3Rpb24+VVM8L21hcms6anVyaXNkaWN0aW9uPjxtYXJrOmNsYXNzPjE1PC9tYXJrOmNs
-YXNzPjxtYXJrOmxhYmVsPnhuLS0tLThzYm5zaThhYmVjbjhiPC9tYXJrOmxhYmVsPjxtYXJrOmxh
-YmVsPnhuLS1hbmQtOGNkdjJhbThiZGVjcjZjPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1l
-dC04a2NyeGszYmNlY3AyYzwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tODBham5nM2FhZWNs
-NGI8L21hcms6bGFiZWw+PG1hcms6Z29vZHNBbmRTZXJ2aWNlcz7Qs9C40YLQsNGA0LA8L21hcms6
-Z29vZHNBbmRTZXJ2aWNlcz48bWFyazpyZWdOdW0+MTIzNDwvbWFyazpyZWdOdW0+PG1hcms6cmVn
-RGF0ZT4yMDEzLTAxLTAxVDAwOjAwOjAwLjAwMFo8L21hcms6cmVnRGF0ZT48L21hcms6dHJhZGVt
-YXJrPjwvbWFyazptYXJrPjxkczpTaWduYXR1cmUgeG1sbnM6ZHM9Imh0dHA6Ly93d3cudzMub3Jn
-LzIwMDAvMDkveG1sZHNpZyMiIElkPSJfOTdkZjBmNTctOWRhYS00YTM3LWIxMjgtNDAzMmY0OGNk
-OWEyIj48ZHM6U2lnbmVkSW5mbz48ZHM6Q2Fub25pY2FsaXphdGlvbk1ldGhvZCBBbGdvcml0aG09
-Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjxkczpTaWduYXR1cmVN
-ZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGRzaWctbW9yZSNy
-c2Etc2hhMjU2Ii8+PGRzOlJlZmVyZW5jZSBVUkk9IiNfMmVhZDg3NjctN2YwZC00YjE1LTgyMTMt
-NjQwYzgwZGY1Y2Y2Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0
-cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48ZHM6
-VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMx
-NG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8v
-d3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+SGtvTko0
-cnFxT3NWQ01XTTA2QndtaFU2Mkhuc3pKajZtV3dYQzFQTFFNdz08L2RzOkRpZ2VzdFZhbHVlPjwv
-ZHM6UmVmZXJlbmNlPjxkczpSZWZlcmVuY2UgVVJJPSIjXzVlMDYxNmQwLWQ2MDgtNGUzMC04MmE1
-LTU5M2MxZWRhNmI5OCI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0
-dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48
-ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxl
-bmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPndjWDVIb2NER2xobk1qMnltNkhFSVZ4cWFTQ1Mx
-bGw2WUZJTkRETzRZZ1E9PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48L2RzOlNpZ25l
-ZEluZm8+PGRzOlNpZ25hdHVyZVZhbHVlIElkPSJfMGI4NmU1YTItODk3Ny00ZTE3LWI0MmQtZDRj
-NWU4ZjUxN2YxIj5waEI4enF5WndvWXpaWEVybUFCa2dRUllZM3lnRzJZRU4vTmo2aUNxV0dCeVNY
-QURORWljUWFzNkxSTXIvOTk1RXFoQk9XYStzWms1Cm04dlg0R2tiR2REZTRNZWpWR0oxUkl4UkNu
-ZElXdlI4ZG95RFo1Y3lKVXQ2RCtkWWo1a0lRUWlPanhiRVd5YWNPczFodVVYaVdvUm0KK1RjdHNG
-VmJRdlkvR2hoQ09hZFd6cCtUbzRPMER1d0MvdHE2c1E0a0FqWnJOV2pLRXRMcENvSkpHRVdudnFT
-VWpVM1JGekd2K1h4OQpKa0lRd2FVK2NRQ3VKeDRjTm5aQ1JLS0hid3ZMZnhkYjh5Uk9KK0NJOWJz
-N084ZEpvbkMvVjU5eXlGZmo4RHY0MnlwMForSkhLSENQCk96dzZYYmNQRS9pRVdzMkdaZFFuNnU2
-YnA0WkFsYVByOGEwaWVRPT08L2RzOlNpZ25hdHVyZVZhbHVlPjxkczpLZXlJbmZvIElkPSJfNWUw
-NjE2ZDAtZDYwOC00ZTMwLTgyYTUtNTkzYzFlZGE2Yjk4Ij48ZHM6WDUwOURhdGE+PGRzOlg1MDlD
-ZXJ0aWZpY2F0ZT5NSUlGT3pDQ0JDT2dBd0lCQWdJZ0xyQWJldm9hZTUyeTNmNkMydEIwU24zcDdY
-Sm0wVDAyRm9neEtDZk5oWmN3RFFZSktvWklodmNOCkFRRUxCUUF3ZkRFTE1Ba0dBMVVFQmhNQ1ZW
-TXhQREE2QmdOVkJBb1RNMGx1ZEdWeWJtVjBJRU52Y25CdmNtRjBhVzl1SUdadmNpQkIKYzNOcFoy
-NWxaQ0JPWVcxbGN5QmhibVFnVG5WdFltVnljekV2TUMwR0ExVUVBeE1tU1VOQlRrNGdWSEpoWkdW
-dFlYSnJJRU5zWldGeQphVzVuYUc5MWMyVWdVR2xzYjNRZ1EwRXdIaGNOTVRnd01qSTRNREF3TURB
-d1doY05Nak13TXpBeE1qTTFPVFU1V2pDQmp6RUxNQWtHCkExVUVCaE1DUWtVeElEQWVCZ05WQkFn
-VEYwSnlkWE56Wld4ekxVTmhjR2wwWVd3Z1VtVm5hVzl1TVJFd0R3WURWUVFIRXdoQ2NuVnoKYzJW
-c2N6RVJNQThHQTFVRUNoTUlSR1ZzYjJsMGRHVXhPREEyQmdOVkJBTVRMMGxEUVU1T0lGUk5RMGdn
-UVhWMGFHOXlhWHBsWkNCVQpjbUZrWlcxaGNtc2dVR2xzYjNRZ1ZtRnNhV1JoZEc5eU1JSUJJakFO
-QmdrcWhraUc5dzBCQVFFRkFBT0NBUThBTUlJQkNnS0NBUUVBCnhscDNLcFlIWDNXeUFzRmhTazNM
-d1dmbkdseG5VREZxRlpBM1VvdU1Zai9YaWdiTWtOZUVYSWpsa1JPS1Q0T1BHZlJ4L0xBeVJsUVEK
-akNNdjRxaGJrY1gxcDdhcjYzZmxxNFNaTlZjbDE1bDdoMHVUNThGelNmbmx6MHU1cmtIZkpJbUQ0
-MyttYVAvOGd2MzZGUjI3alc4Ugo5d1k0aGsrV3M0SUIwaUZTZDhTWHYxS3I4dy9KbU1RU0RraXVH
-K1JmSWl1YndRL2Z5N0VrajVRV2hQWncrbU14TktuSFVMeTN4WXoyCkx3VmZmdGp3VXVlYWN2cU5S
-Q2tNWGxDbE9BRHFmVDhvU1pvZURYZWhIdmxQc0xDZW1HQm9US3Vyc2tJUzY5RjB5UEVINWd6ZTBI
-K2YKOEZST3NJb0tTc1ZRMzRCNFMvam9FNjducHNKUFRkS3NOUEpUeVFJREFRQUJvNElCa3pDQ0FZ
-OHdEQVlEVlIwVEFRSC9CQUl3QURBZApCZ05WSFE0RUZnUVVvRnBZNzZwNXlvTkRSR3RRcHpWdVI4
-MVVXUTB3Z2NZR0ExVWRJd1NCdmpDQnU0QVV3NjArcHRZUkFFV0FYRHBYClNvcHQzREVObm5HaGdZ
-Q2tmakI4TVFzd0NRWURWUVFHRXdKVlV6RThNRG9HQTFVRUNoTXpTVzUwWlhKdVpYUWdRMjl5Y0c5
-eVlYUnAKYjI0Z1ptOXlJRUZ6YzJsbmJtVmtJRTVoYldWeklHRnVaQ0JPZFcxaVpYSnpNUzh3TFFZ
-RFZRUURFeVpKUTBGT1RpQlVjbUZrWlcxaApjbXNnUTJ4bFlYSnBibWRvYjNWelpTQlFhV3h2ZENC
-RFFZSWdMckFiZXZvYWU1MnkzZjZDMnRCMFNuM3A3WEptMFQwMkZvZ3hLQ2ZOCmhYa3dEZ1lEVlIw
-UEFRSC9CQVFEQWdlQU1EUUdBMVVkSHdRdE1Dc3dLYUFub0NXR0kyaDBkSEE2THk5amNtd3VhV05o
-Ym00dWIzSm4KTDNSdFkyaGZjR2xzYjNRdVkzSnNNRkVHQTFVZElBUktNRWd3RUFZT0t3WUJCQUdD
-eVJzQkJZTTdEQW93TkFZSUt3WUJCUVVIQWdFdwpLREFtQmdnckJnRUZCUWNDQVJZYWFIUjBjSE02
-THk5allTNXBZMkZ1Ymk1dmNtY3ZjR2xzYjNRd0RRWUpLb1pJaHZjTkFRRUxCUUFECmdnRUJBQXVq
-WjJJY1IyRFZydGFSckE1OWVOWUNsNHhjc0pNdThEUUNIdjI4ZlRmaS9CaVpZNElyN0Y5a0Z5OTZE
-N09aOG9MWTV6amYKNGRIeEZ3SFBxSDhEaDZKV3N6WHVIVzFaYTNYbWwwUGFIeENXUlMwWG9sOFdz
-SEhwTnlnak1CWWZKMG9kVk04ODVUWjFFbDlTaXVFSApueW5GQmdTbWlGYzk5dVFkL1lEUlp1R3Yv
-QTBIeXY3eVI5dGtMRWREM0ExdU5KQlc0UCtISkdwZEtrWUwxUTVyVTcrb0hWUHRNS0tJCjNpRmtV
-RXNiTzQ1QVZkN3ZQL2ovN0p0QVpQYjZrb09WNWxaaTJIMVJMY2NHd3pkZXpuaEpnZDBOOW9iYjB2
-bkU0MS9VU1dhZmRXUloKVkdrd1B1cVRobDdzQ3R6ckpIOFhZMHhjdW0rY2ZMeDJFQUl3VW5PY2Fi
-ND08L2RzOlg1MDlDZXJ0aWZpY2F0ZT48L2RzOlg1MDlEYXRhPjwvZHM6S2V5SW5mbz48L2RzOlNp
-Z25hdHVyZT48L3NtZDpzaWduZWRNYXJrPg==
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/revoked/smd/TreatyStatute-Agent-Arab-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/TreatyStatute-Agent-Arab-Revoked.smd
deleted file mode 100644
index 976de9a1f..000000000
--- a/core/src/test/resources/google/registry/tmch/revoked/smd/TreatyStatute-Agent-Arab-Revoked.smd
+++ /dev/null
@@ -1,99 +0,0 @@
-Marks: الاختبار & لتقييم
-smdID: 000000781526319818664-65535
-U-labels: xn------nzeaagpf7azb2ppajr3fa, xn-----btdaafne4a7azpoaiq8ea, xn----ymcaaeld1a4a6onahp3ea, xn--mgbaadjcy1a8mmago8da
-notBefore: 2018-05-14T17:43:38.664Z
-notAfter: 2022-08-18T14:27:18.209Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il8wYzk0
-YTNjZS00OTk0LTQ4ZTYtOWQ3OC0yNDQ3YTVhMGFiMzMiPjxzbWQ6aWQ+MDAwMDAwNzgxNTI2MzE5
-ODE4NjY0LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo0MzozOC42NjRaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0xOFQxNDoyNzoxOC4yMDlaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazpj
-b3VydD48bWFyazppZD4wMDAxNDQxNTAzMDY2NDE3MTUwMzA2NjQxNy0xPC9tYXJrOmlkPjxtYXJr
-Om1hcmtOYW1lPtin2YTYp9iu2KrYqNin2LEgJmFtcDsg2YTYqtmC2YrZitmFPC9tYXJrOm1hcmtO
-YW1lPjxtYXJrOmhvbGRlciBlbnRpdGxlbWVudD0ib3duZXIiPjxtYXJrOm5hbWU+2YXZh9mG2K/Y
-syDYp9mE2YXYudmE2YjZhdin2KrZitipPC9tYXJrOm5hbWU+PG1hcms6YWRkcj48bWFyazpzdHJl
-ZXQ+2KzYudmB2LEg2KfYqNmGINiz2YrZhtin2KEgNzU8L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+
-2YXZg9mG2KfYszwvbWFyazpjaXR5PjxtYXJrOnBjPjI5MDA8L21hcms6cGM+PG1hcms6Y2M+VVM8
-L21hcms6Y2M+PC9tYXJrOmFkZHI+PC9tYXJrOmhvbGRlcj48bWFyazpjb250YWN0IHR5cGU9ImFn
-ZW50Ij48bWFyazpuYW1lPtmF2YfZhtiv2LMg2KfZhNmF2LnZhNmI2YXYp9iq2YrYqTwvbWFyazpu
-YW1lPjxtYXJrOm9yZz7ZiNmD2KfZhNipPC9tYXJrOm9yZz48bWFyazphZGRyPjxtYXJrOnN0cmVl
-dD7YtNin2LHYuSDYrNi52YHYsSDYp9io2YYg2LPZitmG2KfYoSA3NTwvbWFyazpzdHJlZXQ+PG1h
-cms6Y2l0eT7ZhdmD2YbYp9izPC9tYXJrOmNpdHk+PG1hcms6cGM+MjkwMDwvbWFyazpwYz48bWFy
-azpjYz5NQTwvbWFyazpjYz48L21hcms6YWRkcj48bWFyazp2b2ljZT4rMjEyLjUyMjUzOTA0MDwv
-bWFyazp2b2ljZT48bWFyazpmYXg+KzIxMi41MjI1MzkwNDE8L21hcms6ZmF4PjxtYXJrOmVtYWls
-PmluZm9AYWdlbmN5LW1hcm9jY28uY29tPC9tYXJrOmVtYWlsPjwvbWFyazpjb250YWN0PjxtYXJr
-OmxhYmVsPnhuLS0tLS0tbnplYWFncGY3YXpiMnBwYWpyM2ZhPC9tYXJrOmxhYmVsPjxtYXJrOmxh
-YmVsPnhuLS0tLS1idGRhYWZuZTRhN2F6cG9haXE4ZWE8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+
-eG4tLS0teW1jYWFlbGQxYTRhNm9uYWhwM2VhPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1t
-Z2JhYWRqY3kxYThtbWFnbzhkYTwvbWFyazpsYWJlbD48bWFyazpnb29kc0FuZFNlcnZpY2VzPti6
-2YrYqtin2LE8L21hcms6Z29vZHNBbmRTZXJ2aWNlcz48bWFyazpyZWZOdW0+MTk4PC9tYXJrOnJl
-Zk51bT48bWFyazpwcm9EYXRlPjIwMTUtMDktMTVUMDA6MDA6MDAuMDAwWjwvbWFyazpwcm9EYXRl
-PjxtYXJrOmNjPlVTPC9tYXJrOmNjPjxtYXJrOmNvdXJ0TmFtZT7Yp9mE2K/Yp9ixINin2YTYqNmK
-2LbYp9ihPC9tYXJrOmNvdXJ0TmFtZT48L21hcms6Y291cnQ+PC9tYXJrOm1hcms+PGRzOlNpZ25h
-dHVyZSB4bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyIgSWQ9Il82
-MWYyMmE4ZC1iNjNhLTRiMWEtOGFhMC0wNGU0MjBmMjZkMjAiPjxkczpTaWduZWRJbmZvPjxkczpD
-YW5vbmljYWxpemF0aW9uTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8x
-MC94bWwtZXhjLWMxNG4jIi8+PGRzOlNpZ25hdHVyZU1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93
-d3cudzMub3JnLzIwMDEvMDQveG1sZHNpZy1tb3JlI3JzYS1zaGEyNTYiLz48ZHM6UmVmZXJlbmNl
-IFVSST0iI18wYzk0YTNjZS00OTk0LTQ4ZTYtOWQ3OC0yNDQ3YTVhMGFiMzMiPjxkczpUcmFuc2Zv
-cm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3ht
-bGRzaWcjZW52ZWxvcGVkLXNpZ25hdHVyZSIvPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRw
-Oi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRz
-OkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5j
-I3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1ZT5EZ1dSS2YzNjVyekRPY01nTkY5bTR2cGNZZDJXaUU2
-dUI3aXAxeEdBc044PTwvZHM6RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PGRzOlJlZmVyZW5j
-ZSBVUkk9IiNfMGVhOTJhMTMtMTAxNi00NjE4LWFiZGMtMzI2Mjg2ZjdkOWJiIj48ZHM6VHJhbnNm
-b3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94
-bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGht
-PSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFs
-dWU+a0orakdhMVFKRVoxb1ZINWdNaHpOeFY1aEF1Y0w5QzlHV0I3RVI2VktsUT08L2RzOkRpZ2Vz
-dFZhbHVlPjwvZHM6UmVmZXJlbmNlPjwvZHM6U2lnbmVkSW5mbz48ZHM6U2lnbmF0dXJlVmFsdWUg
-SWQ9Il8yYjU1ZWQzYS00MmFiLTQ4ZTItOTcxYi1mMWEyNzFiN2Y4NzEiPm5UZ256WmVmUEhFQWZH
-UHNjTHJZZ2hsaHRuckoyZDRpTHJudUR6bVZxN2crdEk1dVhpZmxrVHp4V0lRVEJFVnNmbCtKSmRl
-Y0ZkbDYKRzlsSDkvVzBIMU1MclhDMXdxVkkwaW9FNEluU01KamR1NDZhZVpDUXdLODNFdnBGbFRD
-UmlxdjlMR1RDNmNrV3A3MXprVzJHQndQMApPWWxOcTZXM2tLbXRHMUljZ29HRVMvUmVNZVA3R25U
-Y0dxMS9Uc3BkNFQ1WmdkNjk1dEJkaDJ0aU9RMzBiRWtUaG1TYWFzU2RvWEtoCk4rcHFzYjV6eHY3
-VzRBek02YVRSZVJteldnSW8zenBvSWxNYnpnVm96TnErd0F4THFIcGJuL3QxMERCenlTNlVpVW10
-RXc0b0szTTIKVFlROEtvelIyV1BndzRsZDdpeFFZYXV6SUVPTWhYaDFEYWF3Z1E9PTwvZHM6U2ln
-bmF0dXJlVmFsdWU+PGRzOktleUluZm8gSWQ9Il8wZWE5MmExMy0xMDE2LTQ2MTgtYWJkYy0zMjYy
-ODZmN2Q5YmIiPjxkczpYNTA5RGF0YT48ZHM6WDUwOUNlcnRpZmljYXRlPk1JSUZPekNDQkNPZ0F3
-SUJBZ0lnTHJBYmV2b2FlNTJ5M2Y2QzJ0QjBTbjNwN1hKbTBUMDJGb2d4S0NmTmhaY3dEUVlKS29a
-SWh2Y04KQVFFTEJRQXdmREVMTUFrR0ExVUVCaE1DVlZNeFBEQTZCZ05WQkFvVE0wbHVkR1Z5Ym1W
-MElFTnZjbkJ2Y21GMGFXOXVJR1p2Y2lCQgpjM05wWjI1bFpDQk9ZVzFsY3lCaGJtUWdUblZ0WW1W
-eWN6RXZNQzBHQTFVRUF4TW1TVU5CVGs0Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5CmFXNW5hRzkxYzJV
-Z1VHbHNiM1FnUTBFd0hoY05NVGd3TWpJNE1EQXdNREF3V2hjTk1qTXdNekF4TWpNMU9UVTVXakNC
-anpFTE1Ba0cKQTFVRUJoTUNRa1V4SURBZUJnTlZCQWdURjBKeWRYTnpaV3h6TFVOaGNHbDBZV3dn
-VW1WbmFXOXVNUkV3RHdZRFZRUUhFd2hDY25WegpjMlZzY3pFUk1BOEdBMVVFQ2hNSVJHVnNiMmww
-ZEdVeE9EQTJCZ05WQkFNVEwwbERRVTVPSUZSTlEwZ2dRWFYwYUc5eWFYcGxaQ0JVCmNtRmtaVzFo
-Y21zZ1VHbHNiM1FnVm1Gc2FXUmhkRzl5TUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFN
-SUlCQ2dLQ0FRRUEKeGxwM0twWUhYM1d5QXNGaFNrM0x3V2ZuR2x4blVERnFGWkEzVW91TVlqL1hp
-Z2JNa05lRVhJamxrUk9LVDRPUEdmUngvTEF5UmxRUQpqQ012NHFoYmtjWDFwN2FyNjNmbHE0U1pO
-VmNsMTVsN2gwdVQ1OEZ6U2ZubHowdTVya0hmSkltRDQzK21hUC84Z3YzNkZSMjdqVzhSCjl3WTRo
-aytXczRJQjBpRlNkOFNYdjFLcjh3L0ptTVFTRGtpdUcrUmZJaXVid1EvZnk3RWtqNVFXaFBadytt
-TXhOS25IVUx5M3hZejIKTHdWZmZ0andVdWVhY3ZxTlJDa01YbENsT0FEcWZUOG9TWm9lRFhlaEh2
-bFBzTENlbUdCb1RLdXJza0lTNjlGMHlQRUg1Z3plMEgrZgo4RlJPc0lvS1NzVlEzNEI0Uy9qb0U2
-N25wc0pQVGRLc05QSlR5UUlEQVFBQm80SUJrekNDQVk4d0RBWURWUjBUQVFIL0JBSXdBREFkCkJn
-TlZIUTRFRmdRVW9GcFk3NnA1eW9ORFJHdFFwelZ1UjgxVVdRMHdnY1lHQTFVZEl3U0J2akNCdTRB
-VXc2MCtwdFlSQUVXQVhEcFgKU29wdDNERU5ubkdoZ1lDa2ZqQjhNUXN3Q1FZRFZRUUdFd0pWVXpF
-OE1Eb0dBMVVFQ2hNelNXNTBaWEp1WlhRZ1EyOXljRzl5WVhScApiMjRnWm05eUlFRnpjMmxuYm1W
-a0lFNWhiV1Z6SUdGdVpDQk9kVzFpWlhKek1TOHdMUVlEVlFRREV5WkpRMEZPVGlCVWNtRmtaVzFo
-CmNtc2dRMnhsWVhKcGJtZG9iM1Z6WlNCUWFXeHZkQ0JEUVlJZ0xyQWJldm9hZTUyeTNmNkMydEIw
-U24zcDdYSm0wVDAyRm9neEtDZk4KaFhrd0RnWURWUjBQQVFIL0JBUURBZ2VBTURRR0ExVWRId1F0
-TUNzd0thQW5vQ1dHSTJoMGRIQTZMeTlqY213dWFXTmhibTR1YjNKbgpMM1J0WTJoZmNHbHNiM1F1
-WTNKc01GRUdBMVVkSUFSS01FZ3dFQVlPS3dZQkJBR0N5UnNCQllNN0RBb3dOQVlJS3dZQkJRVUhB
-Z0V3CktEQW1CZ2dyQmdFRkJRY0NBUllhYUhSMGNITTZMeTlqWVM1cFkyRnViaTV2Y21jdmNHbHNi
-M1F3RFFZSktvWklodmNOQVFFTEJRQUQKZ2dFQkFBdWpaMkljUjJEVnJ0YVJyQTU5ZU5ZQ2w0eGNz
-Sk11OERRQ0h2MjhmVGZpL0JpWlk0SXI3RjlrRnk5NkQ3T1o4b0xZNXpqZgo0ZEh4RndIUHFIOERo
-NkpXc3pYdUhXMVphM1htbDBQYUh4Q1dSUzBYb2w4V3NISHBOeWdqTUJZZkowb2RWTTg4NVRaMUVs
-OVNpdUVICm55bkZCZ1NtaUZjOTl1UWQvWURSWnVHdi9BMEh5djd5Ujl0a0xFZEQzQTF1TkpCVzRQ
-K0hKR3BkS2tZTDFRNXJVNytvSFZQdE1LS0kKM2lGa1VFc2JPNDVBVmQ3dlAvai83SnRBWlBiNmtv
-T1Y1bFppMkgxUkxjY0d3emRlem5oSmdkME45b2JiMHZuRTQxL1VTV2FmZFdSWgpWR2t3UHVxVGhs
-N3NDdHpySkg4WFkweGN1bStjZkx4MkVBSXdVbk9jYWI0PTwvZHM6WDUwOUNlcnRpZmljYXRlPjwv
-ZHM6WDUwOURhdGE+PC9kczpLZXlJbmZvPjwvZHM6U2lnbmF0dXJlPjwvc21kOnNpZ25lZE1hcms+
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/revoked/smd/TreatyStatute-Agent-Chinese-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/TreatyStatute-Agent-Chinese-Revoked.smd
deleted file mode 100644
index 7b15fce2d..000000000
--- a/core/src/test/resources/google/registry/tmch/revoked/smd/TreatyStatute-Agent-Chinese-Revoked.smd
+++ /dev/null
@@ -1,99 +0,0 @@
-Marks: 检查&查询
-smdID: 000000811526319824390-65535
-U-labels: xn----sh7bb78f789j, xn--and-bp0gd32k781m, xn--jvva96di40i
-notBefore: 2018-05-14T17:43:44.390Z
-notAfter: 2022-08-18T14:36:50.931Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il83NTA1
-YzliZi1iNzQ5LTQzM2ItODljZi05NDEyZTZkMzgyZjIiPjxzbWQ6aWQ+MDAwMDAwODExNTI2MzE5
-ODI0MzkwLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo0Mzo0NC4zOTBaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0xOFQxNDozNjo1MC45MzFaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
-cmVhdHlPclN0YXR1dGU+PG1hcms6aWQ+MDAwMTQ2MTUwMzA2Njk3NjE1MDMwNjY5NzYtMTwvbWFy
-azppZD48bWFyazptYXJrTmFtZT7mo4Dmn6UmYW1wO+afpeivojwvbWFyazptYXJrTmFtZT48bWFy
-azpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpvcmc+5bel56iL5aSEPC9tYXJrOm9y
-Zz48bWFyazphZGRyPjxtYXJrOnN0cmVldD7pppnmuK/kuJzot6825Y+377yMNeWPt+alvO+8jDjl
-j7flrqQ8L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+6Z2S5bKb5biCPC9tYXJrOmNpdHk+PG1hcms6
-cGM+MzUwMDwvbWFyazpwYz48bWFyazpjYz5DTjwvbWFyazpjYz48L21hcms6YWRkcj48L21hcms6
-aG9sZGVyPjxtYXJrOmNvbnRhY3QgdHlwZT0iYWdlbnQiPjxtYXJrOm5hbWU+5p2O5bCP5pa5PC9t
-YXJrOm5hbWU+PG1hcms6b3JnPuW3peeoi+WkhDwvbWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpz
-dHJlZXQ+6aaZ5riv5Lic6LevNuWPt++8jDXlj7fmpbzvvIw45Y+35a6kPC9tYXJrOnN0cmVldD48
-bWFyazpjaXR5PumdkuWym+W4gjwvbWFyazpjaXR5PjxtYXJrOnBjPjM1MDA8L21hcms6cGM+PG1h
-cms6Y2M+Q048L21hcms6Y2M+PC9tYXJrOmFkZHI+PG1hcms6dm9pY2U+Kzg2LjEwODQ2NTcxNzM8
-L21hcms6dm9pY2U+PG1hcms6ZmF4Pis4Ni4xMDg0NjU3MTc1PC9tYXJrOmZheD48bWFyazplbWFp
-bD5pbmZvQGNoaW5lc2UtYWdlbmN5LmNvbTwvbWFyazplbWFpbD48L21hcms6Y29udGFjdD48bWFy
-azpwcm90ZWN0aW9uPjxtYXJrOmNjPlVTPC9tYXJrOmNjPjxtYXJrOnJ1bGluZz5DTjwvbWFyazpy
-dWxpbmc+PC9tYXJrOnByb3RlY3Rpb24+PG1hcms6bGFiZWw+eG4tLS0tc2g3YmI3OGY3ODlqPC9t
-YXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1hbmQtYnAwZ2QzMms3ODFtPC9tYXJrOmxhYmVsPjxt
-YXJrOmxhYmVsPnhuLS1qdnZhOTZkaTQwaTwvbWFyazpsYWJlbD48bWFyazpnb29kc0FuZFNlcnZp
-Y2VzPiDlkInku5Y8L21hcms6Z29vZHNBbmRTZXJ2aWNlcz48bWFyazpyZWZOdW0+MTIzNDwvbWFy
-azpyZWZOdW0+PG1hcms6cHJvRGF0ZT4yMDAwLTAxLTAxVDAwOjAwOjAwLjAwMFo8L21hcms6cHJv
-RGF0ZT48bWFyazp0aXRsZT5UZXN0IFRyZWF0eTwvbWFyazp0aXRsZT48bWFyazpleGVjRGF0ZT4y
-MDEzLTAyLTAyVDAwOjAwOjAwLjAwMFo8L21hcms6ZXhlY0RhdGU+PC9tYXJrOnRyZWF0eU9yU3Rh
-dHV0ZT48L21hcms6bWFyaz48ZHM6U2lnbmF0dXJlIHhtbG5zOmRzPSJodHRwOi8vd3d3LnczLm9y
-Zy8yMDAwLzA5L3htbGRzaWcjIiBJZD0iXzU1NmM4MTRmLWZjMDEtNGJmZi1hZTQwLWJhODAxOTI1
-MWZmNCI+PGRzOlNpZ25lZEluZm8+PGRzOkNhbm9uaWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGht
-PSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJl
-TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxkc2lnLW1vcmUj
-cnNhLXNoYTI1NiIvPjxkczpSZWZlcmVuY2UgVVJJPSIjXzc1MDVjOWJmLWI3NDktNDMzYi04OWNm
-LTk0MTJlNmQzODJmMiI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0
-dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1sZHNpZyNlbnZlbG9wZWQtc2lnbmF0dXJlIi8+PGRz
-OlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1j
-MTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDov
-L3d3dy53My5vcmcvMjAwMS8wNC94bWxlbmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPjRleGZV
-N2o5L2xzSW5aQXJ4Sm54WlFqZ1lnL082ODNxVkwxbkhJZUwxQ0U9PC9kczpEaWdlc3RWYWx1ZT48
-L2RzOlJlZmVyZW5jZT48ZHM6UmVmZXJlbmNlIFVSST0iI19kMzQ5OWFlYi0zMTM4LTQzYjctYjM2
-My02ZjRjYjg5NTNmZWYiPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJo
-dHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+
-PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1s
-ZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1ZT5HV2tuaEdpT2tRVVhZWEVCMG1sVEh0K01nRDlz
-YS9Wblg1NEtwVXllZHpNPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PC9kczpTaWdu
-ZWRJbmZvPjxkczpTaWduYXR1cmVWYWx1ZSBJZD0iXzE5YWNhNDFhLTI2MjEtNGU5Yi05MTFlLThl
-NGY0MDA0YzhlOSI+RGJia2M1MnQxTXBzMTd0MVJXS0VKNE5yaWtFWlZQM3R4YkphWXY2UUhuckNn
-WGpRNEZLNmprMnFGVXBaYXVnWE1zTVZVTm5BeDB0TwpxcTdhMUhiam1wRlFMQ1N1SWFUQmdEdG42
-Rm4wRHNocVRUMXFKeHlzSHBubEZWRE5MSjNPak9EZHFLZzZrR1ZwUXlWZ3VmaytRYmJmCk8wdWp1
-ZGNJeGJzSmFpR2lmdWVkcDE0bXFnSytrNnpvM2tXV3M0N3dHQ2tWVk1EQ1Z3dTkyOVBUNDc0SWZZ
-YWxGUW1iR1JkUUJoQmcKWnlKbk92cmxFaHVHWEtDczVDZGlRTXB4Wk5tZzZ0NGhZZTlFTzJpbE5h
-K1NiekhaOU01TGdqMGdyTDhqL3doSzBsa3RMbWorOHV3Qwp0OWxsODRua3l1NVBOUUdGa0wxRGtN
-elkvbWZLbDB1OHN4K2ozUT09PC9kczpTaWduYXR1cmVWYWx1ZT48ZHM6S2V5SW5mbyBJZD0iX2Qz
-NDk5YWViLTMxMzgtNDNiNy1iMzYzLTZmNGNiODk1M2ZlZiI+PGRzOlg1MDlEYXRhPjxkczpYNTA5
-Q2VydGlmaWNhdGU+TUlJRk96Q0NCQ09nQXdJQkFnSWdMckFiZXZvYWU1MnkzZjZDMnRCMFNuM3A3
-WEptMFQwMkZvZ3hLQ2ZOaFpjd0RRWUpLb1pJaHZjTgpBUUVMQlFBd2ZERUxNQWtHQTFVRUJoTUNW
-Vk14UERBNkJnTlZCQW9UTTBsdWRHVnlibVYwSUVOdmNuQnZjbUYwYVc5dUlHWnZjaUJCCmMzTnBa
-MjVsWkNCT1lXMWxjeUJoYm1RZ1RuVnRZbVZ5Y3pFdk1DMEdBMVVFQXhNbVNVTkJUazRnVkhKaFpH
-VnRZWEpySUVOc1pXRnkKYVc1bmFHOTFjMlVnVUdsc2IzUWdRMEV3SGhjTk1UZ3dNakk0TURBd01E
-QXdXaGNOTWpNd016QXhNak0xT1RVNVdqQ0JqekVMTUFrRwpBMVVFQmhNQ1FrVXhJREFlQmdOVkJB
-Z1RGMEp5ZFhOelpXeHpMVU5oY0dsMFlXd2dVbVZuYVc5dU1SRXdEd1lEVlFRSEV3aENjblZ6CmMy
-VnNjekVSTUE4R0ExVUVDaE1JUkdWc2IybDBkR1V4T0RBMkJnTlZCQU1UTDBsRFFVNU9JRlJOUTBn
-Z1FYVjBhRzl5YVhwbFpDQlUKY21Ga1pXMWhjbXNnVUdsc2IzUWdWbUZzYVdSaGRHOXlNSUlCSWpB
-TkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQQp4bHAzS3BZSFgzV3lBc0ZoU2sz
-THdXZm5HbHhuVURGcUZaQTNVb3VNWWovWGlnYk1rTmVFWElqbGtST0tUNE9QR2ZSeC9MQXlSbFFR
-CmpDTXY0cWhia2NYMXA3YXI2M2ZscTRTWk5WY2wxNWw3aDB1VDU4RnpTZm5sejB1NXJrSGZKSW1E
-NDMrbWFQLzhndjM2RlIyN2pXOFIKOXdZNGhrK1dzNElCMGlGU2Q4U1h2MUtyOHcvSm1NUVNEa2l1
-RytSZklpdWJ3US9meTdFa2o1UVdoUFp3K21NeE5LbkhVTHkzeFl6MgpMd1ZmZnRqd1V1ZWFjdnFO
-UkNrTVhsQ2xPQURxZlQ4b1Nab2VEWGVoSHZsUHNMQ2VtR0JvVEt1cnNrSVM2OUYweVBFSDVnemUw
-SCtmCjhGUk9zSW9LU3NWUTM0QjRTL2pvRTY3bnBzSlBUZEtzTlBKVHlRSURBUUFCbzRJQmt6Q0NB
-WTh3REFZRFZSMFRBUUgvQkFJd0FEQWQKQmdOVkhRNEVGZ1FVb0ZwWTc2cDV5b05EUkd0UXB6VnVS
-ODFVV1Ewd2djWUdBMVVkSXdTQnZqQ0J1NEFVdzYwK3B0WVJBRVdBWERwWApTb3B0M0RFTm5uR2hn
-WUNrZmpCOE1Rc3dDUVlEVlFRR0V3SlZVekU4TURvR0ExVUVDaE16U1c1MFpYSnVaWFFnUTI5eWNH
-OXlZWFJwCmIyNGdabTl5SUVGemMybG5ibVZrSUU1aGJXVnpJR0Z1WkNCT2RXMWlaWEp6TVM4d0xR
-WURWUVFERXlaSlEwRk9UaUJVY21Ga1pXMWgKY21zZ1EyeGxZWEpwYm1kb2IzVnpaU0JRYVd4dmRD
-QkRRWUlnTHJBYmV2b2FlNTJ5M2Y2QzJ0QjBTbjNwN1hKbTBUMDJGb2d4S0NmTgpoWGt3RGdZRFZS
-MFBBUUgvQkFRREFnZUFNRFFHQTFVZEh3UXRNQ3N3S2FBbm9DV0dJMmgwZEhBNkx5OWpjbXd1YVdO
-aGJtNHViM0puCkwzUnRZMmhmY0dsc2IzUXVZM0pzTUZFR0ExVWRJQVJLTUVnd0VBWU9Ld1lCQkFH
-Q3lSc0JCWU03REFvd05BWUlLd1lCQlFVSEFnRXcKS0RBbUJnZ3JCZ0VGQlFjQ0FSWWFhSFIwY0hN
-Nkx5OWpZUzVwWTJGdWJpNXZjbWN2Y0dsc2IzUXdEUVlKS29aSWh2Y05BUUVMQlFBRApnZ0VCQUF1
-aloySWNSMkRWcnRhUnJBNTllTllDbDR4Y3NKTXU4RFFDSHYyOGZUZmkvQmlaWTRJcjdGOWtGeTk2
-RDdPWjhvTFk1empmCjRkSHhGd0hQcUg4RGg2Sldzelh1SFcxWmEzWG1sMFBhSHhDV1JTMFhvbDhX
-c0hIcE55Z2pNQllmSjBvZFZNODg1VFoxRWw5U2l1RUgKbnluRkJnU21pRmM5OXVRZC9ZRFJadUd2
-L0EwSHl2N3lSOXRrTEVkRDNBMXVOSkJXNFArSEpHcGRLa1lMMVE1clU3K29IVlB0TUtLSQozaUZr
-VUVzYk80NUFWZDd2UC9qLzdKdEFaUGI2a29PVjVsWmkySDFSTGNjR3d6ZGV6bmhKZ2QwTjlvYmIw
-dm5FNDEvVVNXYWZkV1JaClZHa3dQdXFUaGw3c0N0enJKSDhYWTB4Y3VtK2NmTHgyRUFJd1VuT2Nh
-YjQ9PC9kczpYNTA5Q2VydGlmaWNhdGU+PC9kczpYNTA5RGF0YT48L2RzOktleUluZm8+PC9kczpT
-aWduYXR1cmU+PC9zbWQ6c2lnbmVkTWFyaz4=
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/revoked/smd/TreatyStatute-Agent-English-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/TreatyStatute-Agent-English-Revoked.smd
deleted file mode 100644
index 9da764a85..000000000
--- a/core/src/test/resources/google/registry/tmch/revoked/smd/TreatyStatute-Agent-English-Revoked.smd
+++ /dev/null
@@ -1,103 +0,0 @@
-Marks: Test & Validate
-smdID: 000000881526319835803-65535
-U-labels: test---validate, test--validate, test-and-validate, test-andvalidate, test-validate, testand-validate, testandvalidate, testvalidate
-notBefore: 2018-05-14T17:43:55.803Z
-notAfter: 2022-08-18T14:57:36.681Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il80NjE2
-ODhjNS03ZDNmLTQ5YWItOTI3ZC0xYTYxODRmNjY5YzgiPjxzbWQ6aWQ+MDAwMDAwODgxNTI2MzE5
-ODM1ODAzLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo0Mzo1NS44MDNaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0xOFQxNDo1NzozNi42ODFaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
-cmVhdHlPclN0YXR1dGU+PG1hcms6aWQ+MDAwMTM3MTUwMzA2ODIzMjE1MDMwNjgyMzItMTwvbWFy
-azppZD48bWFyazptYXJrTmFtZT5UZXN0ICZhbXA7IFZhbGlkYXRlPC9tYXJrOm1hcmtOYW1lPjxt
-YXJrOmhvbGRlciBlbnRpdGxlbWVudD0ib3duZXIiPjxtYXJrOm5hbWU+VG9ueSBIb2xsYW5kPC9t
-YXJrOm5hbWU+PG1hcms6b3JnPkFnIGNvcnBvcmF0aW9uPC9tYXJrOm9yZz48bWFyazphZGRyPjxt
-YXJrOnN0cmVldD4xMzA1IEJyaWdodCBBdmVudWU8L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+QXJj
-YWRpYTwvbWFyazpjaXR5PjxtYXJrOnBjPjkwMDI4PC9tYXJrOnBjPjxtYXJrOmNjPlVTPC9tYXJr
-OmNjPjwvbWFyazphZGRyPjwvbWFyazpob2xkZXI+PG1hcms6Y29udGFjdCB0eXBlPSJhZ2VudCI+
-PG1hcms6bmFtZT5Ub255IEhvbGxhbmQ8L21hcms6bmFtZT48bWFyazpvcmc+QWcgY29ycG9yYXRp
-b248L21hcms6b3JnPjxtYXJrOmFkZHI+PG1hcms6c3RyZWV0PkJyaWdodCBBdmVudWUgMTMwNSA8
-L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+QXJjYWRpYTwvbWFyazpjaXR5PjxtYXJrOnNwPkNBPC9t
-YXJrOnNwPjxtYXJrOnBjPjkwMDI4PC9tYXJrOnBjPjxtYXJrOmNjPlVTPC9tYXJrOmNjPjwvbWFy
-azphZGRyPjxtYXJrOnZvaWNlPisxLjIwMjU1NjIzMDI8L21hcms6dm9pY2U+PG1hcms6ZmF4Pisx
-LjIwMjU1NjIzMDE8L21hcms6ZmF4PjxtYXJrOmVtYWlsPmluZm9AYWdjb3Jwb3JhdGlvbi5jb208
-L21hcms6ZW1haWw+PC9tYXJrOmNvbnRhY3Q+PG1hcms6cHJvdGVjdGlvbj48bWFyazpjYz5VUzwv
-bWFyazpjYz48bWFyazpydWxpbmc+VVM8L21hcms6cnVsaW5nPjwvbWFyazpwcm90ZWN0aW9uPjxt
-YXJrOmxhYmVsPnRlc3QtLS12YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0LS12
-YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0LWFuZC12YWxpZGF0ZTwvbWFyazps
-YWJlbD48bWFyazpsYWJlbD50ZXN0LWFuZHZhbGlkYXRlPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVs
-PnRlc3QtdmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+dGVzdGFuZC12YWxpZGF0ZTwv
-bWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0YW5kdmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6
-bGFiZWw+dGVzdHZhbGlkYXRlPC9tYXJrOmxhYmVsPjxtYXJrOmdvb2RzQW5kU2VydmljZXM+Z3Vp
-dGFyPC9tYXJrOmdvb2RzQW5kU2VydmljZXM+PG1hcms6cmVmTnVtPjEyMzQ8L21hcms6cmVmTnVt
-PjxtYXJrOnByb0RhdGU+MjAwMC0wMS0wMVQwMDowMDowMC4wMDBaPC9tYXJrOnByb0RhdGU+PG1h
-cms6dGl0bGU+Z3VpdGFyPC9tYXJrOnRpdGxlPjxtYXJrOmV4ZWNEYXRlPjIwMTMtMDItMDJUMDA6
-MDA6MDAuMDAwWjwvbWFyazpleGVjRGF0ZT48L21hcms6dHJlYXR5T3JTdGF0dXRlPjwvbWFyazpt
-YXJrPjxkczpTaWduYXR1cmUgeG1sbnM6ZHM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1s
-ZHNpZyMiIElkPSJfNGY0YzJiNDQtYWZhZS00ZTFkLWFiNTQtMmNmMTdmNmJkNzRiIj48ZHM6U2ln
-bmVkSW5mbz48ZHM6Q2Fub25pY2FsaXphdGlvbk1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cu
-dzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjxkczpTaWduYXR1cmVNZXRob2QgQWxnb3Jp
-dGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGRzaWctbW9yZSNyc2Etc2hhMjU2Ii8+
-PGRzOlJlZmVyZW5jZSBVUkk9IiNfNDYxNjg4YzUtN2QzZi00OWFiLTkyN2QtMWE2MTg0ZjY2OWM4
-Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5v
-cmcvMjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48ZHM6VHJhbnNmb3JtIEFs
-Z29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpU
-cmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8y
-MDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+amFxaDNOcGZ1TW5EZUVKNjhP
-ZDV1RjgvZ1YzMlREbHljbTJiWkV2ZXRpOD08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNl
-PjxkczpSZWZlcmVuY2UgVVJJPSIjX2Q5MDViZGEwLWI0M2MtNGQ2MC04ZjcxLTJjOGI2NTE2NzA1
-NSI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMu
-b3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6RGlnZXN0TWV0
-aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxlbmMjc2hhMjU2Ii8+
-PGRzOkRpZ2VzdFZhbHVlPnVIbXYzVzU1YnpCaW9pRWhWR2VCb0JraDZwMjZSSVdOb0lHZHlUZ21o
-MUE9PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48L2RzOlNpZ25lZEluZm8+PGRzOlNp
-Z25hdHVyZVZhbHVlIElkPSJfZGM2MmRlYzEtMmEwZS00NGJiLWJmMGEtOGE1NzlmNjA5ZGRhIj5u
-TnkzeThzK292VnQ3T1dpdlZWaWltdjZmS3RNdWI3MW5RejhBby8xSm9oampNKzRlUitTVWdLNVZ1
-UklRNE8vemdoT3FQM0VvVnRrClNjdCtkUmxrU2pxRVNhMXM4dWtDbzZCQlJ5eVlPeHVIbW9FekQ0
-VVRHdXIyMmduY1B5YzlsUTM1VUlMUHRlVXpka3RmN1AvL1E4Nm4KMmxyc21weGhiZk5qbzFDZkVq
-YVl2eXpsRGF4elJBdFdNeU80azd1OHNjT2FEWDcvZGdJTkdWOTltb0t4Y3BnN09zaXBhU0hSVGlL
-TApjSVhHYVBQcHhFdlV6dnFVOFlkbXdrL2VjbjhxSE1IWTdianVyWVQ5bE1ORjRadHIyczZwczBJ
-Rlc0WHhtZ0NSeGVld3NhZlVwemRTClUvZGUydFkvWFdrZW4zNVhHRm93dkR3NFMwL1lUTlF1OUtP
-dFB3PT08L2RzOlNpZ25hdHVyZVZhbHVlPjxkczpLZXlJbmZvIElkPSJfZDkwNWJkYTAtYjQzYy00
-ZDYwLThmNzEtMmM4YjY1MTY3MDU1Ij48ZHM6WDUwOURhdGE+PGRzOlg1MDlDZXJ0aWZpY2F0ZT5N
-SUlGT3pDQ0JDT2dBd0lCQWdJZ0xyQWJldm9hZTUyeTNmNkMydEIwU24zcDdYSm0wVDAyRm9neEtD
-Zk5oWmN3RFFZSktvWklodmNOCkFRRUxCUUF3ZkRFTE1Ba0dBMVVFQmhNQ1ZWTXhQREE2QmdOVkJB
-b1RNMGx1ZEdWeWJtVjBJRU52Y25CdmNtRjBhVzl1SUdadmNpQkIKYzNOcFoyNWxaQ0JPWVcxbGN5
-QmhibVFnVG5WdFltVnljekV2TUMwR0ExVUVBeE1tU1VOQlRrNGdWSEpoWkdWdFlYSnJJRU5zWldG
-eQphVzVuYUc5MWMyVWdVR2xzYjNRZ1EwRXdIaGNOTVRnd01qSTRNREF3TURBd1doY05Nak13TXpB
-eE1qTTFPVFU1V2pDQmp6RUxNQWtHCkExVUVCaE1DUWtVeElEQWVCZ05WQkFnVEYwSnlkWE56Wld4
-ekxVTmhjR2wwWVd3Z1VtVm5hVzl1TVJFd0R3WURWUVFIRXdoQ2NuVnoKYzJWc2N6RVJNQThHQTFV
-RUNoTUlSR1ZzYjJsMGRHVXhPREEyQmdOVkJBTVRMMGxEUVU1T0lGUk5RMGdnUVhWMGFHOXlhWHBs
-WkNCVQpjbUZrWlcxaGNtc2dVR2xzYjNRZ1ZtRnNhV1JoZEc5eU1JSUJJakFOQmdrcWhraUc5dzBC
-QVFFRkFBT0NBUThBTUlJQkNnS0NBUUVBCnhscDNLcFlIWDNXeUFzRmhTazNMd1dmbkdseG5VREZx
-RlpBM1VvdU1Zai9YaWdiTWtOZUVYSWpsa1JPS1Q0T1BHZlJ4L0xBeVJsUVEKakNNdjRxaGJrY1gx
-cDdhcjYzZmxxNFNaTlZjbDE1bDdoMHVUNThGelNmbmx6MHU1cmtIZkpJbUQ0MyttYVAvOGd2MzZG
-UjI3alc4Ugo5d1k0aGsrV3M0SUIwaUZTZDhTWHYxS3I4dy9KbU1RU0RraXVHK1JmSWl1YndRL2Z5
-N0VrajVRV2hQWncrbU14TktuSFVMeTN4WXoyCkx3VmZmdGp3VXVlYWN2cU5SQ2tNWGxDbE9BRHFm
-VDhvU1pvZURYZWhIdmxQc0xDZW1HQm9US3Vyc2tJUzY5RjB5UEVINWd6ZTBIK2YKOEZST3NJb0tT
-c1ZRMzRCNFMvam9FNjducHNKUFRkS3NOUEpUeVFJREFRQUJvNElCa3pDQ0FZOHdEQVlEVlIwVEFR
-SC9CQUl3QURBZApCZ05WSFE0RUZnUVVvRnBZNzZwNXlvTkRSR3RRcHpWdVI4MVVXUTB3Z2NZR0Ex
-VWRJd1NCdmpDQnU0QVV3NjArcHRZUkFFV0FYRHBYClNvcHQzREVObm5HaGdZQ2tmakI4TVFzd0NR
-WURWUVFHRXdKVlV6RThNRG9HQTFVRUNoTXpTVzUwWlhKdVpYUWdRMjl5Y0c5eVlYUnAKYjI0Z1pt
-OXlJRUZ6YzJsbmJtVmtJRTVoYldWeklHRnVaQ0JPZFcxaVpYSnpNUzh3TFFZRFZRUURFeVpKUTBG
-T1RpQlVjbUZrWlcxaApjbXNnUTJ4bFlYSnBibWRvYjNWelpTQlFhV3h2ZENCRFFZSWdMckFiZXZv
-YWU1MnkzZjZDMnRCMFNuM3A3WEptMFQwMkZvZ3hLQ2ZOCmhYa3dEZ1lEVlIwUEFRSC9CQVFEQWdl
-QU1EUUdBMVVkSHdRdE1Dc3dLYUFub0NXR0kyaDBkSEE2THk5amNtd3VhV05oYm00dWIzSm4KTDNS
-dFkyaGZjR2xzYjNRdVkzSnNNRkVHQTFVZElBUktNRWd3RUFZT0t3WUJCQUdDeVJzQkJZTTdEQW93
-TkFZSUt3WUJCUVVIQWdFdwpLREFtQmdnckJnRUZCUWNDQVJZYWFIUjBjSE02THk5allTNXBZMkZ1
-Ymk1dmNtY3ZjR2xzYjNRd0RRWUpLb1pJaHZjTkFRRUxCUUFECmdnRUJBQXVqWjJJY1IyRFZydGFS
-ckE1OWVOWUNsNHhjc0pNdThEUUNIdjI4ZlRmaS9CaVpZNElyN0Y5a0Z5OTZEN09aOG9MWTV6amYK
-NGRIeEZ3SFBxSDhEaDZKV3N6WHVIVzFaYTNYbWwwUGFIeENXUlMwWG9sOFdzSEhwTnlnak1CWWZK
-MG9kVk04ODVUWjFFbDlTaXVFSApueW5GQmdTbWlGYzk5dVFkL1lEUlp1R3YvQTBIeXY3eVI5dGtM
-RWREM0ExdU5KQlc0UCtISkdwZEtrWUwxUTVyVTcrb0hWUHRNS0tJCjNpRmtVRXNiTzQ1QVZkN3ZQ
-L2ovN0p0QVpQYjZrb09WNWxaaTJIMVJMY2NHd3pkZXpuaEpnZDBOOW9iYjB2bkU0MS9VU1dhZmRX
-UloKVkdrd1B1cVRobDdzQ3R6ckpIOFhZMHhjdW0rY2ZMeDJFQUl3VW5PY2FiND08L2RzOlg1MDlD
-ZXJ0aWZpY2F0ZT48L2RzOlg1MDlEYXRhPjwvZHM6S2V5SW5mbz48L2RzOlNpZ25hdHVyZT48L3Nt
-ZDpzaWduZWRNYXJrPg==
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/revoked/smd/TreatyStatute-Agent-French-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/TreatyStatute-Agent-French-Revoked.smd
deleted file mode 100644
index 1347f29e3..000000000
--- a/core/src/test/resources/google/registry/tmch/revoked/smd/TreatyStatute-Agent-French-Revoked.smd
+++ /dev/null
@@ -1,103 +0,0 @@
-Marks: Essai & évaluation
-smdID: 000000841526319830101-65535
-U-labels: xn--essai---valuation-itb, xn--essai--valuation-hqb, xn--essai-and-valuation-kzb, xn--essai-andvaluation-jwb, xn--essai-valuation-gnb, xn--essaiand-valuation-jwb, xn--essaiandvaluation-itb, xn--essaivaluation-fkb
-notBefore: 2018-05-14T17:43:50.101Z
-notAfter: 2022-08-18T14:46:53.013Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il9jMjYw
-MTRkMy1lMjQyLTQ2MzctYTM5Mi00OTliYjMwNTZlYmMiPjxzbWQ6aWQ+MDAwMDAwODQxNTI2MzE5
-ODMwMTAxLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo0Mzo1MC4xMDFaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0xOFQxNDo0Njo1My4wMTNaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
-cmVhdHlPclN0YXR1dGU+PG1hcms6aWQ+MDAwMTM5MTUwMzA2NzU4ODE1MDMwNjc1ODgtMTwvbWFy
-azppZD48bWFyazptYXJrTmFtZT5Fc3NhaSAmYW1wOyDDqXZhbHVhdGlvbjwvbWFyazptYXJrTmFt
-ZT48bWFyazpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpvcmc+QWdlbmNlIGVuIEZy
-YW5jZTwvbWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpzdHJlZXQ+MTAgQXZlbnVlIFJvdXNzZWF1
-eDwvbWFyazpzdHJlZXQ+PG1hcms6Y2l0eT5WZXJzYWlsbGVzPC9tYXJrOmNpdHk+PG1hcms6cGM+
-MzMwODE8L21hcms6cGM+PG1hcms6Y2M+RlI8L21hcms6Y2M+PC9tYXJrOmFkZHI+PC9tYXJrOmhv
-bGRlcj48bWFyazpjb250YWN0IHR5cGU9ImFnZW50Ij48bWFyazpuYW1lPkZyYW5jIExlYnJ1bjwv
-bWFyazpuYW1lPjxtYXJrOm9yZz5BZ2VuY2UgZW4gRnJhbmNlPC9tYXJrOm9yZz48bWFyazphZGRy
-PjxtYXJrOnN0cmVldD5BdmVudWUgUm91c3NlYXV4IDEwIDwvbWFyazpzdHJlZXQ+PG1hcms6Y2l0
-eT5WZXJzYWlsbGVzPC9tYXJrOmNpdHk+PG1hcms6cGM+MzMwODE8L21hcms6cGM+PG1hcms6Y2M+
-RlI8L21hcms6Y2M+PC9tYXJrOmFkZHI+PG1hcms6dm9pY2U+KzMzLjEyNTc4MTI1MDwvbWFyazp2
-b2ljZT48bWFyazpmYXg+KzMzLjEyNTc4MTI1MTwvbWFyazpmYXg+PG1hcms6ZW1haWw+aW5mb0Bh
-Z2VuY2UtZW4tZnJhbmNlLmZyPC9tYXJrOmVtYWlsPjwvbWFyazpjb250YWN0PjxtYXJrOnByb3Rl
-Y3Rpb24+PG1hcms6Y2M+VVM8L21hcms6Y2M+PG1hcms6cnVsaW5nPkZSPC9tYXJrOnJ1bGluZz48
-L21hcms6cHJvdGVjdGlvbj48bWFyazpsYWJlbD54bi0tZXNzYWktLS12YWx1YXRpb24taXRiPC9t
-YXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1lc3NhaS0tdmFsdWF0aW9uLWhxYjwvbWFyazpsYWJl
-bD48bWFyazpsYWJlbD54bi0tZXNzYWktYW5kLXZhbHVhdGlvbi1remI8L21hcms6bGFiZWw+PG1h
-cms6bGFiZWw+eG4tLWVzc2FpLWFuZHZhbHVhdGlvbi1qd2I8L21hcms6bGFiZWw+PG1hcms6bGFi
-ZWw+eG4tLWVzc2FpLXZhbHVhdGlvbi1nbmI8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLWVz
-c2FpYW5kLXZhbHVhdGlvbi1qd2I8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLWVzc2FpYW5k
-dmFsdWF0aW9uLWl0YjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tZXNzYWl2YWx1YXRpb24t
-ZmtiPC9tYXJrOmxhYmVsPjxtYXJrOmdvb2RzQW5kU2VydmljZXM+Z3VpdGFyPC9tYXJrOmdvb2Rz
-QW5kU2VydmljZXM+PG1hcms6cmVmTnVtPjEyMzQ8L21hcms6cmVmTnVtPjxtYXJrOnByb0RhdGU+
-MjAwMC0wMS0wMVQwMDowMDowMC4wMDBaPC9tYXJrOnByb0RhdGU+PG1hcms6dGl0bGU+Z3VpdGFy
-ZTwvbWFyazp0aXRsZT48bWFyazpleGVjRGF0ZT4yMDEzLTAyLTAyVDAwOjAwOjAwLjAwMFo8L21h
-cms6ZXhlY0RhdGU+PC9tYXJrOnRyZWF0eU9yU3RhdHV0ZT48L21hcms6bWFyaz48ZHM6U2lnbmF0
-dXJlIHhtbG5zOmRzPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjIiBJZD0iX2Rk
-YjEzMjc5LTI4ZDctNGY3My05NmEwLTE5YzNiYmI3NTE3ZiI+PGRzOlNpZ25lZEluZm8+PGRzOkNh
-bm9uaWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEw
-L3htbC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJlTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3
-dy53My5vcmcvMjAwMS8wNC94bWxkc2lnLW1vcmUjcnNhLXNoYTI1NiIvPjxkczpSZWZlcmVuY2Ug
-VVJJPSIjX2MyNjAxNGQzLWUyNDItNDYzNy1hMzkyLTQ5OWJiMzA1NmViYyI+PGRzOlRyYW5zZm9y
-bXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1s
-ZHNpZyNlbnZlbG9wZWQtc2lnbmF0dXJlIi8+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6
-Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6
-RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxlbmMj
-c2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPndaQzhrK1RSVm1XNFJjWXFiL2svS1NoUStRWTJ3ak1o
-MWRoMmRRYitySUE9PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48ZHM6UmVmZXJlbmNl
-IFVSST0iI182YjJiMjg2OS1iMDQzLTQzNWEtOGE3MC01MGU5MTRiZmM0M2IiPjxkczpUcmFuc2Zv
-cm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3ht
-bC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09
-Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1
-ZT42OXRXVGd1RVhxTmZjYkhEUyt0cTFuQVNtWlV5a254UHY5bUVwWHBGcUpzPTwvZHM6RGlnZXN0
-VmFsdWU+PC9kczpSZWZlcmVuY2U+PC9kczpTaWduZWRJbmZvPjxkczpTaWduYXR1cmVWYWx1ZSBJ
-ZD0iXzljMjg4ODQxLTA3MTQtNDY0Yy04NjhiLTAzOTdjNTE1ZGNiYiI+TndMc2x4Z0xpR3RtOU1J
-UlpMMWxGL3RUMUkzM2hNSUJ1RUFOZGp5bHR6WHppU0xscU5wMmJaQkZDd28zTDVLT3YvMnJEd1F0
-elZ6NQoxNnNpS3RLQ0VkYWJiN2xid0NMcU4vcmlPNkc4WUlHY28vRnV6Yjh2dGNQYW9MQXNHcVdL
-OWE3N3M2WXJVQmFmUURhSUxlZm5VYVVrCmh0SmNiV1NuQjJQenVlRmNKaWpEejMzNnF2TGZPWG5K
-ZzdleEgyc1c1OU1XTDFtcUMyY1hsZTBmaUxoMExpYURhbkdaUW94dDdTNVIKc0RvcWo2M3p3czg3
-cnNDYnlNZ2w2RDBCYk1IL1JXUnhHU0ZNejJKNTlmVmVLQmRJNGF0UGVhcUlSNGcvOWpRY0dkVVJB
-cjJ6OXZjeApMcWdQTzYreXVPM0l3cDRvS0ZhVXJGUG9mZU1MZlZXWDJjVkprQT09PC9kczpTaWdu
-YXR1cmVWYWx1ZT48ZHM6S2V5SW5mbyBJZD0iXzZiMmIyODY5LWIwNDMtNDM1YS04YTcwLTUwZTkx
-NGJmYzQzYiI+PGRzOlg1MDlEYXRhPjxkczpYNTA5Q2VydGlmaWNhdGU+TUlJRk96Q0NCQ09nQXdJ
-QkFnSWdMckFiZXZvYWU1MnkzZjZDMnRCMFNuM3A3WEptMFQwMkZvZ3hLQ2ZOaFpjd0RRWUpLb1pJ
-aHZjTgpBUUVMQlFBd2ZERUxNQWtHQTFVRUJoTUNWVk14UERBNkJnTlZCQW9UTTBsdWRHVnlibVYw
-SUVOdmNuQnZjbUYwYVc5dUlHWnZjaUJCCmMzTnBaMjVsWkNCT1lXMWxjeUJoYm1RZ1RuVnRZbVZ5
-Y3pFdk1DMEdBMVVFQXhNbVNVTkJUazRnVkhKaFpHVnRZWEpySUVOc1pXRnkKYVc1bmFHOTFjMlVn
-VUdsc2IzUWdRMEV3SGhjTk1UZ3dNakk0TURBd01EQXdXaGNOTWpNd016QXhNak0xT1RVNVdqQ0Jq
-ekVMTUFrRwpBMVVFQmhNQ1FrVXhJREFlQmdOVkJBZ1RGMEp5ZFhOelpXeHpMVU5oY0dsMFlXd2dV
-bVZuYVc5dU1SRXdEd1lEVlFRSEV3aENjblZ6CmMyVnNjekVSTUE4R0ExVUVDaE1JUkdWc2IybDBk
-R1V4T0RBMkJnTlZCQU1UTDBsRFFVNU9JRlJOUTBnZ1FYVjBhRzl5YVhwbFpDQlUKY21Ga1pXMWhj
-bXNnVUdsc2IzUWdWbUZzYVdSaGRHOXlNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1J
-SUJDZ0tDQVFFQQp4bHAzS3BZSFgzV3lBc0ZoU2szTHdXZm5HbHhuVURGcUZaQTNVb3VNWWovWGln
-Yk1rTmVFWElqbGtST0tUNE9QR2ZSeC9MQXlSbFFRCmpDTXY0cWhia2NYMXA3YXI2M2ZscTRTWk5W
-Y2wxNWw3aDB1VDU4RnpTZm5sejB1NXJrSGZKSW1ENDMrbWFQLzhndjM2RlIyN2pXOFIKOXdZNGhr
-K1dzNElCMGlGU2Q4U1h2MUtyOHcvSm1NUVNEa2l1RytSZklpdWJ3US9meTdFa2o1UVdoUFp3K21N
-eE5LbkhVTHkzeFl6MgpMd1ZmZnRqd1V1ZWFjdnFOUkNrTVhsQ2xPQURxZlQ4b1Nab2VEWGVoSHZs
-UHNMQ2VtR0JvVEt1cnNrSVM2OUYweVBFSDVnemUwSCtmCjhGUk9zSW9LU3NWUTM0QjRTL2pvRTY3
-bnBzSlBUZEtzTlBKVHlRSURBUUFCbzRJQmt6Q0NBWTh3REFZRFZSMFRBUUgvQkFJd0FEQWQKQmdO
-VkhRNEVGZ1FVb0ZwWTc2cDV5b05EUkd0UXB6VnVSODFVV1Ewd2djWUdBMVVkSXdTQnZqQ0J1NEFV
-dzYwK3B0WVJBRVdBWERwWApTb3B0M0RFTm5uR2hnWUNrZmpCOE1Rc3dDUVlEVlFRR0V3SlZVekU4
-TURvR0ExVUVDaE16U1c1MFpYSnVaWFFnUTI5eWNHOXlZWFJwCmIyNGdabTl5SUVGemMybG5ibVZr
-SUU1aGJXVnpJR0Z1WkNCT2RXMWlaWEp6TVM4d0xRWURWUVFERXlaSlEwRk9UaUJVY21Ga1pXMWgK
-Y21zZ1EyeGxZWEpwYm1kb2IzVnpaU0JRYVd4dmRDQkRRWUlnTHJBYmV2b2FlNTJ5M2Y2QzJ0QjBT
-bjNwN1hKbTBUMDJGb2d4S0NmTgpoWGt3RGdZRFZSMFBBUUgvQkFRREFnZUFNRFFHQTFVZEh3UXRN
-Q3N3S2FBbm9DV0dJMmgwZEhBNkx5OWpjbXd1YVdOaGJtNHViM0puCkwzUnRZMmhmY0dsc2IzUXVZ
-M0pzTUZFR0ExVWRJQVJLTUVnd0VBWU9Ld1lCQkFHQ3lSc0JCWU03REFvd05BWUlLd1lCQlFVSEFn
-RXcKS0RBbUJnZ3JCZ0VGQlFjQ0FSWWFhSFIwY0hNNkx5OWpZUzVwWTJGdWJpNXZjbWN2Y0dsc2Iz
-UXdEUVlKS29aSWh2Y05BUUVMQlFBRApnZ0VCQUF1aloySWNSMkRWcnRhUnJBNTllTllDbDR4Y3NK
-TXU4RFFDSHYyOGZUZmkvQmlaWTRJcjdGOWtGeTk2RDdPWjhvTFk1empmCjRkSHhGd0hQcUg4RGg2
-Sldzelh1SFcxWmEzWG1sMFBhSHhDV1JTMFhvbDhXc0hIcE55Z2pNQllmSjBvZFZNODg1VFoxRWw5
-U2l1RUgKbnluRkJnU21pRmM5OXVRZC9ZRFJadUd2L0EwSHl2N3lSOXRrTEVkRDNBMXVOSkJXNFAr
-SEpHcGRLa1lMMVE1clU3K29IVlB0TUtLSQozaUZrVUVzYk80NUFWZDd2UC9qLzdKdEFaUGI2a29P
-VjVsWmkySDFSTGNjR3d6ZGV6bmhKZ2QwTjlvYmIwdm5FNDEvVVNXYWZkV1JaClZHa3dQdXFUaGw3
-c0N0enJKSDhYWTB4Y3VtK2NmTHgyRUFJd1VuT2NhYjQ9PC9kczpYNTA5Q2VydGlmaWNhdGU+PC9k
-czpYNTA5RGF0YT48L2RzOktleUluZm8+PC9kczpTaWduYXR1cmU+PC9zbWQ6c2lnbmVkTWFyaz4=
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/revoked/smd/TreatyStatute-Agent-Russian-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/TreatyStatute-Agent-Russian-Revoked.smd
deleted file mode 100644
index 41caffddb..000000000
--- a/core/src/test/resources/google/registry/tmch/revoked/smd/TreatyStatute-Agent-Russian-Revoked.smd
+++ /dev/null
@@ -1,105 +0,0 @@
-Marks: Проверьте & запросы
-smdID: 000000751526319812955-65535
-U-labels: xn------8cdgsat0dibjddhrh6oh, xn-----8kcfpaq4chbiddgqh6nh, xn---and--8veiyaz2ekblddjth6qh, xn---and-83dhvaw6djbkddish6ph, xn----8sbeman8bgbhddfph6mh, xn--and--83dhvaw6djbkddish6ph, xn--and-8cdgsat0dibjddhrh6oh, xn--80adjak2bfbgddeoh6lh
-notBefore: 2018-05-14T17:43:32.955Z
-notAfter: 2022-08-18T14:16:55.554Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il9mM2U4
-NzFiNi04Y2UyLTQ2ZmItYWUwYi04NjMxMzBlOGIyNTUiPjxzbWQ6aWQ+MDAwMDAwNzUxNTI2MzE5
-ODEyOTU1LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo0MzozMi45NTVaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0xOFQxNDoxNjo1NS41NTRaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
-cmVhdHlPclN0YXR1dGU+PG1hcms6aWQ+MDAwMTQxMTUwMzA2NTc3NDE1MDMwNjU3NzQtMTwvbWFy
-azppZD48bWFyazptYXJrTmFtZT7Qn9GA0L7QstC10YDRjNGC0LUgJmFtcDsg0LfQsNC/0YDQvtGB
-0Ys8L21hcms6bWFya05hbWU+PG1hcms6aG9sZGVyIGVudGl0bGVtZW50PSJvd25lciI+PG1hcms6
-b3JnPtCQ0LPQtdC90YLRgdGC0LLQvjwvbWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpzdHJlZXQ+
-0J/RgNC+0YHQv9C10LrRgiDQktC10YDQvdCw0LTRgdC60L7Qs9C+IDE1PC9tYXJrOnN0cmVldD48
-bWFyazpjaXR5PtCc0L7RgdC60LLQsDwvbWFyazpjaXR5PjxtYXJrOnBjPjExNzQ4NTwvbWFyazpw
-Yz48bWFyazpjYz5SVTwvbWFyazpjYz48L21hcms6YWRkcj48L21hcms6aG9sZGVyPjxtYXJrOmNv
-bnRhY3QgdHlwZT0iYWdlbnQiPjxtYXJrOm5hbWU+0J3QsNGC0LDQu9GM0Y8g0JDQvdGC0L7QvdC+
-0LLQsDwvbWFyazpuYW1lPjxtYXJrOm9yZz7QkNCz0LXQvdGC0YHRgtCy0L48L21hcms6b3JnPjxt
-YXJrOmFkZHI+PG1hcms6c3RyZWV0PtCf0YDQvtGB0L/QtdC60YIg0JLQtdGA0L3QsNC00YHQutC+
-0LPQviAxNTwvbWFyazpzdHJlZXQ+PG1hcms6Y2l0eT7QnNC+0YHQutCy0LA8L21hcms6Y2l0eT48
-bWFyazpwYz4xMTc0ODU8L21hcms6cGM+PG1hcms6Y2M+UlU8L21hcms6Y2M+PC9tYXJrOmFkZHI+
-PG1hcms6dm9pY2U+KzcuOTE4ODIyMTY3NDwvbWFyazp2b2ljZT48bWFyazpmYXg+KzcuOTE4ODIy
-MTY3MzwvbWFyazpmYXg+PG1hcms6ZW1haWw+aW5mb0BhZ2VuY3kucnU8L21hcms6ZW1haWw+PC9t
-YXJrOmNvbnRhY3Q+PG1hcms6cHJvdGVjdGlvbj48bWFyazpjYz5VUzwvbWFyazpjYz48bWFyazpy
-dWxpbmc+UlU8L21hcms6cnVsaW5nPjwvbWFyazpwcm90ZWN0aW9uPjxtYXJrOmxhYmVsPnhuLS0t
-LS0tOGNkZ3NhdDBkaWJqZGRocmg2b2g8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLS0tLThr
-Y2ZwYXE0Y2hiaWRkZ3FoNm5oPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS0tYW5kLS04dmVp
-eWF6MmVrYmxkZGp0aDZxaDwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tLWFuZC04M2RodmF3
-NmRqYmtkZGlzaDZwaDwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tLS04c2JlbWFuOGJnYmhk
-ZGZwaDZtaDwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tYW5kLS04M2RodmF3NmRqYmtkZGlz
-aDZwaDwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tYW5kLThjZGdzYXQwZGliamRkaHJoNm9o
-PC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS04MGFkamFrMmJmYmdkZGVvaDZsaDwvbWFyazps
-YWJlbD48bWFyazpnb29kc0FuZFNlcnZpY2VzPtCz0LjRgtCw0YDQsDwvbWFyazpnb29kc0FuZFNl
-cnZpY2VzPjxtYXJrOnJlZk51bT4xMjM0PC9tYXJrOnJlZk51bT48bWFyazpwcm9EYXRlPjIwMDAt
-MDEtMDFUMDA6MDA6MDAuMDAwWjwvbWFyazpwcm9EYXRlPjxtYXJrOnRpdGxlPtCz0LjRgtCw0YDQ
-sDwvbWFyazp0aXRsZT48bWFyazpleGVjRGF0ZT4yMDEzLTAyLTAyVDAwOjAwOjAwLjAwMFo8L21h
-cms6ZXhlY0RhdGU+PC9tYXJrOnRyZWF0eU9yU3RhdHV0ZT48L21hcms6bWFyaz48ZHM6U2lnbmF0
-dXJlIHhtbG5zOmRzPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjIiBJZD0iXzBk
-ZWYwMTg0LWYzODctNDE2My04ZTczLWE5MmFmMzk1ODVjNSI+PGRzOlNpZ25lZEluZm8+PGRzOkNh
-bm9uaWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEw
-L3htbC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJlTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3
-dy53My5vcmcvMjAwMS8wNC94bWxkc2lnLW1vcmUjcnNhLXNoYTI1NiIvPjxkczpSZWZlcmVuY2Ug
-VVJJPSIjX2YzZTg3MWI2LThjZTItNDZmYi1hZTBiLTg2MzEzMGU4YjI1NSI+PGRzOlRyYW5zZm9y
-bXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1s
-ZHNpZyNlbnZlbG9wZWQtc2lnbmF0dXJlIi8+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6
-Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6
-RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxlbmMj
-c2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPkRiR252dGZ6RE1WeXQvcjVvb1IxRVIrVUF2Q2dTeTdL
-Z3ZpZUt5Ti9xWGs9PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48ZHM6UmVmZXJlbmNl
-IFVSST0iI19hZGY0ZWU3Yi0wYmZiLTRjOWQtYTZmZC02OTJiMjMzOWY2NDUiPjxkczpUcmFuc2Zv
-cm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3ht
-bC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09
-Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1
-ZT54STRNSm9wNXptaUQwS3E3RGZkT3h0VzB4UTJZdkRWRG5sOWVpN1Z4RjRzPTwvZHM6RGlnZXN0
-VmFsdWU+PC9kczpSZWZlcmVuY2U+PC9kczpTaWduZWRJbmZvPjxkczpTaWduYXR1cmVWYWx1ZSBJ
-ZD0iX2JjMTI2MTI4LWUwOGEtNDg5MS05MDgxLWExMGQ3NDc4YWVjNiI+ckpMKzhpMnB3WGtPankr
-cDI5ako0THpkZmM4OU10dGpGeWl3T0tVVkF3eUVENDdOOUFYVWkzUVd4WnVCRUlhVEtKRXRUazZN
-bEplOAp3bGpCMklUbVhncWNkT1F2cDduVDBoUDBLUk1PRU5BOE5BeGpaczU0cU1BSld1dkR6cEwv
-Njk2N0dVNndnTmJmcERJOXhJaHd2bU9WCm04Q2M1TzlLQnBmc2lTWW9MYjYwOTNnSTZtU1hyaUt1
-Ukl0YkU0MDcrK0VPTGpkaFo1QzAwdGd4ZEhSV3J5dWhSSURyQmVmdDVtRisKQ3RFeTdOOFE3N1NZ
-TjFEeWxDUjEyYmlYNjVvS1YxdVp0ZnpodEVvZ3FJTzZCNVl0dUFvU2wvRmZ6S0szTkEvdlRsQ251
-ME45S1NncgpsMEM2NnVuN0xzbm1rTDJYM285TXlsWUJWNTc3a3VPZGRod3ZTZz09PC9kczpTaWdu
-YXR1cmVWYWx1ZT48ZHM6S2V5SW5mbyBJZD0iX2FkZjRlZTdiLTBiZmItNGM5ZC1hNmZkLTY5MmIy
-MzM5ZjY0NSI+PGRzOlg1MDlEYXRhPjxkczpYNTA5Q2VydGlmaWNhdGU+TUlJRk96Q0NCQ09nQXdJ
-QkFnSWdMckFiZXZvYWU1MnkzZjZDMnRCMFNuM3A3WEptMFQwMkZvZ3hLQ2ZOaFpjd0RRWUpLb1pJ
-aHZjTgpBUUVMQlFBd2ZERUxNQWtHQTFVRUJoTUNWVk14UERBNkJnTlZCQW9UTTBsdWRHVnlibVYw
-SUVOdmNuQnZjbUYwYVc5dUlHWnZjaUJCCmMzTnBaMjVsWkNCT1lXMWxjeUJoYm1RZ1RuVnRZbVZ5
-Y3pFdk1DMEdBMVVFQXhNbVNVTkJUazRnVkhKaFpHVnRZWEpySUVOc1pXRnkKYVc1bmFHOTFjMlVn
-VUdsc2IzUWdRMEV3SGhjTk1UZ3dNakk0TURBd01EQXdXaGNOTWpNd016QXhNak0xT1RVNVdqQ0Jq
-ekVMTUFrRwpBMVVFQmhNQ1FrVXhJREFlQmdOVkJBZ1RGMEp5ZFhOelpXeHpMVU5oY0dsMFlXd2dV
-bVZuYVc5dU1SRXdEd1lEVlFRSEV3aENjblZ6CmMyVnNjekVSTUE4R0ExVUVDaE1JUkdWc2IybDBk
-R1V4T0RBMkJnTlZCQU1UTDBsRFFVNU9JRlJOUTBnZ1FYVjBhRzl5YVhwbFpDQlUKY21Ga1pXMWhj
-bXNnVUdsc2IzUWdWbUZzYVdSaGRHOXlNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1J
-SUJDZ0tDQVFFQQp4bHAzS3BZSFgzV3lBc0ZoU2szTHdXZm5HbHhuVURGcUZaQTNVb3VNWWovWGln
-Yk1rTmVFWElqbGtST0tUNE9QR2ZSeC9MQXlSbFFRCmpDTXY0cWhia2NYMXA3YXI2M2ZscTRTWk5W
-Y2wxNWw3aDB1VDU4RnpTZm5sejB1NXJrSGZKSW1ENDMrbWFQLzhndjM2RlIyN2pXOFIKOXdZNGhr
-K1dzNElCMGlGU2Q4U1h2MUtyOHcvSm1NUVNEa2l1RytSZklpdWJ3US9meTdFa2o1UVdoUFp3K21N
-eE5LbkhVTHkzeFl6MgpMd1ZmZnRqd1V1ZWFjdnFOUkNrTVhsQ2xPQURxZlQ4b1Nab2VEWGVoSHZs
-UHNMQ2VtR0JvVEt1cnNrSVM2OUYweVBFSDVnemUwSCtmCjhGUk9zSW9LU3NWUTM0QjRTL2pvRTY3
-bnBzSlBUZEtzTlBKVHlRSURBUUFCbzRJQmt6Q0NBWTh3REFZRFZSMFRBUUgvQkFJd0FEQWQKQmdO
-VkhRNEVGZ1FVb0ZwWTc2cDV5b05EUkd0UXB6VnVSODFVV1Ewd2djWUdBMVVkSXdTQnZqQ0J1NEFV
-dzYwK3B0WVJBRVdBWERwWApTb3B0M0RFTm5uR2hnWUNrZmpCOE1Rc3dDUVlEVlFRR0V3SlZVekU4
-TURvR0ExVUVDaE16U1c1MFpYSnVaWFFnUTI5eWNHOXlZWFJwCmIyNGdabTl5SUVGemMybG5ibVZr
-SUU1aGJXVnpJR0Z1WkNCT2RXMWlaWEp6TVM4d0xRWURWUVFERXlaSlEwRk9UaUJVY21Ga1pXMWgK
-Y21zZ1EyeGxZWEpwYm1kb2IzVnpaU0JRYVd4dmRDQkRRWUlnTHJBYmV2b2FlNTJ5M2Y2QzJ0QjBT
-bjNwN1hKbTBUMDJGb2d4S0NmTgpoWGt3RGdZRFZSMFBBUUgvQkFRREFnZUFNRFFHQTFVZEh3UXRN
-Q3N3S2FBbm9DV0dJMmgwZEhBNkx5OWpjbXd1YVdOaGJtNHViM0puCkwzUnRZMmhmY0dsc2IzUXVZ
-M0pzTUZFR0ExVWRJQVJLTUVnd0VBWU9Ld1lCQkFHQ3lSc0JCWU03REFvd05BWUlLd1lCQlFVSEFn
-RXcKS0RBbUJnZ3JCZ0VGQlFjQ0FSWWFhSFIwY0hNNkx5OWpZUzVwWTJGdWJpNXZjbWN2Y0dsc2Iz
-UXdEUVlKS29aSWh2Y05BUUVMQlFBRApnZ0VCQUF1aloySWNSMkRWcnRhUnJBNTllTllDbDR4Y3NK
-TXU4RFFDSHYyOGZUZmkvQmlaWTRJcjdGOWtGeTk2RDdPWjhvTFk1empmCjRkSHhGd0hQcUg4RGg2
-Sldzelh1SFcxWmEzWG1sMFBhSHhDV1JTMFhvbDhXc0hIcE55Z2pNQllmSjBvZFZNODg1VFoxRWw5
-U2l1RUgKbnluRkJnU21pRmM5OXVRZC9ZRFJadUd2L0EwSHl2N3lSOXRrTEVkRDNBMXVOSkJXNFAr
-SEpHcGRLa1lMMVE1clU3K29IVlB0TUtLSQozaUZrVUVzYk80NUFWZDd2UC9qLzdKdEFaUGI2a29P
-VjVsWmkySDFSTGNjR3d6ZGV6bmhKZ2QwTjlvYmIwdm5FNDEvVVNXYWZkV1JaClZHa3dQdXFUaGw3
-c0N0enJKSDhYWTB4Y3VtK2NmTHgyRUFJd1VuT2NhYjQ9PC9kczpYNTA5Q2VydGlmaWNhdGU+PC9k
-czpYNTA5RGF0YT48L2RzOktleUluZm8+PC9kczpTaWduYXR1cmU+PC9zbWQ6c2lnbmVkTWFyaz4=
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/revoked/smd/TreatyStatute-Holder-Arab-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/TreatyStatute-Holder-Arab-Revoked.smd
deleted file mode 100644
index 2a27b0326..000000000
--- a/core/src/test/resources/google/registry/tmch/revoked/smd/TreatyStatute-Holder-Arab-Revoked.smd
+++ /dev/null
@@ -1,97 +0,0 @@
-Marks: الاختبار & لتقييم
-smdID: 000000921526319841504-65535
-U-labels: xn------nzeaagpf7azb2ppajr3fa, xn-----btdaafne4a7azpoaiq8ea, xn----ymcaaeld1a4a6onahp3ea, xn--mgbaadjcy1a8mmago8da
-notBefore: 2018-05-14T17:44:01.504Z
-notAfter: 2022-08-21T08:59:34.305Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il9iZWM3
-ZWM2MC1mMTY3LTQ0MjctOWIyNi00MjA5ZDBkMjBkMmIiPjxzbWQ6aWQ+MDAwMDAwOTIxNTI2MzE5
-ODQxNTA0LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo0NDowMS41MDRaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0yMVQwODo1OTozNC4zMDVaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
-cmVhdHlPclN0YXR1dGU+PG1hcms6aWQ+MDAwMTQyMTUwMzMwNTgwODE1MDMzMDU4MDgtMTwvbWFy
-azppZD48bWFyazptYXJrTmFtZT7Yp9mE2KfYrtiq2KjYp9ixICZhbXA7INmE2KrZgtmK2YrZhTwv
-bWFyazptYXJrTmFtZT48bWFyazpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpuYW1l
-PtmF2YfZhtiv2LMg2KfZhNmF2LnZhNmI2YXYp9iq2YrYqTwvbWFyazpuYW1lPjxtYXJrOm9yZz7Y
-p9iu2KrYqNin2LE8L21hcms6b3JnPjxtYXJrOmFkZHI+PG1hcms6c3RyZWV0Ptis2LnZgdixINin
-2KjZhiDYs9mK2YbYp9ihIDc1PC9tYXJrOnN0cmVldD48bWFyazpjaXR5PtmF2YPZhtin2LM8L21h
-cms6Y2l0eT48bWFyazpwYz4yOTAwPC9tYXJrOnBjPjxtYXJrOmNjPk1BPC9tYXJrOmNjPjwvbWFy
-azphZGRyPjxtYXJrOnZvaWNlPisyMTIuNTIyNTM5MDQwPC9tYXJrOnZvaWNlPjxtYXJrOmZheD4r
-MjEyLjUyMjUzOTA0MTwvbWFyazpmYXg+PG1hcms6ZW1haWw+aW5mb0BleGFtcGxlLmV4YW1wbGU8
-L21hcms6ZW1haWw+PC9tYXJrOmhvbGRlcj48bWFyazpwcm90ZWN0aW9uPjxtYXJrOmNjPk1BPC9t
-YXJrOmNjPjxtYXJrOnJ1bGluZz5NQTwvbWFyazpydWxpbmc+PC9tYXJrOnByb3RlY3Rpb24+PG1h
-cms6bGFiZWw+eG4tLS0tLS1uemVhYWdwZjdhemIycHBhanIzZmE8L21hcms6bGFiZWw+PG1hcms6
-bGFiZWw+eG4tLS0tLWJ0ZGFhZm5lNGE3YXpwb2FpcThlYTwvbWFyazpsYWJlbD48bWFyazpsYWJl
-bD54bi0tLS15bWNhYWVsZDFhNGE2b25haHAzZWE8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4t
-LW1nYmFhZGpjeTFhOG1tYWdvOGRhPC9tYXJrOmxhYmVsPjxtYXJrOmdvb2RzQW5kU2VydmljZXM+
-2LrZitiq2KfYsTwvbWFyazpnb29kc0FuZFNlcnZpY2VzPjxtYXJrOnJlZk51bT4xMjM0PC9tYXJr
-OnJlZk51bT48bWFyazpwcm9EYXRlPjIwMTMtMDItMDJUMDA6MDA6MDAuMDAwWjwvbWFyazpwcm9E
-YXRlPjxtYXJrOnRpdGxlPlRlc3QgVHJlYXR5PC9tYXJrOnRpdGxlPjxtYXJrOmV4ZWNEYXRlPjIw
-MTMtMDItMDJUMDA6MDA6MDAuMDAwWjwvbWFyazpleGVjRGF0ZT48L21hcms6dHJlYXR5T3JTdGF0
-dXRlPjwvbWFyazptYXJrPjxkczpTaWduYXR1cmUgeG1sbnM6ZHM9Imh0dHA6Ly93d3cudzMub3Jn
-LzIwMDAvMDkveG1sZHNpZyMiIElkPSJfMzc0YzA1ZDgtYWExMi00NTI5LWEwOTAtNjk0ODkyZTYw
-MzVhIj48ZHM6U2lnbmVkSW5mbz48ZHM6Q2Fub25pY2FsaXphdGlvbk1ldGhvZCBBbGdvcml0aG09
-Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjxkczpTaWduYXR1cmVN
-ZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGRzaWctbW9yZSNy
-c2Etc2hhMjU2Ii8+PGRzOlJlZmVyZW5jZSBVUkk9IiNfYmVjN2VjNjAtZjE2Ny00NDI3LTliMjYt
-NDIwOWQwZDIwZDJiIj48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0
-cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48ZHM6
-VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMx
-NG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8v
-d3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+UVRZakx0
-cldqcVhWaTFKYjAzMkZmcFpQQ0MzYUdBdFYrWDBUWlpwZkhXMD08L2RzOkRpZ2VzdFZhbHVlPjwv
-ZHM6UmVmZXJlbmNlPjxkczpSZWZlcmVuY2UgVVJJPSIjXzFjN2ZhYTI0LTJiMDQtNDQ0Yy04ZDIx
-LThiZWE1NjgwZmUxOSI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0
-dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48
-ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxl
-bmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPmhXMG51V3ZUV1pmTGdJT0FGVnAyemo2VjBnYmUv
-eUpCYXBpTDZDcW1jOGc9PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48L2RzOlNpZ25l
-ZEluZm8+PGRzOlNpZ25hdHVyZVZhbHVlIElkPSJfMzM0YjRhZjktYWRkOS00YjlkLWE1OTMtZDhm
-YjJmM2ExMjYzIj5zcyszWnZxdEFudStEOVJIMndNaHVJcjlyMVo2amRCY0RTSlRRR0ZzTWZvdU1D
-L3UrL2VYVkZPTE5BR04rYXJFVklnOVBaN2I1TFRhCjY4Uk0xUmhhSFJGejFyVjZ6UzRtcitFazF4
-TnFNczQzbUhPWUFBMFVYcmJsN0JWUVFtSFRiSlpCcmR6aFZnbjNQMHJvNXo1MG5QMzYKVlgzNWx1
-Qll1bFRFQjV3Y05rcXg5eGw0WFhrL0RLM3hzM0VESGlVSm9rN1gxUVdZNkYxZDhiZjVZMDMrQ2d0
-VGh1K3FFbm1LWml3cQoyS1JFU0VYNEFUbTBxaE8yd0IwNFVGYkF1NXZHaldvWnFXK1RuYXFuQS9Z
-bWM3MldSNmZPWkYwZFRqaXRrdGlRK3dlOU1oVFRxMExBCktFV3g2eW94ZU1PYlNKV3h2NnB6c083
-ZVFFNTEyc3p0ZmRWQXF3PT08L2RzOlNpZ25hdHVyZVZhbHVlPjxkczpLZXlJbmZvIElkPSJfMWM3
-ZmFhMjQtMmIwNC00NDRjLThkMjEtOGJlYTU2ODBmZTE5Ij48ZHM6WDUwOURhdGE+PGRzOlg1MDlD
-ZXJ0aWZpY2F0ZT5NSUlGT3pDQ0JDT2dBd0lCQWdJZ0xyQWJldm9hZTUyeTNmNkMydEIwU24zcDdY
-Sm0wVDAyRm9neEtDZk5oWmN3RFFZSktvWklodmNOCkFRRUxCUUF3ZkRFTE1Ba0dBMVVFQmhNQ1ZW
-TXhQREE2QmdOVkJBb1RNMGx1ZEdWeWJtVjBJRU52Y25CdmNtRjBhVzl1SUdadmNpQkIKYzNOcFoy
-NWxaQ0JPWVcxbGN5QmhibVFnVG5WdFltVnljekV2TUMwR0ExVUVBeE1tU1VOQlRrNGdWSEpoWkdW
-dFlYSnJJRU5zWldGeQphVzVuYUc5MWMyVWdVR2xzYjNRZ1EwRXdIaGNOTVRnd01qSTRNREF3TURB
-d1doY05Nak13TXpBeE1qTTFPVFU1V2pDQmp6RUxNQWtHCkExVUVCaE1DUWtVeElEQWVCZ05WQkFn
-VEYwSnlkWE56Wld4ekxVTmhjR2wwWVd3Z1VtVm5hVzl1TVJFd0R3WURWUVFIRXdoQ2NuVnoKYzJW
-c2N6RVJNQThHQTFVRUNoTUlSR1ZzYjJsMGRHVXhPREEyQmdOVkJBTVRMMGxEUVU1T0lGUk5RMGdn
-UVhWMGFHOXlhWHBsWkNCVQpjbUZrWlcxaGNtc2dVR2xzYjNRZ1ZtRnNhV1JoZEc5eU1JSUJJakFO
-QmdrcWhraUc5dzBCQVFFRkFBT0NBUThBTUlJQkNnS0NBUUVBCnhscDNLcFlIWDNXeUFzRmhTazNM
-d1dmbkdseG5VREZxRlpBM1VvdU1Zai9YaWdiTWtOZUVYSWpsa1JPS1Q0T1BHZlJ4L0xBeVJsUVEK
-akNNdjRxaGJrY1gxcDdhcjYzZmxxNFNaTlZjbDE1bDdoMHVUNThGelNmbmx6MHU1cmtIZkpJbUQ0
-MyttYVAvOGd2MzZGUjI3alc4Ugo5d1k0aGsrV3M0SUIwaUZTZDhTWHYxS3I4dy9KbU1RU0RraXVH
-K1JmSWl1YndRL2Z5N0VrajVRV2hQWncrbU14TktuSFVMeTN4WXoyCkx3VmZmdGp3VXVlYWN2cU5S
-Q2tNWGxDbE9BRHFmVDhvU1pvZURYZWhIdmxQc0xDZW1HQm9US3Vyc2tJUzY5RjB5UEVINWd6ZTBI
-K2YKOEZST3NJb0tTc1ZRMzRCNFMvam9FNjducHNKUFRkS3NOUEpUeVFJREFRQUJvNElCa3pDQ0FZ
-OHdEQVlEVlIwVEFRSC9CQUl3QURBZApCZ05WSFE0RUZnUVVvRnBZNzZwNXlvTkRSR3RRcHpWdVI4
-MVVXUTB3Z2NZR0ExVWRJd1NCdmpDQnU0QVV3NjArcHRZUkFFV0FYRHBYClNvcHQzREVObm5HaGdZ
-Q2tmakI4TVFzd0NRWURWUVFHRXdKVlV6RThNRG9HQTFVRUNoTXpTVzUwWlhKdVpYUWdRMjl5Y0c5
-eVlYUnAKYjI0Z1ptOXlJRUZ6YzJsbmJtVmtJRTVoYldWeklHRnVaQ0JPZFcxaVpYSnpNUzh3TFFZ
-RFZRUURFeVpKUTBGT1RpQlVjbUZrWlcxaApjbXNnUTJ4bFlYSnBibWRvYjNWelpTQlFhV3h2ZENC
-RFFZSWdMckFiZXZvYWU1MnkzZjZDMnRCMFNuM3A3WEptMFQwMkZvZ3hLQ2ZOCmhYa3dEZ1lEVlIw
-UEFRSC9CQVFEQWdlQU1EUUdBMVVkSHdRdE1Dc3dLYUFub0NXR0kyaDBkSEE2THk5amNtd3VhV05o
-Ym00dWIzSm4KTDNSdFkyaGZjR2xzYjNRdVkzSnNNRkVHQTFVZElBUktNRWd3RUFZT0t3WUJCQUdD
-eVJzQkJZTTdEQW93TkFZSUt3WUJCUVVIQWdFdwpLREFtQmdnckJnRUZCUWNDQVJZYWFIUjBjSE02
-THk5allTNXBZMkZ1Ymk1dmNtY3ZjR2xzYjNRd0RRWUpLb1pJaHZjTkFRRUxCUUFECmdnRUJBQXVq
-WjJJY1IyRFZydGFSckE1OWVOWUNsNHhjc0pNdThEUUNIdjI4ZlRmaS9CaVpZNElyN0Y5a0Z5OTZE
-N09aOG9MWTV6amYKNGRIeEZ3SFBxSDhEaDZKV3N6WHVIVzFaYTNYbWwwUGFIeENXUlMwWG9sOFdz
-SEhwTnlnak1CWWZKMG9kVk04ODVUWjFFbDlTaXVFSApueW5GQmdTbWlGYzk5dVFkL1lEUlp1R3Yv
-QTBIeXY3eVI5dGtMRWREM0ExdU5KQlc0UCtISkdwZEtrWUwxUTVyVTcrb0hWUHRNS0tJCjNpRmtV
-RXNiTzQ1QVZkN3ZQL2ovN0p0QVpQYjZrb09WNWxaaTJIMVJMY2NHd3pkZXpuaEpnZDBOOW9iYjB2
-bkU0MS9VU1dhZmRXUloKVkdrd1B1cVRobDdzQ3R6ckpIOFhZMHhjdW0rY2ZMeDJFQUl3VW5PY2Fi
-ND08L2RzOlg1MDlDZXJ0aWZpY2F0ZT48L2RzOlg1MDlEYXRhPjwvZHM6S2V5SW5mbz48L2RzOlNp
-Z25hdHVyZT48L3NtZDpzaWduZWRNYXJrPg==
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/revoked/smd/TreatyStatute-Holder-Chinese-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/TreatyStatute-Holder-Chinese-Revoked.smd
deleted file mode 100644
index 2fabc5fec..000000000
--- a/core/src/test/resources/google/registry/tmch/revoked/smd/TreatyStatute-Holder-Chinese-Revoked.smd
+++ /dev/null
@@ -1,95 +0,0 @@
-Marks: 错误&证明
-smdID: 000000721526319807240-65535
-U-labels: xn----wp6bo72ihfa346b, xn--and-k58f177n1hah08c, xn--2hv125f6d788a
-notBefore: 2018-05-14T17:43:27.240Z
-notAfter: 2022-08-21T08:12:01.925Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il8wZDZk
-MjUzOC0wMjNkLTQwYzAtYmNjYS04NDRhNGM5MTE5ZTYiPjxzbWQ6aWQ+MDAwMDAwNzIxNTI2MzE5
-ODA3MjQwLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo0MzoyNy4yNDBaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0yMVQwODoxMjowMS45MjVaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
-cmVhdHlPclN0YXR1dGU+PG1hcms6aWQ+MDAwMTQ1MTUwMzA2NDk2NTE1MDMwNjQ5NjUtMTwvbWFy
-azppZD48bWFyazptYXJrTmFtZT7plJnor68mYW1wO+ivgeaYjjwvbWFyazptYXJrTmFtZT48bWFy
-azpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpuYW1lPuadjuWwj+aWuTwvbWFyazpu
-YW1lPjxtYXJrOm9yZz7mtYvor5U8L21hcms6b3JnPjxtYXJrOmFkZHI+PG1hcms6c3RyZWV0Pumm
-mea4r+S4nOi3rzblj7fvvIw15Y+35qW877yMOOWPt+WupCA8L21hcms6c3RyZWV0PjxtYXJrOmNp
-dHk+6Z2S5bKb5biCPC9tYXJrOmNpdHk+PG1hcms6cGM+MTAwMDwvbWFyazpwYz48bWFyazpjYz5D
-TjwvbWFyazpjYz48L21hcms6YWRkcj48bWFyazp2b2ljZT4rODYuMTA4NDY1NzE3MzwvbWFyazp2
-b2ljZT48bWFyazpmYXg+Kzg2LjEwODQ2NTcxNzM8L21hcms6ZmF4PjxtYXJrOmVtYWlsPmluZm9A
-ZXhhbXBsZS5leGFtcGxlPC9tYXJrOmVtYWlsPjwvbWFyazpob2xkZXI+PG1hcms6cHJvdGVjdGlv
-bj48bWFyazpjYz5VUzwvbWFyazpjYz48bWFyazpydWxpbmc+Q048L21hcms6cnVsaW5nPjwvbWFy
-azpwcm90ZWN0aW9uPjxtYXJrOmxhYmVsPnhuLS0tLXdwNmJvNzJpaGZhMzQ2YjwvbWFyazpsYWJl
-bD48bWFyazpsYWJlbD54bi0tYW5kLWs1OGYxNzduMWhhaDA4YzwvbWFyazpsYWJlbD48bWFyazps
-YWJlbD54bi0tMmh2MTI1ZjZkNzg4YTwvbWFyazpsYWJlbD48bWFyazpnb29kc0FuZFNlcnZpY2Vz
-PiDlkInku5Y8L21hcms6Z29vZHNBbmRTZXJ2aWNlcz48bWFyazpyZWZOdW0+MTIzNDwvbWFyazpy
-ZWZOdW0+PG1hcms6cHJvRGF0ZT4yMDAwLTAxLTAxVDAwOjAwOjAwLjAwMFo8L21hcms6cHJvRGF0
-ZT48bWFyazp0aXRsZT5UZXN0IFRyZWF0eTwvbWFyazp0aXRsZT48bWFyazpleGVjRGF0ZT4yMDEz
-LTAyLTAyVDAwOjAwOjAwLjAwMFo8L21hcms6ZXhlY0RhdGU+PC9tYXJrOnRyZWF0eU9yU3RhdHV0
-ZT48L21hcms6bWFyaz48ZHM6U2lnbmF0dXJlIHhtbG5zOmRzPSJodHRwOi8vd3d3LnczLm9yZy8y
-MDAwLzA5L3htbGRzaWcjIiBJZD0iXzk3MDc5NTcxLTE4YzItNDlmNC05N2ExLTZmYTllYWM5ZTNm
-MSI+PGRzOlNpZ25lZEluZm8+PGRzOkNhbm9uaWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGhtPSJo
-dHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJlTWV0
-aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxkc2lnLW1vcmUjcnNh
-LXNoYTI1NiIvPjxkczpSZWZlcmVuY2UgVVJJPSIjXzBkNmQyNTM4LTAyM2QtNDBjMC1iY2NhLTg0
-NGE0YzkxMTllNiI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6
-Ly93d3cudzMub3JnLzIwMDAvMDkveG1sZHNpZyNlbnZlbG9wZWQtc2lnbmF0dXJlIi8+PGRzOlRy
-YW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRu
-IyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3
-dy53My5vcmcvMjAwMS8wNC94bWxlbmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPlBQUEJHRDZ3
-VVJ5RjZubUdqVGhIbm5OK21xYXhwS2lyNFBZYzlhQlhTQ009PC9kczpEaWdlc3RWYWx1ZT48L2Rz
-OlJlZmVyZW5jZT48ZHM6UmVmZXJlbmNlIFVSST0iI19lNTlhMzRiZS1jZGE4LTQ3NDgtYWVlYy1h
-NmZjODkwODdkYjAiPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRw
-Oi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRz
-OkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5j
-I3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1ZT5MM3NPbmtqTFBlUlBXWXA5Nm9SV2J2cmQxblc1djBv
-S1M4SHRVTldaU09zPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PC9kczpTaWduZWRJ
-bmZvPjxkczpTaWduYXR1cmVWYWx1ZSBJZD0iXzQyNDg3ZTQ4LTk5NTItNDMxMC04NTI0LTcxMWIx
-YTNlNDNlNCI+ZW51S1FIZFhpMFRmNmRTeWhKRERXZTJvMnhiSmgzbUoyV09NS2hpK01uWEwxVXFq
-Mzd4cWxkVjlicnVvQjdSWmFPRUpNbDVDaTlOawpiWUhaSnJOMmJ3dFcvS2QzY1BYM24wc3R5bVcx
-K0NXc1VtbDVwWDQ2dXVpMGRuVTFkaldaMjY1VnVwaEdacE5nTzZQMCs5dm9VbEdUCmltZzVaek5p
-UXpNbTdncit3SFRmVExxbUh0NUVLUlQxZXozTzlkN3Y5bWtnTHBuRDhWc1lyWjFpR0lEa3U0YmRE
-MHg2ODlreHg2UzcKNy9OTzlwZXl6dXJ2MnJKakkwM2luczI0eE1wS2hVT3o4bW5DUmQ2ZkhVaXgy
-bUYzaWhma1NmK3BvS3ZVc1pMNmlickQ0Ull3eXZ0SgpxajdkUkI2Y05tcVBEbXV6anUwdENZWjFV
-ellUbjJ3d1ZrRjd0Zz09PC9kczpTaWduYXR1cmVWYWx1ZT48ZHM6S2V5SW5mbyBJZD0iX2U1OWEz
-NGJlLWNkYTgtNDc0OC1hZWVjLWE2ZmM4OTA4N2RiMCI+PGRzOlg1MDlEYXRhPjxkczpYNTA5Q2Vy
-dGlmaWNhdGU+TUlJRk96Q0NCQ09nQXdJQkFnSWdMckFiZXZvYWU1MnkzZjZDMnRCMFNuM3A3WEpt
-MFQwMkZvZ3hLQ2ZOaFpjd0RRWUpLb1pJaHZjTgpBUUVMQlFBd2ZERUxNQWtHQTFVRUJoTUNWVk14
-UERBNkJnTlZCQW9UTTBsdWRHVnlibVYwSUVOdmNuQnZjbUYwYVc5dUlHWnZjaUJCCmMzTnBaMjVs
-WkNCT1lXMWxjeUJoYm1RZ1RuVnRZbVZ5Y3pFdk1DMEdBMVVFQXhNbVNVTkJUazRnVkhKaFpHVnRZ
-WEpySUVOc1pXRnkKYVc1bmFHOTFjMlVnVUdsc2IzUWdRMEV3SGhjTk1UZ3dNakk0TURBd01EQXdX
-aGNOTWpNd016QXhNak0xT1RVNVdqQ0JqekVMTUFrRwpBMVVFQmhNQ1FrVXhJREFlQmdOVkJBZ1RG
-MEp5ZFhOelpXeHpMVU5oY0dsMFlXd2dVbVZuYVc5dU1SRXdEd1lEVlFRSEV3aENjblZ6CmMyVnNj
-ekVSTUE4R0ExVUVDaE1JUkdWc2IybDBkR1V4T0RBMkJnTlZCQU1UTDBsRFFVNU9JRlJOUTBnZ1FY
-VjBhRzl5YVhwbFpDQlUKY21Ga1pXMWhjbXNnVUdsc2IzUWdWbUZzYVdSaGRHOXlNSUlCSWpBTkJn
-a3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQQp4bHAzS3BZSFgzV3lBc0ZoU2szTHdX
-Zm5HbHhuVURGcUZaQTNVb3VNWWovWGlnYk1rTmVFWElqbGtST0tUNE9QR2ZSeC9MQXlSbFFRCmpD
-TXY0cWhia2NYMXA3YXI2M2ZscTRTWk5WY2wxNWw3aDB1VDU4RnpTZm5sejB1NXJrSGZKSW1ENDMr
-bWFQLzhndjM2RlIyN2pXOFIKOXdZNGhrK1dzNElCMGlGU2Q4U1h2MUtyOHcvSm1NUVNEa2l1RytS
-ZklpdWJ3US9meTdFa2o1UVdoUFp3K21NeE5LbkhVTHkzeFl6MgpMd1ZmZnRqd1V1ZWFjdnFOUkNr
-TVhsQ2xPQURxZlQ4b1Nab2VEWGVoSHZsUHNMQ2VtR0JvVEt1cnNrSVM2OUYweVBFSDVnemUwSCtm
-CjhGUk9zSW9LU3NWUTM0QjRTL2pvRTY3bnBzSlBUZEtzTlBKVHlRSURBUUFCbzRJQmt6Q0NBWTh3
-REFZRFZSMFRBUUgvQkFJd0FEQWQKQmdOVkhRNEVGZ1FVb0ZwWTc2cDV5b05EUkd0UXB6VnVSODFV
-V1Ewd2djWUdBMVVkSXdTQnZqQ0J1NEFVdzYwK3B0WVJBRVdBWERwWApTb3B0M0RFTm5uR2hnWUNr
-ZmpCOE1Rc3dDUVlEVlFRR0V3SlZVekU4TURvR0ExVUVDaE16U1c1MFpYSnVaWFFnUTI5eWNHOXlZ
-WFJwCmIyNGdabTl5SUVGemMybG5ibVZrSUU1aGJXVnpJR0Z1WkNCT2RXMWlaWEp6TVM4d0xRWURW
-UVFERXlaSlEwRk9UaUJVY21Ga1pXMWgKY21zZ1EyeGxZWEpwYm1kb2IzVnpaU0JRYVd4dmRDQkRR
-WUlnTHJBYmV2b2FlNTJ5M2Y2QzJ0QjBTbjNwN1hKbTBUMDJGb2d4S0NmTgpoWGt3RGdZRFZSMFBB
-UUgvQkFRREFnZUFNRFFHQTFVZEh3UXRNQ3N3S2FBbm9DV0dJMmgwZEhBNkx5OWpjbXd1YVdOaGJt
-NHViM0puCkwzUnRZMmhmY0dsc2IzUXVZM0pzTUZFR0ExVWRJQVJLTUVnd0VBWU9Ld1lCQkFHQ3lS
-c0JCWU03REFvd05BWUlLd1lCQlFVSEFnRXcKS0RBbUJnZ3JCZ0VGQlFjQ0FSWWFhSFIwY0hNNkx5
-OWpZUzVwWTJGdWJpNXZjbWN2Y0dsc2IzUXdEUVlKS29aSWh2Y05BUUVMQlFBRApnZ0VCQUF1aloy
-SWNSMkRWcnRhUnJBNTllTllDbDR4Y3NKTXU4RFFDSHYyOGZUZmkvQmlaWTRJcjdGOWtGeTk2RDdP
-WjhvTFk1empmCjRkSHhGd0hQcUg4RGg2Sldzelh1SFcxWmEzWG1sMFBhSHhDV1JTMFhvbDhXc0hI
-cE55Z2pNQllmSjBvZFZNODg1VFoxRWw5U2l1RUgKbnluRkJnU21pRmM5OXVRZC9ZRFJadUd2L0Ew
-SHl2N3lSOXRrTEVkRDNBMXVOSkJXNFArSEpHcGRLa1lMMVE1clU3K29IVlB0TUtLSQozaUZrVUVz
-Yk80NUFWZDd2UC9qLzdKdEFaUGI2a29PVjVsWmkySDFSTGNjR3d6ZGV6bmhKZ2QwTjlvYmIwdm5F
-NDEvVVNXYWZkV1JaClZHa3dQdXFUaGw3c0N0enJKSDhYWTB4Y3VtK2NmTHgyRUFJd1VuT2NhYjQ9
-PC9kczpYNTA5Q2VydGlmaWNhdGU+PC9kczpYNTA5RGF0YT48L2RzOktleUluZm8+PC9kczpTaWdu
-YXR1cmU+PC9zbWQ6c2lnbmVkTWFyaz4=
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/revoked/smd/TreatyStatute-Holder-English-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/TreatyStatute-Holder-English-Revoked.smd
deleted file mode 100644
index 23b39af17..000000000
--- a/core/src/test/resources/google/registry/tmch/revoked/smd/TreatyStatute-Holder-English-Revoked.smd
+++ /dev/null
@@ -1,99 +0,0 @@
-Marks: Test & Validate
-smdID: 000000551526319790086-65535
-U-labels: test---validate, test--validate, test-and-validate, test-andvalidate, test-validate, testand-validate, testandvalidate, testvalidate
-notBefore: 2018-05-14T17:43:10.086Z
-notAfter: 2022-08-21T08:12:19.525Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il9kMjE1
-ZmRmYy04MDkxLTQzNDktOGE0MC05OTNlOTJkMTA4NTQiPjxzbWQ6aWQ+MDAwMDAwNTUxNTI2MzE5
-NzkwMDg2LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo0MzoxMC4wODZaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0yMVQwODoxMjoxOS41MjVaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
-cmVhdHlPclN0YXR1dGU+PG1hcms6aWQ+MDAwMTM2MTUwMzA1NzMwNTE1MDMwNTczMDUtMTwvbWFy
-azppZD48bWFyazptYXJrTmFtZT5UZXN0ICZhbXA7IFZhbGlkYXRlPC9tYXJrOm1hcmtOYW1lPjxt
-YXJrOmhvbGRlciBlbnRpdGxlbWVudD0ib3duZXIiPjxtYXJrOm5hbWU+RnJhbmsgV2hpdGU8L21h
-cms6bmFtZT48bWFyazpvcmc+VGVzdCBPcmdhbml6YXRpb248L21hcms6b3JnPjxtYXJrOmFkZHI+
-PG1hcms6c3RyZWV0Pldlc3QgQXJxdWVzIEF2ZW51ZSAxMDEgPC9tYXJrOnN0cmVldD48bWFyazpj
-aXR5PlN1bm55dmFsZTwvbWFyazpjaXR5PjxtYXJrOnNwPkNBPC9tYXJrOnNwPjxtYXJrOnBjPjEw
-MDIzLTMyNDE8L21hcms6cGM+PG1hcms6Y2M+VVM8L21hcms6Y2M+PC9tYXJrOmFkZHI+PG1hcms6
-dm9pY2U+KzEuMzAxNDU1NjYwMDwvbWFyazp2b2ljZT48bWFyazpmYXg+KzEuMzAxNDU1NjYwMTwv
-bWFyazpmYXg+PG1hcms6ZW1haWw+aW5mb0BleGFtcGxlLmV4YW1wbGU8L21hcms6ZW1haWw+PC9t
-YXJrOmhvbGRlcj48bWFyazpwcm90ZWN0aW9uPjxtYXJrOmNjPlVTPC9tYXJrOmNjPjxtYXJrOnJ1
-bGluZz5VUzwvbWFyazpydWxpbmc+PC9tYXJrOnByb3RlY3Rpb24+PG1hcms6bGFiZWw+dGVzdC0t
-LXZhbGlkYXRlPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnRlc3QtLXZhbGlkYXRlPC9tYXJrOmxh
-YmVsPjxtYXJrOmxhYmVsPnRlc3QtYW5kLXZhbGlkYXRlPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVs
-PnRlc3QtYW5kdmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+dGVzdC12YWxpZGF0ZTwv
-bWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0YW5kLXZhbGlkYXRlPC9tYXJrOmxhYmVsPjxtYXJr
-OmxhYmVsPnRlc3RhbmR2YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0dmFsaWRh
-dGU8L21hcms6bGFiZWw+PG1hcms6Z29vZHNBbmRTZXJ2aWNlcz5ndWl0YXI8L21hcms6Z29vZHNB
-bmRTZXJ2aWNlcz48bWFyazpyZWZOdW0+MTIzNDwvbWFyazpyZWZOdW0+PG1hcms6cHJvRGF0ZT4y
-MDAwLTAxLTAxVDAwOjAwOjAwLjAwMFo8L21hcms6cHJvRGF0ZT48bWFyazp0aXRsZT5NdXNpY2Fs
-IGluc3RydW1lbnRzPC9tYXJrOnRpdGxlPjxtYXJrOmV4ZWNEYXRlPjIwMTMtMDItMDJUMDA6MDA6
-MDAuMDAwWjwvbWFyazpleGVjRGF0ZT48L21hcms6dHJlYXR5T3JTdGF0dXRlPjwvbWFyazptYXJr
-PjxkczpTaWduYXR1cmUgeG1sbnM6ZHM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1sZHNp
-ZyMiIElkPSJfM2Y1ZmQ5ZTYtYTE1Mi00ODA2LThmNWItNTYwZDBjNmNjMzU0Ij48ZHM6U2lnbmVk
-SW5mbz48ZHM6Q2Fub25pY2FsaXphdGlvbk1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMu
-b3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjxkczpTaWduYXR1cmVNZXRob2QgQWxnb3JpdGht
-PSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGRzaWctbW9yZSNyc2Etc2hhMjU2Ii8+PGRz
-OlJlZmVyZW5jZSBVUkk9IiNfZDIxNWZkZmMtODA5MS00MzQ5LThhNDAtOTkzZTkyZDEwODU0Ij48
-ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcv
-MjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48ZHM6VHJhbnNmb3JtIEFsZ29y
-aXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFu
-c2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAx
-LzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+UUF2U3ZEUStITTBTV1dDK2hEeWtu
-bURLUFdxV3JOWTRNaVNJd2ZjWFp4TT08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNlPjxk
-czpSZWZlcmVuY2UgVVJJPSIjXzE0YzI0N2JkLTQ5M2QtNGNmMi1hZjk0LWI0M2Y5NDQwOGUzOCI+
-PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3Jn
-LzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6RGlnZXN0TWV0aG9k
-IEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxlbmMjc2hhMjU2Ii8+PGRz
-OkRpZ2VzdFZhbHVlPnBTSkVhQlJSSldtZzhUY3FFcENOdWcvUHlFQXNlU0paKytlZWs3NkRiNkk9
-PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48L2RzOlNpZ25lZEluZm8+PGRzOlNpZ25h
-dHVyZVZhbHVlIElkPSJfZjc2MmMwMDYtNTk0OC00ZGJiLThhZTItZjAyMGNjZTk4ZDMwIj50S1dw
-K2xSM1FVVkJsdU91VXVUamFHUHFKUGVhRDVPMWlTUzBTODdNb0lmc2JvMWpSb3BaQXRkMm9YN0pU
-RDNHdXJmeUJKRlAyNjdqCk5YSVBOajdqMk5xckFwN29nRG84Ym1CT0QvdVFwQVZjWjd2YjVFNll0
-cjk1UE9HVW5wSGttUDZ1b3Fkbk1ZQ2tJTTc5UU9xRzVIdXQKL0x0Mnp0WUpmY1FnU0VCcW9ETjcr
-K0FRc0wvTlZ1bmNyd2hnSTNLMlhhNG5VamNLS2xUTFhjQjM5MWhHRGxBWjVPNG5hQkh1b0dSOQp6
-SmxBRDJrN3FqSy95K2FrNDhkaVc3QkJOcUduQ1JVc2FCWXYyVlMwclU2TTVoajZEWEFwNnhuZTNM
-Tk9xQURDdEZXWW44S08rR3pTCm5TNlVxOE9FdzUramVXWlpIMEhQOUIxSzl2RWdxUXdST2VqZFVn
-PT08L2RzOlNpZ25hdHVyZVZhbHVlPjxkczpLZXlJbmZvIElkPSJfMTRjMjQ3YmQtNDkzZC00Y2Yy
-LWFmOTQtYjQzZjk0NDA4ZTM4Ij48ZHM6WDUwOURhdGE+PGRzOlg1MDlDZXJ0aWZpY2F0ZT5NSUlG
-T3pDQ0JDT2dBd0lCQWdJZ0xyQWJldm9hZTUyeTNmNkMydEIwU24zcDdYSm0wVDAyRm9neEtDZk5o
-WmN3RFFZSktvWklodmNOCkFRRUxCUUF3ZkRFTE1Ba0dBMVVFQmhNQ1ZWTXhQREE2QmdOVkJBb1RN
-MGx1ZEdWeWJtVjBJRU52Y25CdmNtRjBhVzl1SUdadmNpQkIKYzNOcFoyNWxaQ0JPWVcxbGN5Qmhi
-bVFnVG5WdFltVnljekV2TUMwR0ExVUVBeE1tU1VOQlRrNGdWSEpoWkdWdFlYSnJJRU5zWldGeQph
-VzVuYUc5MWMyVWdVR2xzYjNRZ1EwRXdIaGNOTVRnd01qSTRNREF3TURBd1doY05Nak13TXpBeE1q
-TTFPVFU1V2pDQmp6RUxNQWtHCkExVUVCaE1DUWtVeElEQWVCZ05WQkFnVEYwSnlkWE56Wld4ekxV
-TmhjR2wwWVd3Z1VtVm5hVzl1TVJFd0R3WURWUVFIRXdoQ2NuVnoKYzJWc2N6RVJNQThHQTFVRUNo
-TUlSR1ZzYjJsMGRHVXhPREEyQmdOVkJBTVRMMGxEUVU1T0lGUk5RMGdnUVhWMGFHOXlhWHBsWkNC
-VQpjbUZrWlcxaGNtc2dVR2xzYjNRZ1ZtRnNhV1JoZEc5eU1JSUJJakFOQmdrcWhraUc5dzBCQVFF
-RkFBT0NBUThBTUlJQkNnS0NBUUVBCnhscDNLcFlIWDNXeUFzRmhTazNMd1dmbkdseG5VREZxRlpB
-M1VvdU1Zai9YaWdiTWtOZUVYSWpsa1JPS1Q0T1BHZlJ4L0xBeVJsUVEKakNNdjRxaGJrY1gxcDdh
-cjYzZmxxNFNaTlZjbDE1bDdoMHVUNThGelNmbmx6MHU1cmtIZkpJbUQ0MyttYVAvOGd2MzZGUjI3
-alc4Ugo5d1k0aGsrV3M0SUIwaUZTZDhTWHYxS3I4dy9KbU1RU0RraXVHK1JmSWl1YndRL2Z5N0Vr
-ajVRV2hQWncrbU14TktuSFVMeTN4WXoyCkx3VmZmdGp3VXVlYWN2cU5SQ2tNWGxDbE9BRHFmVDhv
-U1pvZURYZWhIdmxQc0xDZW1HQm9US3Vyc2tJUzY5RjB5UEVINWd6ZTBIK2YKOEZST3NJb0tTc1ZR
-MzRCNFMvam9FNjducHNKUFRkS3NOUEpUeVFJREFRQUJvNElCa3pDQ0FZOHdEQVlEVlIwVEFRSC9C
-QUl3QURBZApCZ05WSFE0RUZnUVVvRnBZNzZwNXlvTkRSR3RRcHpWdVI4MVVXUTB3Z2NZR0ExVWRJ
-d1NCdmpDQnU0QVV3NjArcHRZUkFFV0FYRHBYClNvcHQzREVObm5HaGdZQ2tmakI4TVFzd0NRWURW
-UVFHRXdKVlV6RThNRG9HQTFVRUNoTXpTVzUwWlhKdVpYUWdRMjl5Y0c5eVlYUnAKYjI0Z1ptOXlJ
-RUZ6YzJsbmJtVmtJRTVoYldWeklHRnVaQ0JPZFcxaVpYSnpNUzh3TFFZRFZRUURFeVpKUTBGT1Rp
-QlVjbUZrWlcxaApjbXNnUTJ4bFlYSnBibWRvYjNWelpTQlFhV3h2ZENCRFFZSWdMckFiZXZvYWU1
-MnkzZjZDMnRCMFNuM3A3WEptMFQwMkZvZ3hLQ2ZOCmhYa3dEZ1lEVlIwUEFRSC9CQVFEQWdlQU1E
-UUdBMVVkSHdRdE1Dc3dLYUFub0NXR0kyaDBkSEE2THk5amNtd3VhV05oYm00dWIzSm4KTDNSdFky
-aGZjR2xzYjNRdVkzSnNNRkVHQTFVZElBUktNRWd3RUFZT0t3WUJCQUdDeVJzQkJZTTdEQW93TkFZ
-SUt3WUJCUVVIQWdFdwpLREFtQmdnckJnRUZCUWNDQVJZYWFIUjBjSE02THk5allTNXBZMkZ1Ymk1
-dmNtY3ZjR2xzYjNRd0RRWUpLb1pJaHZjTkFRRUxCUUFECmdnRUJBQXVqWjJJY1IyRFZydGFSckE1
-OWVOWUNsNHhjc0pNdThEUUNIdjI4ZlRmaS9CaVpZNElyN0Y5a0Z5OTZEN09aOG9MWTV6amYKNGRI
-eEZ3SFBxSDhEaDZKV3N6WHVIVzFaYTNYbWwwUGFIeENXUlMwWG9sOFdzSEhwTnlnak1CWWZKMG9k
-Vk04ODVUWjFFbDlTaXVFSApueW5GQmdTbWlGYzk5dVFkL1lEUlp1R3YvQTBIeXY3eVI5dGtMRWRE
-M0ExdU5KQlc0UCtISkdwZEtrWUwxUTVyVTcrb0hWUHRNS0tJCjNpRmtVRXNiTzQ1QVZkN3ZQL2ov
-N0p0QVpQYjZrb09WNWxaaTJIMVJMY2NHd3pkZXpuaEpnZDBOOW9iYjB2bkU0MS9VU1dhZmRXUloK
-Vkdrd1B1cVRobDdzQ3R6ckpIOFhZMHhjdW0rY2ZMeDJFQUl3VW5PY2FiND08L2RzOlg1MDlDZXJ0
-aWZpY2F0ZT48L2RzOlg1MDlEYXRhPjwvZHM6S2V5SW5mbz48L2RzOlNpZ25hdHVyZT48L3NtZDpz
-aWduZWRNYXJrPg==
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/revoked/smd/TreatyStatute-Holder-French-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/TreatyStatute-Holder-French-Revoked.smd
deleted file mode 100644
index 450414686..000000000
--- a/core/src/test/resources/google/registry/tmch/revoked/smd/TreatyStatute-Holder-French-Revoked.smd
+++ /dev/null
@@ -1,100 +0,0 @@
-Marks: Essai & évaluation
-smdID: 000000661526319795822-65535
-U-labels: xn--essai---valuation-itb, xn--essai--valuation-hqb, xn--essai-and-valuation-kzb, xn--essai-andvaluation-jwb, xn--essai-valuation-gnb, xn--essaiand-valuation-jwb, xn--essaiandvaluation-itb, xn--essaivaluation-fkb
-notBefore: 2018-05-14T17:43:15.822Z
-notAfter: 2022-08-21T08:12:14.116Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il85MGEz
-NGJiYS1hNGEyLTRhMzMtYWRmOS1jOTE0NGUyNjY4MzIiPjxzbWQ6aWQ+MDAwMDAwNjYxNTI2MzE5
-Nzk1ODIyLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo0MzoxNS44MjJaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0yMVQwODoxMjoxNC4xMTZaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
-cmVhdHlPclN0YXR1dGU+PG1hcms6aWQ+MDAwMTM4MTUwMzA2MTEzMDE1MDMwNjExMzAtMTwvbWFy
-azppZD48bWFyazptYXJrTmFtZT5Fc3NhaSAmYW1wOyDDqXZhbHVhdGlvbjwvbWFyazptYXJrTmFt
-ZT48bWFyazpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpuYW1lPkplYW4gTGVibGFu
-YzwvbWFyazpuYW1lPjxtYXJrOm9yZz5PcmFuaXNhdGlvbiBkZSB0ZXN0PC9tYXJrOm9yZz48bWFy
-azphZGRyPjxtYXJrOnN0cmVldD5SVUUgUk9HTkUgNDAgPC9tYXJrOnN0cmVldD48bWFyazpjaXR5
-PkFSVE9JUzwvbWFyazpjaXR5PjxtYXJrOnBjPjIxMzAxPC9tYXJrOnBjPjxtYXJrOmNjPkZSPC9t
-YXJrOmNjPjwvbWFyazphZGRyPjxtYXJrOnZvaWNlPiszMy4yNjQ5OTUwMzI8L21hcms6dm9pY2U+
-PG1hcms6ZmF4PiszMy4yNjQ5OTUwMzM8L21hcms6ZmF4PjxtYXJrOmVtYWlsPmluZm9AZXhhbXBs
-ZS5leGFtcGxlPC9tYXJrOmVtYWlsPjwvbWFyazpob2xkZXI+PG1hcms6cHJvdGVjdGlvbj48bWFy
-azpjYz5VUzwvbWFyazpjYz48bWFyazpydWxpbmc+RlI8L21hcms6cnVsaW5nPjwvbWFyazpwcm90
-ZWN0aW9uPjxtYXJrOmxhYmVsPnhuLS1lc3NhaS0tLXZhbHVhdGlvbi1pdGI8L21hcms6bGFiZWw+
-PG1hcms6bGFiZWw+eG4tLWVzc2FpLS12YWx1YXRpb24taHFiPC9tYXJrOmxhYmVsPjxtYXJrOmxh
-YmVsPnhuLS1lc3NhaS1hbmQtdmFsdWF0aW9uLWt6YjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54
-bi0tZXNzYWktYW5kdmFsdWF0aW9uLWp3YjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tZXNz
-YWktdmFsdWF0aW9uLWduYjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tZXNzYWlhbmQtdmFs
-dWF0aW9uLWp3YjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tZXNzYWlhbmR2YWx1YXRpb24t
-aXRiPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1lc3NhaXZhbHVhdGlvbi1ma2I8L21hcms6
-bGFiZWw+PG1hcms6Z29vZHNBbmRTZXJ2aWNlcz5ndWl0YXJlPC9tYXJrOmdvb2RzQW5kU2Vydmlj
-ZXM+PG1hcms6cmVmTnVtPkVzc2FpICZhbXA7IMOpdmFsdWF0aW9uPC9tYXJrOnJlZk51bT48bWFy
-azpwcm9EYXRlPjIwMDAtMDEtMDFUMDA6MDA6MDAuMDAwWjwvbWFyazpwcm9EYXRlPjxtYXJrOnRp
-dGxlPjEyMzQ8L21hcms6dGl0bGU+PG1hcms6ZXhlY0RhdGU+MjAxMy0wMi0wMlQwMDowMDowMC4w
-MDBaPC9tYXJrOmV4ZWNEYXRlPjwvbWFyazp0cmVhdHlPclN0YXR1dGU+PC9tYXJrOm1hcms+PGRz
-OlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyIg
-SWQ9Il9mMzkzOTJkOC03NzIxLTRlOTQtYTg1NS1jMmM3YTEwYzhiN2UiPjxkczpTaWduZWRJbmZv
-PjxkczpDYW5vbmljYWxpemF0aW9uTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcv
-MjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PGRzOlNpZ25hdHVyZU1ldGhvZCBBbGdvcml0aG09Imh0
-dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZHNpZy1tb3JlI3JzYS1zaGEyNTYiLz48ZHM6UmVm
-ZXJlbmNlIFVSST0iI185MGEzNGJiYS1hNGEyLTRhMzMtYWRmOS1jOTE0NGUyNjY4MzIiPjxkczpU
-cmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAw
-LzA5L3htbGRzaWcjZW52ZWxvcGVkLXNpZ25hdHVyZSIvPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGht
-PSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9y
-bXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQv
-eG1sZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1ZT42ejFVajNpVEwzVlB1Z1luRDZ2YVc2M2tB
-VEJ4WURWbHRnMSs3TUFNZnJFPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PGRzOlJl
-ZmVyZW5jZSBVUkk9IiNfMzE4ZTVjZWItNDNkOC00OTA2LWIwYjQtNmQ5MzYxZmZlNmFkIj48ZHM6
-VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAw
-MS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxn
-b3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGln
-ZXN0VmFsdWU+OTV3N3k5RytVYWlxVHJpWVp1WjZPTXlGMXVXdHRMSno0S1diMTdZVUxTOD08L2Rz
-OkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNlPjwvZHM6U2lnbmVkSW5mbz48ZHM6U2lnbmF0dXJl
-VmFsdWUgSWQ9Il81NjJmMWFjZS1lNGFhLTRlNzMtODA1Ny0zNTkzZDQzZDQwODgiPlhhREJodUtQ
-cVZ0N2x3MVB0clBtTDczQmZvRSsycGNmZTdpa1FQc3h1ZThiTDFVdEFMNlduL0JreWdpblJyTTZ2
-c2l4K0sxRkYxcHQKekxRbDlZcGJHWmlPNWxPMDIya0h6dHhGcC9KRUVNUEVqNWNkUXdlVktVdG5M
-M2w1WGtnVW9jR0VtQTZSVEIwYnNTcHFKUEo1S29TUAo2OVdxdEl3a1VuUzc1M3lqeVlkRDh2OTVk
-dmtUMkhVSEwzK2hKMnM4eG5kcE5pdjlkUzBHV2E5em5YRGhJZXNvUkg3YzRWZmlURHAyCnR5WmpU
-TmNReDNieXNGc084UnhJTlo2cUo2MGJKdWNGdUxJK0JTUG9OSVRKWEZIbGtkV2wxYjFjNFJaUzVr
-UmhFSDZ6cnNZdzNXV0UKZWJYcWQ2YjJCQjJnNm9ScytkaXc5L3drMGEyZG9DNWdBNGxjS0E9PTwv
-ZHM6U2lnbmF0dXJlVmFsdWU+PGRzOktleUluZm8gSWQ9Il8zMThlNWNlYi00M2Q4LTQ5MDYtYjBi
-NC02ZDkzNjFmZmU2YWQiPjxkczpYNTA5RGF0YT48ZHM6WDUwOUNlcnRpZmljYXRlPk1JSUZPekND
-QkNPZ0F3SUJBZ0lnTHJBYmV2b2FlNTJ5M2Y2QzJ0QjBTbjNwN1hKbTBUMDJGb2d4S0NmTmhaY3dE
-UVlKS29aSWh2Y04KQVFFTEJRQXdmREVMTUFrR0ExVUVCaE1DVlZNeFBEQTZCZ05WQkFvVE0wbHVk
-R1Z5Ym1WMElFTnZjbkJ2Y21GMGFXOXVJR1p2Y2lCQgpjM05wWjI1bFpDQk9ZVzFsY3lCaGJtUWdU
-blZ0WW1WeWN6RXZNQzBHQTFVRUF4TW1TVU5CVGs0Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5CmFXNW5h
-RzkxYzJVZ1VHbHNiM1FnUTBFd0hoY05NVGd3TWpJNE1EQXdNREF3V2hjTk1qTXdNekF4TWpNMU9U
-VTVXakNCanpFTE1Ba0cKQTFVRUJoTUNRa1V4SURBZUJnTlZCQWdURjBKeWRYTnpaV3h6TFVOaGNH
-bDBZV3dnVW1WbmFXOXVNUkV3RHdZRFZRUUhFd2hDY25WegpjMlZzY3pFUk1BOEdBMVVFQ2hNSVJH
-VnNiMmwwZEdVeE9EQTJCZ05WQkFNVEwwbERRVTVPSUZSTlEwZ2dRWFYwYUc5eWFYcGxaQ0JVCmNt
-RmtaVzFoY21zZ1VHbHNiM1FnVm1Gc2FXUmhkRzl5TUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFP
-Q0FROEFNSUlCQ2dLQ0FRRUEKeGxwM0twWUhYM1d5QXNGaFNrM0x3V2ZuR2x4blVERnFGWkEzVW91
-TVlqL1hpZ2JNa05lRVhJamxrUk9LVDRPUEdmUngvTEF5UmxRUQpqQ012NHFoYmtjWDFwN2FyNjNm
-bHE0U1pOVmNsMTVsN2gwdVQ1OEZ6U2ZubHowdTVya0hmSkltRDQzK21hUC84Z3YzNkZSMjdqVzhS
-Cjl3WTRoaytXczRJQjBpRlNkOFNYdjFLcjh3L0ptTVFTRGtpdUcrUmZJaXVid1EvZnk3RWtqNVFX
-aFBadyttTXhOS25IVUx5M3hZejIKTHdWZmZ0andVdWVhY3ZxTlJDa01YbENsT0FEcWZUOG9TWm9l
-RFhlaEh2bFBzTENlbUdCb1RLdXJza0lTNjlGMHlQRUg1Z3plMEgrZgo4RlJPc0lvS1NzVlEzNEI0
-Uy9qb0U2N25wc0pQVGRLc05QSlR5UUlEQVFBQm80SUJrekNDQVk4d0RBWURWUjBUQVFIL0JBSXdB
-REFkCkJnTlZIUTRFRmdRVW9GcFk3NnA1eW9ORFJHdFFwelZ1UjgxVVdRMHdnY1lHQTFVZEl3U0J2
-akNCdTRBVXc2MCtwdFlSQUVXQVhEcFgKU29wdDNERU5ubkdoZ1lDa2ZqQjhNUXN3Q1FZRFZRUUdF
-d0pWVXpFOE1Eb0dBMVVFQ2hNelNXNTBaWEp1WlhRZ1EyOXljRzl5WVhScApiMjRnWm05eUlFRnpj
-MmxuYm1Wa0lFNWhiV1Z6SUdGdVpDQk9kVzFpWlhKek1TOHdMUVlEVlFRREV5WkpRMEZPVGlCVWNt
-RmtaVzFoCmNtc2dRMnhsWVhKcGJtZG9iM1Z6WlNCUWFXeHZkQ0JEUVlJZ0xyQWJldm9hZTUyeTNm
-NkMydEIwU24zcDdYSm0wVDAyRm9neEtDZk4KaFhrd0RnWURWUjBQQVFIL0JBUURBZ2VBTURRR0Ex
-VWRId1F0TUNzd0thQW5vQ1dHSTJoMGRIQTZMeTlqY213dWFXTmhibTR1YjNKbgpMM1J0WTJoZmNH
-bHNiM1F1WTNKc01GRUdBMVVkSUFSS01FZ3dFQVlPS3dZQkJBR0N5UnNCQllNN0RBb3dOQVlJS3dZ
-QkJRVUhBZ0V3CktEQW1CZ2dyQmdFRkJRY0NBUllhYUhSMGNITTZMeTlqWVM1cFkyRnViaTV2Y21j
-dmNHbHNiM1F3RFFZSktvWklodmNOQVFFTEJRQUQKZ2dFQkFBdWpaMkljUjJEVnJ0YVJyQTU5ZU5Z
-Q2w0eGNzSk11OERRQ0h2MjhmVGZpL0JpWlk0SXI3RjlrRnk5NkQ3T1o4b0xZNXpqZgo0ZEh4RndI
-UHFIOERoNkpXc3pYdUhXMVphM1htbDBQYUh4Q1dSUzBYb2w4V3NISHBOeWdqTUJZZkowb2RWTTg4
-NVRaMUVsOVNpdUVICm55bkZCZ1NtaUZjOTl1UWQvWURSWnVHdi9BMEh5djd5Ujl0a0xFZEQzQTF1
-TkpCVzRQK0hKR3BkS2tZTDFRNXJVNytvSFZQdE1LS0kKM2lGa1VFc2JPNDVBVmQ3dlAvai83SnRB
-WlBiNmtvT1Y1bFppMkgxUkxjY0d3emRlem5oSmdkME45b2JiMHZuRTQxL1VTV2FmZFdSWgpWR2t3
-UHVxVGhsN3NDdHpySkg4WFkweGN1bStjZkx4MkVBSXdVbk9jYWI0PTwvZHM6WDUwOUNlcnRpZmlj
-YXRlPjwvZHM6WDUwOURhdGE+PC9kczpLZXlJbmZvPjwvZHM6U2lnbmF0dXJlPjwvc21kOnNpZ25l
-ZE1hcms+
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/revoked/smd/TreatyStatute-Holder-Russian-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/TreatyStatute-Holder-Russian-Revoked.smd
deleted file mode 100644
index f1100bb06..000000000
--- a/core/src/test/resources/google/registry/tmch/revoked/smd/TreatyStatute-Holder-Russian-Revoked.smd
+++ /dev/null
@@ -1,102 +0,0 @@
-Marks: Ошибки & доказательство
-smdID: 000000691526319801540-65535
-U-labels: xn------8cdabmnlsebzft8aih9crd8iye, xn-----8kcabklkqebxes6ahh6cqd3ite, xn---and--8veabqrnweb3ahv2bkh5dtd8j4e, xn---and-83dabopmueb1agu0bjh2dsd3jze, xn----8sbabijjoebvdr4agh3cpd8h9d, xn--and--83dabopmueb1agu0bjh2dsd3jze, xn--and-8cdabmnlsebzft8aih9crd8iye, xn--80aabghimebtcq2afh0cod3h7d
-notBefore: 2018-05-14T17:43:21.540Z
-notAfter: 2022-08-21T08:12:08.921Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il9jMjFj
-NDg4NS1lZTM1LTQ0NmYtOGVkZi1kMjQ3ZWY2YzY4N2QiPjxzbWQ6aWQ+MDAwMDAwNjkxNTI2MzE5
-ODAxNTQwLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0xNFQxNzo0MzoyMS41NDBaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0yMVQwODoxMjowOC45MjFaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
-cmVhdHlPclN0YXR1dGU+PG1hcms6aWQ+MDAwMTQwMTUwMzA2MzkwMjE1MDMwNjM5MDItMTwvbWFy
-azppZD48bWFyazptYXJrTmFtZT7QntGI0LjQsdC60LggJmFtcDsg0LTQvtC60LDQt9Cw0YLQtdC7
-0YzRgdGC0LLQvjwvbWFyazptYXJrTmFtZT48bWFyazpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVy
-Ij48bWFyazpuYW1lPtCd0LDRgtCw0LvRjNGPINCQ0L3RgtC+0L3QvtCy0LA8L21hcms6bmFtZT48
-bWFyazpvcmc+0JDQvdGC0L7QvdC+0LLQsDwvbWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpzdHJl
-ZXQ+0J/RgNC+0YHQv9C10LrRgiDQktC10YDQvdCw0LTRgdC60L7Qs9C+IDE1PC9tYXJrOnN0cmVl
-dD48bWFyazpjaXR5PtCc0L7RgdC60LLQsDwvbWFyazpjaXR5PjxtYXJrOnBjPjExNzQ4NTwvbWFy
-azpwYz48bWFyazpjYz5SVTwvbWFyazpjYz48L21hcms6YWRkcj48bWFyazp2b2ljZT4rNy45MTg4
-MjIxNjc0PC9tYXJrOnZvaWNlPjxtYXJrOmVtYWlsPmluZm9AZXhhbXBsZS5leGFtcGxlPC9tYXJr
-OmVtYWlsPjwvbWFyazpob2xkZXI+PG1hcms6cHJvdGVjdGlvbj48bWFyazpjYz5VUzwvbWFyazpj
-Yz48bWFyazpydWxpbmc+UlU8L21hcms6cnVsaW5nPjwvbWFyazpwcm90ZWN0aW9uPjxtYXJrOmxh
-YmVsPnhuLS0tLS0tOGNkYWJtbmxzZWJ6ZnQ4YWloOWNyZDhpeWU8L21hcms6bGFiZWw+PG1hcms6
-bGFiZWw+eG4tLS0tLThrY2Fia2xrcWVieGVzNmFoaDZjcWQzaXRlPC9tYXJrOmxhYmVsPjxtYXJr
-OmxhYmVsPnhuLS0tYW5kLS04dmVhYnFybndlYjNhaHYyYmtoNWR0ZDhqNGU8L21hcms6bGFiZWw+
-PG1hcms6bGFiZWw+eG4tLS1hbmQtODNkYWJvcG11ZWIxYWd1MGJqaDJkc2QzanplPC9tYXJrOmxh
-YmVsPjxtYXJrOmxhYmVsPnhuLS0tLThzYmFiaWpqb2VidmRyNGFnaDNjcGQ4aDlkPC9tYXJrOmxh
-YmVsPjxtYXJrOmxhYmVsPnhuLS1hbmQtLTgzZGFib3BtdWViMWFndTBiamgyZHNkM2p6ZTwvbWFy
-azpsYWJlbD48bWFyazpsYWJlbD54bi0tYW5kLThjZGFibW5sc2ViemZ0OGFpaDljcmQ4aXllPC9t
-YXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS04MGFhYmdoaW1lYnRjcTJhZmgwY29kM2g3ZDwvbWFy
-azpsYWJlbD48bWFyazpnb29kc0FuZFNlcnZpY2VzPtCz0LjRgtCw0YDQsDwvbWFyazpnb29kc0Fu
-ZFNlcnZpY2VzPjxtYXJrOnJlZk51bT4xMjM0PC9tYXJrOnJlZk51bT48bWFyazpwcm9EYXRlPjIw
-MDAtMDEtMDFUMDA6MDA6MDAuMDAwWjwvbWFyazpwcm9EYXRlPjxtYXJrOnRpdGxlPlRlc3QgVHJl
-YXR5PC9tYXJrOnRpdGxlPjxtYXJrOmV4ZWNEYXRlPjIwMTMtMDItMDJUMDA6MDA6MDAuMDAwWjwv
-bWFyazpleGVjRGF0ZT48L21hcms6dHJlYXR5T3JTdGF0dXRlPjwvbWFyazptYXJrPjxkczpTaWdu
-YXR1cmUgeG1sbnM6ZHM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1sZHNpZyMiIElkPSJf
-NTRkMGRhMWItNDI4MS00MTBlLTg1ZWMtOWEzMjAxODU1OGQxIj48ZHM6U2lnbmVkSW5mbz48ZHM6
-Q2Fub25pY2FsaXphdGlvbk1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEv
-MTAveG1sLWV4Yy1jMTRuIyIvPjxkczpTaWduYXR1cmVNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8v
-d3d3LnczLm9yZy8yMDAxLzA0L3htbGRzaWctbW9yZSNyc2Etc2hhMjU2Ii8+PGRzOlJlZmVyZW5j
-ZSBVUkk9IiNfYzIxYzQ4ODUtZWUzNS00NDZmLThlZGYtZDI0N2VmNmM2ODdkIj48ZHM6VHJhbnNm
-b3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94
-bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0
-cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxk
-czpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVu
-YyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+SG1BOWQzdFRZL3Bjallia0FvQ0lGTG5qVGpaS3JO
-U3FnSW8wdkpTdjRvND08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNlPjxkczpSZWZlcmVu
-Y2UgVVJJPSIjXzg5YzhlODBlLTNkMDctNDQ2MS1hZjQ4LTkwNDNhNjc4ZDBiNyI+PGRzOlRyYW5z
-Zm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAv
-eG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRo
-bT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxlbmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZh
-bHVlPlUvMHlpV2hPRWFiakU4NHVoeVZTUXFlMjBtcWpralVQSHM1cFEwR1IxdVk9PC9kczpEaWdl
-c3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48L2RzOlNpZ25lZEluZm8+PGRzOlNpZ25hdHVyZVZhbHVl
-IElkPSJfMmFhZWEwOWItZmEyZS00NjJlLWE1YTMtNGQxODk3ZWJjMGQ3Ij5WQmpLaXVNUk5JbFFz
-am5rUkJJcjN4V1lHdWl3ODNzUGp4SXZ6QUlpTnFPcHdWelQyRzJpZEJwS3JlRHZqUUdWN1pjSGc3
-Ni9KUHI1CjVwa0tDcVJ6ZE5pTk5TbVBkalhRZjRLd01rN1FVMzQ5azJyNC81U0p6WUdWYkZKR2c1
-L0pWQkNqVDNXdGtJSFBKaEZCRFExR2IwYksKUzJRSVYvZmhadVUydm9SL2hCbk5Oam9OSGhFQnh6
-UDFmc1dHd0hwQTJ2cXJaMWlvcmU3YW5BMmowR2tuZkd6USt4N3ltMEpNR1RndAorTjhjbEdzV1Nt
-b09zZlc5MVlCMTlKS3NXc3lML3Z4aVZNalc1T1BhY2QwVU8zQzlPQVY1blFtYXp2SXU4MUlKN3Ru
-NkFJRi9DdGdZCkhrVGswV2hXb3NVYzNtMjVUb1dMOGI3MjQ1azJ1REJZZmxFdzJRPT08L2RzOlNp
-Z25hdHVyZVZhbHVlPjxkczpLZXlJbmZvIElkPSJfODljOGU4MGUtM2QwNy00NDYxLWFmNDgtOTA0
-M2E2NzhkMGI3Ij48ZHM6WDUwOURhdGE+PGRzOlg1MDlDZXJ0aWZpY2F0ZT5NSUlGT3pDQ0JDT2dB
-d0lCQWdJZ0xyQWJldm9hZTUyeTNmNkMydEIwU24zcDdYSm0wVDAyRm9neEtDZk5oWmN3RFFZSktv
-WklodmNOCkFRRUxCUUF3ZkRFTE1Ba0dBMVVFQmhNQ1ZWTXhQREE2QmdOVkJBb1RNMGx1ZEdWeWJt
-VjBJRU52Y25CdmNtRjBhVzl1SUdadmNpQkIKYzNOcFoyNWxaQ0JPWVcxbGN5QmhibVFnVG5WdFlt
-VnljekV2TUMwR0ExVUVBeE1tU1VOQlRrNGdWSEpoWkdWdFlYSnJJRU5zWldGeQphVzVuYUc5MWMy
-VWdVR2xzYjNRZ1EwRXdIaGNOTVRnd01qSTRNREF3TURBd1doY05Nak13TXpBeE1qTTFPVFU1V2pD
-Qmp6RUxNQWtHCkExVUVCaE1DUWtVeElEQWVCZ05WQkFnVEYwSnlkWE56Wld4ekxVTmhjR2wwWVd3
-Z1VtVm5hVzl1TVJFd0R3WURWUVFIRXdoQ2NuVnoKYzJWc2N6RVJNQThHQTFVRUNoTUlSR1ZzYjJs
-MGRHVXhPREEyQmdOVkJBTVRMMGxEUVU1T0lGUk5RMGdnUVhWMGFHOXlhWHBsWkNCVQpjbUZrWlcx
-aGNtc2dVR2xzYjNRZ1ZtRnNhV1JoZEc5eU1JSUJJakFOQmdrcWhraUc5dzBCQVFFRkFBT0NBUThB
-TUlJQkNnS0NBUUVBCnhscDNLcFlIWDNXeUFzRmhTazNMd1dmbkdseG5VREZxRlpBM1VvdU1Zai9Y
-aWdiTWtOZUVYSWpsa1JPS1Q0T1BHZlJ4L0xBeVJsUVEKakNNdjRxaGJrY1gxcDdhcjYzZmxxNFNa
-TlZjbDE1bDdoMHVUNThGelNmbmx6MHU1cmtIZkpJbUQ0MyttYVAvOGd2MzZGUjI3alc4Ugo5d1k0
-aGsrV3M0SUIwaUZTZDhTWHYxS3I4dy9KbU1RU0RraXVHK1JmSWl1YndRL2Z5N0VrajVRV2hQWncr
-bU14TktuSFVMeTN4WXoyCkx3VmZmdGp3VXVlYWN2cU5SQ2tNWGxDbE9BRHFmVDhvU1pvZURYZWhI
-dmxQc0xDZW1HQm9US3Vyc2tJUzY5RjB5UEVINWd6ZTBIK2YKOEZST3NJb0tTc1ZRMzRCNFMvam9F
-NjducHNKUFRkS3NOUEpUeVFJREFRQUJvNElCa3pDQ0FZOHdEQVlEVlIwVEFRSC9CQUl3QURBZApC
-Z05WSFE0RUZnUVVvRnBZNzZwNXlvTkRSR3RRcHpWdVI4MVVXUTB3Z2NZR0ExVWRJd1NCdmpDQnU0
-QVV3NjArcHRZUkFFV0FYRHBYClNvcHQzREVObm5HaGdZQ2tmakI4TVFzd0NRWURWUVFHRXdKVlV6
-RThNRG9HQTFVRUNoTXpTVzUwWlhKdVpYUWdRMjl5Y0c5eVlYUnAKYjI0Z1ptOXlJRUZ6YzJsbmJt
-VmtJRTVoYldWeklHRnVaQ0JPZFcxaVpYSnpNUzh3TFFZRFZRUURFeVpKUTBGT1RpQlVjbUZrWlcx
-aApjbXNnUTJ4bFlYSnBibWRvYjNWelpTQlFhV3h2ZENCRFFZSWdMckFiZXZvYWU1MnkzZjZDMnRC
-MFNuM3A3WEptMFQwMkZvZ3hLQ2ZOCmhYa3dEZ1lEVlIwUEFRSC9CQVFEQWdlQU1EUUdBMVVkSHdR
-dE1Dc3dLYUFub0NXR0kyaDBkSEE2THk5amNtd3VhV05oYm00dWIzSm4KTDNSdFkyaGZjR2xzYjNR
-dVkzSnNNRkVHQTFVZElBUktNRWd3RUFZT0t3WUJCQUdDeVJzQkJZTTdEQW93TkFZSUt3WUJCUVVI
-QWdFdwpLREFtQmdnckJnRUZCUWNDQVJZYWFIUjBjSE02THk5allTNXBZMkZ1Ymk1dmNtY3ZjR2xz
-YjNRd0RRWUpLb1pJaHZjTkFRRUxCUUFECmdnRUJBQXVqWjJJY1IyRFZydGFSckE1OWVOWUNsNHhj
-c0pNdThEUUNIdjI4ZlRmaS9CaVpZNElyN0Y5a0Z5OTZEN09aOG9MWTV6amYKNGRIeEZ3SFBxSDhE
-aDZKV3N6WHVIVzFaYTNYbWwwUGFIeENXUlMwWG9sOFdzSEhwTnlnak1CWWZKMG9kVk04ODVUWjFF
-bDlTaXVFSApueW5GQmdTbWlGYzk5dVFkL1lEUlp1R3YvQTBIeXY3eVI5dGtMRWREM0ExdU5KQlc0
-UCtISkdwZEtrWUwxUTVyVTcrb0hWUHRNS0tJCjNpRmtVRXNiTzQ1QVZkN3ZQL2ovN0p0QVpQYjZr
-b09WNWxaaTJIMVJMY2NHd3pkZXpuaEpnZDBOOW9iYjB2bkU0MS9VU1dhZmRXUloKVkdrd1B1cVRo
-bDdzQ3R6ckpIOFhZMHhjdW0rY2ZMeDJFQUl3VW5PY2FiND08L2RzOlg1MDlDZXJ0aWZpY2F0ZT48
-L2RzOlg1MDlEYXRhPjwvZHM6S2V5SW5mbz48L2RzOlNpZ25hdHVyZT48L3NtZDpzaWduZWRNYXJr
-Pg==
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/revoked/tmv/TMVRevoked-Court-Agent-French-Active.smd b/core/src/test/resources/google/registry/tmch/revoked/tmv/TMVRevoked-Court-Agent-French-Active.smd
deleted file mode 100644
index b8448a84f..000000000
--- a/core/src/test/resources/google/registry/tmch/revoked/tmv/TMVRevoked-Court-Agent-French-Active.smd
+++ /dev/null
@@ -1,108 +0,0 @@
-Marks: Essai & évaluation
-smdID: 0000001791375789104761-65535
-U-labels: essai---évaluation, essai--évaluation, essai-et-évaluation, essai-etévaluation, essai-évaluation, essaiet-évaluation, essaietévaluation, essaiévaluation
-notBefore: 2013-08-06 13:38:24
-notAfter: 2017-07-24 00:00:00
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il8yNjVj
-MDExMi0yOGRjLTQ0NzktOTc3Ny1kNTY4NTk5OGVjZTgiPgogIDxzbWQ6aWQ+MDAwMDAwMTc5MTM3
-NTc4OTEwNDc2MS02NTUzNTwvc21kOmlkPgogIDxzbWQ6aXNzdWVySW5mbyBpc3N1ZXJJRD0iNjU1
-MzUiPgogICAgPHNtZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz4KICAgIDxz
-bWQ6ZW1haWw+bm90YXZhaWxhYmxlQGV4YW1wbGUuY29tPC9zbWQ6ZW1haWw+CiAgICA8c21kOnVy
-bD5odHRwOi8vd3d3LmV4YW1wbGUuY29tPC9zbWQ6dXJsPgogICAgPHNtZDp2b2ljZT4rMzIuMDAw
-MDAwPC9zbWQ6dm9pY2U+CiAgPC9zbWQ6aXNzdWVySW5mbz4KICA8c21kOm5vdEJlZm9yZT4yMDEz
-LTA4LTA2VDExOjM4OjI0Ljc2MVo8L3NtZDpub3RCZWZvcmU+CiAgPHNtZDpub3RBZnRlcj4yMDE3
-LTA3LTIzVDIyOjAwOjAwLjAwMFo8L3NtZDpub3RBZnRlcj4KICA8bWFyazptYXJrIHhtbG5zOm1h
-cms9InVybjppZXRmOnBhcmFtczp4bWw6bnM6bWFyay0xLjAiPgogICAgPG1hcms6Y291cnQ+CiAg
-ICAgIDxtYXJrOmlkPjAwMDUyMjEzNzM0Njk4OTkxMzczNDY5ODk5LTY1NTM1PC9tYXJrOmlkPgog
-ICAgICA8bWFyazptYXJrTmFtZT5Fc3NhaSAmYW1wOyDDqXZhbHVhdGlvbjwvbWFyazptYXJrTmFt
-ZT4KICAgICAgPG1hcms6aG9sZGVyIGVudGl0bGVtZW50PSJvd25lciI+CiAgICAgICAgPG1hcms6
-b3JnPkFnZW5jZSBlbiBGcmFuY2U8L21hcms6b3JnPgogICAgICAgIDxtYXJrOmFkZHI+CiAgICAg
-ICAgICA8bWFyazpzdHJlZXQ+MTAgQXZlbnVlIFJvdXNzZWF1eDwvbWFyazpzdHJlZXQ+CiAgICAg
-ICAgICA8bWFyazpjaXR5PlZlcnNhaWxsZXM8L21hcms6Y2l0eT4KICAgICAgICAgIDxtYXJrOnBj
-PjMzMDgxPC9tYXJrOnBjPgogICAgICAgICAgPG1hcms6Y2M+RlI8L21hcms6Y2M+CiAgICAgICAg
-PC9tYXJrOmFkZHI+CiAgICAgIDwvbWFyazpob2xkZXI+CiAgICAgIDxtYXJrOmNvbnRhY3QgdHlw
-ZT0iYWdlbnQiPgogICAgICAgIDxtYXJrOm5hbWU+RnJhbmMgTGVicnVuPC9tYXJrOm5hbWU+CiAg
-ICAgICAgPG1hcms6b3JnPkFnZW5jZSBlbiBGcmFuY2U8L21hcms6b3JnPgogICAgICAgIDxtYXJr
-OmFkZHI+CiAgICAgICAgICA8bWFyazpzdHJlZXQ+MTAgQXZlbnVlIFJvdXNzZWF1eDwvbWFyazpz
-dHJlZXQ+CiAgICAgICAgICA8bWFyazpjaXR5PlZlcnNhaWxsZXM8L21hcms6Y2l0eT4KICAgICAg
-ICAgIDxtYXJrOnBjPjMzMDgxPC9tYXJrOnBjPgogICAgICAgICAgPG1hcms6Y2M+RlI8L21hcms6
-Y2M+CiAgICAgICAgPC9tYXJrOmFkZHI+CiAgICAgICAgPG1hcms6dm9pY2U+KzMzLjEyNTc4MTI1
-MDwvbWFyazp2b2ljZT4KICAgICAgICA8bWFyazpmYXg+KzMzLjEyNTc4MTI1MTwvbWFyazpmYXg+
-CiAgICAgICAgPG1hcms6ZW1haWw+aW5mb0BhZ2VuY2UtZW4tZnJhbmNlLmZyPC9tYXJrOmVtYWls
-PgogICAgICA8L21hcms6Y29udGFjdD4KICAgICAgPG1hcms6bGFiZWw+eG4tLWVzc2FpZXQtdmFs
-dWF0aW9uLWl0YjwvbWFyazpsYWJlbD4KICAgICAgPG1hcms6bGFiZWw+eG4tLWVzc2FpLXZhbHVh
-dGlvbi1nbmI8L21hcms6bGFiZWw+CiAgICAgIDxtYXJrOmxhYmVsPnhuLS1lc3NhaS1ldC12YWx1
-YXRpb24tandiPC9tYXJrOmxhYmVsPgogICAgICA8bWFyazpsYWJlbD54bi0tZXNzYWktZXR2YWx1
-YXRpb24taXRiPC9tYXJrOmxhYmVsPgogICAgICA8bWFyazpsYWJlbD54bi0tZXNzYWktLXZhbHVh
-dGlvbi1ocWI8L21hcms6bGFiZWw+CiAgICAgIDxtYXJrOmxhYmVsPnhuLS1lc3NhaWV0dmFsdWF0
-aW9uLWhxYjwvbWFyazpsYWJlbD4KICAgICAgPG1hcms6bGFiZWw+eG4tLWVzc2FpdmFsdWF0aW9u
-LWZrYjwvbWFyazpsYWJlbD4KICAgICAgPG1hcms6bGFiZWw+eG4tLWVzc2FpLS0tdmFsdWF0aW9u
-LWl0YjwvbWFyazpsYWJlbD4KICAgICAgPG1hcms6Z29vZHNBbmRTZXJ2aWNlcz5JbnN0cnVtZW50
-cyBtdXNpY2F1eDwvbWFyazpnb29kc0FuZFNlcnZpY2VzPgogICAgICA8bWFyazpyZWZOdW0+MTIz
-NDwvbWFyazpyZWZOdW0+CiAgICAgIDxtYXJrOnByb0RhdGU+MjAxMi0xMi0zMVQyMzowMDowMC4w
-MDBaPC9tYXJrOnByb0RhdGU+CiAgICAgIDxtYXJrOmNjPkZSPC9tYXJrOmNjPgogICAgICA8bWFy
-azpjb3VydE5hbWU+Z3VpdGFyZTwvbWFyazpjb3VydE5hbWU+CiAgICA8L21hcms6Y291cnQ+CiAg
-PC9tYXJrOm1hcms+CjxkczpTaWduYXR1cmUgeG1sbnM6ZHM9Imh0dHA6Ly93d3cudzMub3JnLzIw
-MDAvMDkveG1sZHNpZyMiIElkPSJfMTdhZjAyMDUtY2RiMy00MDIwLWE4NWYtZDc5NjA5YmRkMjEw
-Ij48ZHM6U2lnbmVkSW5mbz48ZHM6Q2Fub25pY2FsaXphdGlvbk1ldGhvZCBBbGdvcml0aG09Imh0
-dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjxkczpTaWduYXR1cmVNZXRo
-b2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGRzaWctbW9yZSNyc2Et
-c2hhMjU2Ii8+PGRzOlJlZmVyZW5jZSBVUkk9IiNfMjY1YzAxMTItMjhkYy00NDc5LTk3NzctZDU2
-ODU5OThlY2U4Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDov
-L3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48ZHM6VHJh
-bnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4j
-Ii8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3
-LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+Mlc5Ulc0MWpx
-d0toMVFaQXdpNVJzdXo5MnNOcUs2bEF2cGFyUGZWZU4wVT08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6
-UmVmZXJlbmNlPjxkczpSZWZlcmVuY2UgVVJJPSIjX2NjMTI4YmViLTRiZmUtNDdmZS1hYmU0LTdj
-NmQxMWQ4YzNkMCI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6
-Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6
-RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxlbmMj
-c2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPm1nbWVIcGI4SGt6MUk2L2d3cE1Bb2U2Y3A5eEdKT0Zi
-WHBOcnc2dDlQRGM9PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48L2RzOlNpZ25lZElu
-Zm8+PGRzOlNpZ25hdHVyZVZhbHVlIElkPSJfOWQ0MmMyNjktMGUzMS00ZjlhLTg3NDAtYjM1ZGZh
-MjAwNWVlIj5uM3dvODRQNi9RY1ZMMHgwNHhGZmhodzVocmdWdktuc0p0NnpMdXFxbFptenBXTk45
-UmpZenByUEtHKzZvcXQwSTRDd2ZFRldWWWFRCmF1eVF2RkNEcXU3d1NVemFVaElQOEJaVitlRnRT
-QktTMTd3RkRHVHo2TUtYbVhPWU8wSjRUbk1SYU1vUEV3MWR3OVp6eXZnMzhZL3cKZEo2RU1ZZmhk
-akdodU5BSlZuZDBEalVrenEzZHdzUGVNdjZDMmtlRWtKSUNXNHVyblZMUndBbmhRd0FGcFFkUnRC
-UEphZ2FjcmxoSwpvRXAyajhrdmFOTkwzci9DNTl0OEV3UzJCc3ErVVdSSmVTdEV6R1hqUjBHYklR
-YkdWL3lXUnNwNTFFSUcxNFhVd0ZLdnd1blREMVh2CmRlVWRMcS80VW1BRGdkUnlaWDNGMy9QN2dG
-YlU1bW1CUCtYZXd3PT08L2RzOlNpZ25hdHVyZVZhbHVlPjxkczpLZXlJbmZvIElkPSJfY2MxMjhi
-ZWItNGJmZS00N2ZlLWFiZTQtN2M2ZDExZDhjM2QwIj48ZHM6WDUwOURhdGE+PGRzOlg1MDlDZXJ0
-aWZpY2F0ZT5NSUlGTnpDQ0JCK2dBd0lCQWdJZ0xyQWJldm9hZTUyeTNmNkMydEIwU24zcDdYSm0w
-VDAyRm9neEtDZk5oWHN3RFFZSktvWklodmNOCkFRRUxCUUF3ZkRFTE1Ba0dBMVVFQmhNQ1ZWTXhQ
-REE2QmdOVkJBb1RNMGx1ZEdWeWJtVjBJRU52Y25CdmNtRjBhVzl1SUdadmNpQkIKYzNOcFoyNWxa
-Q0JPWVcxbGN5QmhibVFnVG5WdFltVnljekV2TUMwR0ExVUVBeE1tU1VOQlRrNGdWSEpoWkdWdFlY
-SnJJRU5zWldGeQphVzVuYUc5MWMyVWdVR2xzYjNRZ1EwRXdIaGNOTVRNd056QTVNREF3TURBd1do
-Y05NVGd3TnpBNE1qTTFPVFU1V2pDQmx6RUxNQWtHCkExVUVCaE1DUWtVeElEQWVCZ05WQkFnVEYw
-SnlkWE56Wld4ekxVTmhjR2wwWVd3Z1VtVm5hVzl1TVJFd0R3WURWUVFIRXdoQ2NuVnoKYzJWc2N6
-RVJNQThHQTFVRUNoTUlSR1ZzYjJsMGRHVXhRREErQmdOVkJBTVROMUpGVms5TFJVUWdTVU5CVGs0
-Z1ZFMURTQ0JCZFhSbwpiM0pwZW1Wa0lGUnlZV1JsYldGeWF5QlFhV3h2ZENCV1lXeHBaR0YwYjNJ
-d2dnRWlNQTBHQ1NxR1NJYjNEUUVCQVFVQUE0SUJEd0F3CmdnRUtBb0lCQVFDdE10UVN6dFJPY1FG
-ZUpITm4veVFNWW5WWmFxVXBFR2h1UXo0czlDZVBRejFiMDNWbG5ZeWphTlZrNUxza0dKRmkKc1Jn
-aVpOQkFqamp0bDJBVnpENVk4bXdtcENWMjRSME50cktBZmxuRzZDQTE1ckJUc0hVRkRmNkJhcXlN
-YWl6QXM0UUlBR2hkV09WNwo5R3kzd254V1NtdkNrQnQ1QlBrYU1vVjN4a1V2WGwvTys5Q0NGZUgw
-VWVCcHM1aTNyN0E1M2Y3WDVqanVVdXNnaE9EN0dWdlkwTk43CmljbHVTK2NXRW9SQTV3UElNL2Y5
-YkNBRkZOZ0J2S0tuWEN0VHRJTG5QM0JjblN0YkpnaHRJT2JTZWprYWVpZE1EMlhsem1qOHV3SVAK
-dHBWYnNkWVZ4QWhndDUyc2VRdnpGUzRFV1hycE94L2xGN0ZQU0xKMGk5ckRUMWJCQWdNQkFBR2pn
-Z0dITUlJQmd6QU1CZ05WSFJNQgpBZjhFQWpBQU1CMEdBMVVkRGdRV0JCUjg4dGdhR05JUFdyRm81
-Z2ZmUXUwWmZTZlZoRENCeGdZRFZSMGpCSUcrTUlHN2dCVERyVDZtCjFoRUFSWUJjT2xkS2ltM2NN
-UTJlY2FHQmdLUitNSHd4Q3pBSkJnTlZCQVlUQWxWVE1Ud3dPZ1lEVlFRS0V6TkpiblJsY201bGRD
-QkQKYjNKd2IzSmhkR2x2YmlCbWIzSWdRWE56YVdkdVpXUWdUbUZ0WlhNZ1lXNWtJRTUxYldKbGNu
-TXhMekF0QmdOVkJBTVRKa2xEUVU1TwpJRlJ5WVdSbGJXRnlheUJEYkdWaGNtbHVaMmh2ZFhObElG
-QnBiRzkwSUVOQmdpQXVzQnQ2K2hwN25iTGQvb0xhMEhSS2ZlbnRjbWJSClBUWVdpREVvSjgyRmVU
-QU9CZ05WSFE4QkFmOEVCQU1DQjRBd05BWURWUjBmQkMwd0t6QXBvQ2VnSllZamFIUjBjRG92TDJO
-eWJDNXAKWTJGdWJpNXZjbWN2ZEcxamFGOXdhV3h2ZEM1amNtd3dSUVlEVlIwZ0JENHdQREE2QmdN
-cUF3UXdNekF4QmdnckJnRUZCUWNDQVJZbAphSFIwY0RvdkwzZDNkeTVwWTJGdWJpNXZjbWN2Y0ds
-c2IzUmZjbVZ3YjNOcGRHOXllVEFOQmdrcWhraUc5dzBCQVFzRkFBT0NBUUVBCnVqbDZmNmU2RCtJ
-SnVGZUJSNFJQaFZvZ0VMSkc2L1grNG4xZG5MU0RwL3Yya29JbmZRcVNxUmNSazN4dXRoWWp6N3Y2
-eTNwN29XNmIKdHMzQlR2UUlNZXU1SjRUSWtiT2pObFZnYW8vamU5Zi9nVDdpSzVEYUpXSEZRcG5Z
-bnZqWGhRM1Y2UmtTN2RKbDRGWkVpeTZwTDhtNQpYMXA1cEN6Y0ZxT3lNL3dSOEt6ZkJVWCtLaFhh
-QVdndHVEZWtBVG1SNXlDRmdQbUFvWmZQa3BVRmdNSnBZNVljUnUrSzI0V1ZudDRZClc3eXcvR0Y1
-aTZkcFRVdHBGTTcvWVVBcnpwZGZVK2Vjb25ZNGRNS2RaNnNLOGZhajRpVUlHK0tFY3pzWTFtOTg5
-VklicHRneERWczUKRmVNNGdWL0g3d2FNbW1aZHlZUDRwWVJDM3lkSE9rYmJaZ2xYWnc9PTwvZHM6
-WDUwOUNlcnRpZmljYXRlPjwvZHM6WDUwOURhdGE+PC9kczpLZXlJbmZvPjwvZHM6U2lnbmF0dXJl
-Pjwvc21kOnNpZ25lZE1hcms+
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/revoked/tmv/TMVRevoked-Trademark-Agent-Arab-Active.smd b/core/src/test/resources/google/registry/tmch/revoked/tmv/TMVRevoked-Trademark-Agent-Arab-Active.smd
deleted file mode 100644
index b54accb8a..000000000
--- a/core/src/test/resources/google/registry/tmch/revoked/tmv/TMVRevoked-Trademark-Agent-Arab-Active.smd
+++ /dev/null
@@ -1,100 +0,0 @@
-Marks: الاختبار & لتقييم
-smdID: 000000771527807316175-65535
-U-labels: xn------nzeaagpf7azb2ppajr3fa, xn-----btdaafne4a7azpoaiq8ea, xn----ymcaaeld1a4a6onahp3ea, xn--mgbaadjcy1a8mmago8da
-notBefore: 2018-05-31T22:55:16.175Z
-notAfter: 2022-08-18T14:27:18.209Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il8zMGQ1
-ODdlMS1lY2E4LTQ0YzEtOTZjOS03YTdkZGIyNWQ0MGUiPjxzbWQ6aWQ+MDAwMDAwNzcxNTI3ODA3
-MzE2MTc1LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0zMVQyMjo1NToxNi4xNzVaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0xOFQxNDoyNzoxOC4yMDlaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
-cmFkZW1hcms+PG1hcms6aWQ+MDAwMTQ0MTUwMzA2NjE5NTE1MDMwNjYxOTUtMTwvbWFyazppZD48
-bWFyazptYXJrTmFtZT7Yp9mE2KfYrtiq2KjYp9ixICZhbXA7INmE2KrZgtmK2YrZhTwvbWFyazpt
-YXJrTmFtZT48bWFyazpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpuYW1lPtmF2YfZ
-htiv2LMg2KfZhNmF2LnZhNmI2YXYp9iq2YrYqTwvbWFyazpuYW1lPjxtYXJrOmFkZHI+PG1hcms6
-c3RyZWV0Ptis2LnZgdixINin2KjZhiDYs9mK2YbYp9ihIDc1PC9tYXJrOnN0cmVldD48bWFyazpj
-aXR5PtmF2YPZhtin2LM8L21hcms6Y2l0eT48bWFyazpwYz4yOTAwPC9tYXJrOnBjPjxtYXJrOmNj
-Pk1BPC9tYXJrOmNjPjwvbWFyazphZGRyPjwvbWFyazpob2xkZXI+PG1hcms6Y29udGFjdCB0eXBl
-PSJhZ2VudCI+PG1hcms6bmFtZT7ZhdmH2YbYr9izINin2YTZhdi52YTZiNmF2KfYqtmK2Kk8L21h
-cms6bmFtZT48bWFyazpvcmc+2YjZg9in2YTYqTwvbWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpz
-dHJlZXQ+2LTYp9ix2Lkg2KzYudmB2LEg2KfYqNmGINiz2YrZhtin2KEgNzU8L21hcms6c3RyZWV0
-PjxtYXJrOmNpdHk+2YXZg9mG2KfYszwvbWFyazpjaXR5PjxtYXJrOnBjPjI5MDA8L21hcms6cGM+
-PG1hcms6Y2M+TUE8L21hcms6Y2M+PC9tYXJrOmFkZHI+PG1hcms6dm9pY2U+KzIxMi41MjI1Mzkw
-NDA8L21hcms6dm9pY2U+PG1hcms6ZmF4PisyMTIuNTIyNTM5MDQxPC9tYXJrOmZheD48bWFyazpl
-bWFpbD5pbmZvQGFnZW5jeS1tYXJvY2NvLmNvbTwvbWFyazplbWFpbD48L21hcms6Y29udGFjdD48
-bWFyazpqdXJpc2RpY3Rpb24+VVM8L21hcms6anVyaXNkaWN0aW9uPjxtYXJrOmNsYXNzPjE1PC9t
-YXJrOmNsYXNzPjxtYXJrOmxhYmVsPnhuLS0tLS0tbnplYWFncGY3YXpiMnBwYWpyM2ZhPC9tYXJr
-OmxhYmVsPjxtYXJrOmxhYmVsPnhuLS0tLS1idGRhYWZuZTRhN2F6cG9haXE4ZWE8L21hcms6bGFi
-ZWw+PG1hcms6bGFiZWw+eG4tLS0teW1jYWFlbGQxYTRhNm9uYWhwM2VhPC9tYXJrOmxhYmVsPjxt
-YXJrOmxhYmVsPnhuLS1tZ2JhYWRqY3kxYThtbWFnbzhkYTwvbWFyazpsYWJlbD48bWFyazpnb29k
-c0FuZFNlcnZpY2VzPti62YrYqtin2LE8L21hcms6Z29vZHNBbmRTZXJ2aWNlcz48bWFyazpyZWdO
-dW0+MTIzNDwvbWFyazpyZWdOdW0+PG1hcms6cmVnRGF0ZT4yMDEzLTAxLTAxVDAwOjAwOjAwLjAw
-MFo8L21hcms6cmVnRGF0ZT48L21hcms6dHJhZGVtYXJrPjwvbWFyazptYXJrPjxkczpTaWduYXR1
-cmUgeG1sbnM6ZHM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1sZHNpZyMiIElkPSJfYzBj
-NjA3Y2UtMzg1ZC00MzQ4LTgzYTctMGEzNDk5OTg4MWVlIj48ZHM6U2lnbmVkSW5mbz48ZHM6Q2Fu
-b25pY2FsaXphdGlvbk1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAv
-eG1sLWV4Yy1jMTRuIyIvPjxkczpTaWduYXR1cmVNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3
-LnczLm9yZy8yMDAxLzA0L3htbGRzaWctbW9yZSNyc2Etc2hhMjU2Ii8+PGRzOlJlZmVyZW5jZSBV
-Ukk9IiNfMzBkNTg3ZTEtZWNhOC00NGMxLTk2YzktN2E3ZGRiMjVkNDBlIj48ZHM6VHJhbnNmb3Jt
-cz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxk
-c2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDov
-L3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpE
-aWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNz
-aGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+aWFGa3dBM1hwQzhHMGM1YWV3a1VqZkV0SmlJRkhHK2Zh
-YzQyQ1VCbXVxZz08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNlPjxkczpSZWZlcmVuY2Ug
-VVJJPSIjX2I1ZTc4YWU2LTAwODYtNDZmOC04ZjI5LTBlNjI1OGE1ZjgxMCI+PGRzOlRyYW5zZm9y
-bXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1s
-LWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0i
-aHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxlbmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVl
-PlV5bFlNVXJsZzYvM1JuVVEzSDV5bUtLRjFWS0xyVUlReEdmSTdCMCt0clk9PC9kczpEaWdlc3RW
-YWx1ZT48L2RzOlJlZmVyZW5jZT48L2RzOlNpZ25lZEluZm8+PGRzOlNpZ25hdHVyZVZhbHVlIElk
-PSJfMTM2MTZlZDMtNjNmZC00NDA2LTg1MDktZWM0MzFkNjFhN2MxIj5peTlod3FlTmNTSGdSMnFl
-TjFtYUNSbGY1RUFmQmYxSFcxejhNRVRyclQxUWdGKy9xRCtuMGVTT0YxampEVHpLMGVOSDdMdkhs
-UjdSCmZqLzJTSzA3QzZTU0V4ekV6Rm01cTV4bDlHalplQlN6ZFFENzVZck8xQ3pqZDZzbUNKVmFx
-Nnh6L09pR1lKMzRRWmg1eTFaRzVjc2cKRHdTSkFjc1RTMDRiSkp3Ujk1NGZydnR4NCtvbTduSXQ4
-bFpjVktoaUVQSnMrbW9tOVRvc2lqa3NITndGSXJ1SE8wMSswTjBob002dgp6STI1Tkxxbzk2Q2ly
-V1hkYlV6UlBNWS85eGFPb20xR1pqelNiRVl0RWMrcExQWDBjKzZHWGJwcG1sd2lxUkYrTE5scHEz
-N21WcXBYCkVDWHkxYm80dHBtcTlDaFlEb1RtazFIMU5SR0FGYWRQS3czbXhRPT08L2RzOlNpZ25h
-dHVyZVZhbHVlPjxkczpLZXlJbmZvIElkPSJfYjVlNzhhZTYtMDA4Ni00NmY4LThmMjktMGU2MjU4
-YTVmODEwIj48ZHM6WDUwOURhdGE+PGRzOlg1MDlDZXJ0aWZpY2F0ZT5NSUlGUXpDQ0JDdWdBd0lC
-QWdJZ0xyQWJldm9hZTUyeTNmNkMydEIwU24zcDdYSm0wVDAyRm9neEtDZk5oWmd3RFFZSktvWklo
-dmNOCkFRRUxCUUF3ZkRFTE1Ba0dBMVVFQmhNQ1ZWTXhQREE2QmdOVkJBb1RNMGx1ZEdWeWJtVjBJ
-RU52Y25CdmNtRjBhVzl1SUdadmNpQkIKYzNOcFoyNWxaQ0JPWVcxbGN5QmhibVFnVG5WdFltVnlj
-ekV2TUMwR0ExVUVBeE1tU1VOQlRrNGdWSEpoWkdWdFlYSnJJRU5zWldGeQphVzVuYUc5MWMyVWdV
-R2xzYjNRZ1EwRXdIaGNOTVRnd01qSTRNREF3TURBd1doY05Nak13TXpNeE1qTTFPVFU1V2pDQmx6
-RUxNQWtHCkExVUVCaE1DUWtVeElEQWVCZ05WQkFnVEYwSnlkWE56Wld4ekxVTmhjR2wwWVd3Z1Vt
-Vm5hVzl1TVJFd0R3WURWUVFIRXdoQ2NuVnoKYzJWc2N6RVJNQThHQTFVRUNoTUlSR1ZzYjJsMGRH
-VXhRREErQmdOVkJBTVROMUpGVms5TFJVUWdTVU5CVGs0Z1ZFMURTQ0JCZFhSbwpiM0pwZW1Wa0lG
-UnlZV1JsYldGeWF5QlFhV3h2ZENCV1lXeHBaR0YwYjNJd2dnRWlNQTBHQ1NxR1NJYjNEUUVCQVFV
-QUE0SUJEd0F3CmdnRUtBb0lCQVFER1duY3FsZ2RmZGJJQ3dXRktUY3ZCWitjYVhHZFFNV29Wa0Rk
-U2k0eGlQOWVLQnN5UTE0UmNpT1dSRTRwUGc0OFoKOUhIOHNESkdWQkNNSXkvaXFGdVJ4ZldudHF2
-cmQrV3JoSmsxVnlYWG1YdUhTNVBud1hOSitlWFBTN211UWQ4a2lZUGpmNlpvLy95QwovZm9WSGJ1
-TmJ4SDNCamlHVDVhemdnSFNJVkozeEplL1VxdnpEOG1ZeEJJT1NLNGI1RjhpSzV2QkQ5L0xzU1NQ
-bEJhRTluRDZZekUwCnFjZFF2TGZGalBZdkJWOSsyUEJTNTVweStvMUVLUXhlVUtVNEFPcDlQeWhK
-bWg0TmQ2RWUrVSt3c0o2WVlHaE1xNnV5UWhMcjBYVEkKOFFmbURON1FmNS93VkU2d2lncEt4VkRm
-Z0hoTCtPZ1RydWVtd2s5TjBxdzA4bFBKQWdNQkFBR2pnZ0dUTUlJQmp6QU1CZ05WSFJNQgpBZjhF
-QWpBQU1CMEdBMVVkRGdRV0JCU2dXbGp2cW5uS2cwTkVhMUNuTlc1SHpWUlpEVENCeGdZRFZSMGpC
-SUcrTUlHN2dCVERyVDZtCjFoRUFSWUJjT2xkS2ltM2NNUTJlY2FHQmdLUitNSHd4Q3pBSkJnTlZC
-QVlUQWxWVE1Ud3dPZ1lEVlFRS0V6TkpiblJsY201bGRDQkQKYjNKd2IzSmhkR2x2YmlCbWIzSWdR
-WE56YVdkdVpXUWdUbUZ0WlhNZ1lXNWtJRTUxYldKbGNuTXhMekF0QmdOVkJBTVRKa2xEUVU1TwpJ
-RlJ5WVdSbGJXRnlheUJEYkdWaGNtbHVaMmh2ZFhObElGQnBiRzkwSUVOQmdpQXVzQnQ2K2hwN25i
-TGQvb0xhMEhSS2ZlbnRjbWJSClBUWVdpREVvSjgyRmVUQU9CZ05WSFE4QkFmOEVCQU1DQjRBd05B
-WURWUjBmQkMwd0t6QXBvQ2VnSllZamFIUjBjRG92TDJOeWJDNXAKWTJGdWJpNXZjbWN2ZEcxamFG
-OXdhV3h2ZEM1amNtd3dVUVlEVlIwZ0JFb3dTREFRQmc0ckJnRUVBWUxKR3dFRmd6c01DakEwQmdn
-cgpCZ0VGQlFjQ0FUQW9NQ1lHQ0NzR0FRVUZCd0lCRmhwb2RIUndjem92TDJOaExtbGpZVzV1TG05
-eVp5OXdhV3h2ZERBTkJna3Foa2lHCjl3MEJBUXNGQUFPQ0FRRUFtRnRjOVRjY1grVTFXSVdqVjV0
-aDBsQ1dLWlBBMUZqNDJtcVpSdEN1YzZwem5iRFpQZ1hnSE5OUzAxYnUKSWN2TVVmVFQwNldqUG9z
-VWZjRjJqdWc2Z1BiTTlaWXRvSnYxRURSTTVpQ2hGVXhTdTNmMG40WkJNSEhZQzdhT0U1UHdmUnNp
-WS9tdgphVjNpRDdOeDZGOXl1Qkt0bGxJeHNOelFFaytLdXBjQVE4QmpITWx1VFcvRTE2a2lla2V2
-VFNicUk5SExYWEFFd2c1WFpUcWVUSHk1ClpCU3NKNzFDbzZkeEt1VFF4TTJVTkYrUklBbElaWG9k
-dXk2WStuTnlUWHMwQVJYeEh0bFZkZVVUMCtOU0JseHNsZm4xQ3g5YlJGa00KYXRkODY5SjQyaDJH
-Y052MXROQnM0WTZFTTFkREcwcUFWZGZpSUJkSW1tRXVtOWlCd2lXdzl3PT08L2RzOlg1MDlDZXJ0
-aWZpY2F0ZT48L2RzOlg1MDlEYXRhPjwvZHM6S2V5SW5mbz48L2RzOlNpZ25hdHVyZT48L3NtZDpz
-aWduZWRNYXJrPg==
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/revoked/tmv/TMVRevoked-Trademark-Agent-Chinese-Active.smd b/core/src/test/resources/google/registry/tmch/revoked/tmv/TMVRevoked-Trademark-Agent-Chinese-Active.smd
deleted file mode 100644
index 464fcb1e7..000000000
--- a/core/src/test/resources/google/registry/tmch/revoked/tmv/TMVRevoked-Trademark-Agent-Chinese-Active.smd
+++ /dev/null
@@ -1,98 +0,0 @@
-Marks: 审判&错误
-smdID: 000000801527807318205-65535
-U-labels: xn----ke8al50aln4ceuj, xn--and-ui2eu74b9t4egon, xn--et-pg5cw37ax04dfrl, xn--fcr14u8t4bdxh
-notBefore: 2018-05-31T22:55:18.205Z
-notAfter: 2022-08-18T14:36:50.931Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il9jY2Jm
-YTYzMS03ZDVlLTRiOWMtYTFmNi04ZTg2YzlkZjBkMmMiPjxzbWQ6aWQ+MDAwMDAwODAxNTI3ODA3
-MzE4MjA1LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0zMVQyMjo1NToxOC4yMDVaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0xOFQxNDozNjo1MC45MzFaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
-cmFkZW1hcms+PG1hcms6aWQ+MDAwMTQ2MTUwMzA2Njc5NTE1MDMwNjY3OTUtMTwvbWFyazppZD48
-bWFyazptYXJrTmFtZT7lrqHliKQmYW1wO+mUmeivrzwvbWFyazptYXJrTmFtZT48bWFyazpob2xk
-ZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpvcmc+5bel56iL5aSEPC9tYXJrOm9yZz48bWFy
-azphZGRyPjxtYXJrOnN0cmVldD7pppnmuK/kuJzot6825Y+377yMNeWPt+alvO+8jDjlj7flrqQ8
-L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+6Z2S5bKb5biCPC9tYXJrOmNpdHk+PG1hcms6cGM+MzUw
-MDwvbWFyazpwYz48bWFyazpjYz5DTjwvbWFyazpjYz48L21hcms6YWRkcj48L21hcms6aG9sZGVy
-PjxtYXJrOmNvbnRhY3QgdHlwZT0iYWdlbnQiPjxtYXJrOm5hbWU+5p2O5bCP5pa5PC9tYXJrOm5h
-bWU+PG1hcms6b3JnPuW3peeoi+WkhDwvbWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpzdHJlZXQ+
-6aaZ5riv5Lic6LevNuWPt++8jDXlj7fmpbzvvIw45Y+35a6kPC9tYXJrOnN0cmVldD48bWFyazpj
-aXR5PumdkuWym+W4gjwvbWFyazpjaXR5PjxtYXJrOnBjPjM1MDA8L21hcms6cGM+PG1hcms6Y2M+
-Q048L21hcms6Y2M+PC9tYXJrOmFkZHI+PG1hcms6dm9pY2U+Kzg2LjEwODQ2NTcxNzM8L21hcms6
-dm9pY2U+PG1hcms6ZmF4Pis4Ni4xMDg0NjU3MTc1PC9tYXJrOmZheD48bWFyazplbWFpbD5pbmZv
-QGNoaW5lc2UtYWdlbmN5LmNvbTwvbWFyazplbWFpbD48L21hcms6Y29udGFjdD48bWFyazpqdXJp
-c2RpY3Rpb24+VVM8L21hcms6anVyaXNkaWN0aW9uPjxtYXJrOmNsYXNzPjE1PC9tYXJrOmNsYXNz
-PjxtYXJrOmxhYmVsPnhuLS0tLWtlOGFsNTBhbG40Y2V1ajwvbWFyazpsYWJlbD48bWFyazpsYWJl
-bD54bi0tYW5kLXVpMmV1NzRiOXQ0ZWdvbjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54bi0tZXQt
-cGc1Y3czN2F4MDRkZnJsPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1mY3IxNHU4dDRiZHho
-PC9tYXJrOmxhYmVsPjxtYXJrOmdvb2RzQW5kU2VydmljZXM+5ZCJ5LuWPC9tYXJrOmdvb2RzQW5k
-U2VydmljZXM+PG1hcms6cmVnTnVtPjEyMzQ8L21hcms6cmVnTnVtPjxtYXJrOnJlZ0RhdGU+MjAx
-My0wMS0wMVQwMDowMDowMC4wMDBaPC9tYXJrOnJlZ0RhdGU+PC9tYXJrOnRyYWRlbWFyaz48L21h
-cms6bWFyaz48ZHM6U2lnbmF0dXJlIHhtbG5zOmRzPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5
-L3htbGRzaWcjIiBJZD0iXzk1ZjljODZiLWQ3MWQtNDc4Mi05MzY0LWE0OTgxZDEzYTFlYyI+PGRz
-OlNpZ25lZEluZm8+PGRzOkNhbm9uaWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGhtPSJodHRwOi8v
-d3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJlTWV0aG9kIEFs
-Z29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxkc2lnLW1vcmUjcnNhLXNoYTI1
-NiIvPjxkczpSZWZlcmVuY2UgVVJJPSIjX2NjYmZhNjMxLTdkNWUtNGI5Yy1hMWY2LThlODZjOWRm
-MGQyYyI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cu
-dzMub3JnLzIwMDAvMDkveG1sZHNpZyNlbnZlbG9wZWQtc2lnbmF0dXJlIi8+PGRzOlRyYW5zZm9y
-bSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwv
-ZHM6VHJhbnNmb3Jtcz48ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5v
-cmcvMjAwMS8wNC94bWxlbmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPkYvclVuWUZPRGJkRXNZ
-V0FQSUJXYzcySENHOWJITE96Mkt6YTY0K3V5cWM9PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVy
-ZW5jZT48ZHM6UmVmZXJlbmNlIFVSST0iI180NDVkNmJhNC00YWNmLTQyNzEtYjEzOS1kY2FhMmJl
-NjBiZDciPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3
-LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2Vz
-dE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1
-NiIvPjxkczpEaWdlc3RWYWx1ZT5xZVA0eEIrdmo1VnU4ekZ4Vkw5ck8wK051VG16VEc5bDkyVzlk
-MVoyYVVJPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PC9kczpTaWduZWRJbmZvPjxk
-czpTaWduYXR1cmVWYWx1ZSBJZD0iXzc2ZGRmZGMyLTA0ZjUtNGI2Ni05ZmVmLTFiOWE5ZTE0ZDM0
-YiI+VzJJbmVEUUxBZ3NsR2NnZnBlL1BFdlAzdjNHWFRyTEdJOHFndHdaZmtjSU5oQTdnZFBzeU12
-NHBvQUdJVU9rUklCWGcxRk9PVDlDcQo4b2w2NGFVaWRnRmw3TlBVdDZ4QUZVTGcySFI2K3Y3Y3Uz
-ZVc2OUR1N3QvU2ZSUWRha29qYThFbFd3bjJ0cmtYSEs0cWRaelhoWGJpCjNWNDAvTGx2M1k4dk1T
-TjZXWTRqdFRpMTV3NDlSTGRVNS9FWjc3WkhFQjl3NWRVOWxOcDBTeGRiTlBQUWltKzNSQ1N1U2ZL
-MFhjamoKZjhoQjR4MHJqMjFvcmZ4ZzVGWDZlaTREREVnSTcwOHZKbFJIOGE1VHdjMWx3SEFsdUk0
-UGRPbkJZUUxBSjBzUFJZNjlTbU5jSGF0VQpXcnFkSXVwbXc3TmYwaDVZZlNEa1YwWThndlRTRWNI
-VTQyYXQ0UT09PC9kczpTaWduYXR1cmVWYWx1ZT48ZHM6S2V5SW5mbyBJZD0iXzQ0NWQ2YmE0LTRh
-Y2YtNDI3MS1iMTM5LWRjYWEyYmU2MGJkNyI+PGRzOlg1MDlEYXRhPjxkczpYNTA5Q2VydGlmaWNh
-dGU+TUlJRlF6Q0NCQ3VnQXdJQkFnSWdMckFiZXZvYWU1MnkzZjZDMnRCMFNuM3A3WEptMFQwMkZv
-Z3hLQ2ZOaFpnd0RRWUpLb1pJaHZjTgpBUUVMQlFBd2ZERUxNQWtHQTFVRUJoTUNWVk14UERBNkJn
-TlZCQW9UTTBsdWRHVnlibVYwSUVOdmNuQnZjbUYwYVc5dUlHWnZjaUJCCmMzTnBaMjVsWkNCT1lX
-MWxjeUJoYm1RZ1RuVnRZbVZ5Y3pFdk1DMEdBMVVFQXhNbVNVTkJUazRnVkhKaFpHVnRZWEpySUVO
-c1pXRnkKYVc1bmFHOTFjMlVnVUdsc2IzUWdRMEV3SGhjTk1UZ3dNakk0TURBd01EQXdXaGNOTWpN
-d016TXhNak0xT1RVNVdqQ0JsekVMTUFrRwpBMVVFQmhNQ1FrVXhJREFlQmdOVkJBZ1RGMEp5ZFhO
-elpXeHpMVU5oY0dsMFlXd2dVbVZuYVc5dU1SRXdEd1lEVlFRSEV3aENjblZ6CmMyVnNjekVSTUE4
-R0ExVUVDaE1JUkdWc2IybDBkR1V4UURBK0JnTlZCQU1UTjFKRlZrOUxSVVFnU1VOQlRrNGdWRTFE
-U0NCQmRYUm8KYjNKcGVtVmtJRlJ5WVdSbGJXRnlheUJRYVd4dmRDQldZV3hwWkdGMGIzSXdnZ0Vp
-TUEwR0NTcUdTSWIzRFFFQkFRVUFBNElCRHdBdwpnZ0VLQW9JQkFRREdXbmNxbGdkZmRiSUN3V0ZL
-VGN2QlorY2FYR2RRTVdvVmtEZFNpNHhpUDllS0JzeVExNFJjaU9XUkU0cFBnNDhaCjlISDhzREpH
-VkJDTUl5L2lxRnVSeGZXbnRxdnJkK1dyaEprMVZ5WFhtWHVIUzVQbndYTkorZVhQUzdtdVFkOGtp
-WVBqZjZaby8veUMKL2ZvVkhidU5ieEgzQmppR1Q1YXpnZ0hTSVZKM3hKZS9VcXZ6RDhtWXhCSU9T
-SzRiNUY4aUs1dkJEOS9Mc1NTUGxCYUU5bkQ2WXpFMApxY2RRdkxmRmpQWXZCVjkrMlBCUzU1cHkr
-bzFFS1F4ZVVLVTRBT3A5UHloSm1oNE5kNkVlK1Urd3NKNllZR2hNcTZ1eVFoTHIwWFRJCjhRZm1E
-TjdRZjUvd1ZFNndpZ3BLeFZEZmdIaEwrT2dUcnVlbXdrOU4wcXcwOGxQSkFnTUJBQUdqZ2dHVE1J
-SUJqekFNQmdOVkhSTUIKQWY4RUFqQUFNQjBHQTFVZERnUVdCQlNnV2xqdnFubktnME5FYTFDbk5X
-NUh6VlJaRFRDQnhnWURWUjBqQklHK01JRzdnQlREclQ2bQoxaEVBUllCY09sZEtpbTNjTVEyZWNh
-R0JnS1IrTUh3eEN6QUpCZ05WQkFZVEFsVlRNVHd3T2dZRFZRUUtFek5KYm5SbGNtNWxkQ0JECmIz
-SndiM0poZEdsdmJpQm1iM0lnUVhOemFXZHVaV1FnVG1GdFpYTWdZVzVrSUU1MWJXSmxjbk14THpB
-dEJnTlZCQU1USmtsRFFVNU8KSUZSeVlXUmxiV0Z5YXlCRGJHVmhjbWx1WjJodmRYTmxJRkJwYkc5
-MElFTkJnaUF1c0J0NitocDduYkxkL29MYTBIUktmZW50Y21iUgpQVFlXaURFb0o4MkZlVEFPQmdO
-VkhROEJBZjhFQkFNQ0I0QXdOQVlEVlIwZkJDMHdLekFwb0NlZ0pZWWphSFIwY0RvdkwyTnliQzVw
-ClkyRnViaTV2Y21jdmRHMWphRjl3YVd4dmRDNWpjbXd3VVFZRFZSMGdCRW93U0RBUUJnNHJCZ0VF
-QVlMSkd3RUZnenNNQ2pBMEJnZ3IKQmdFRkJRY0NBVEFvTUNZR0NDc0dBUVVGQndJQkZocG9kSFJ3
-Y3pvdkwyTmhMbWxqWVc1dUxtOXlaeTl3YVd4dmREQU5CZ2txaGtpRwo5dzBCQVFzRkFBT0NBUUVB
-bUZ0YzlUY2NYK1UxV0lXalY1dGgwbENXS1pQQTFGajQybXFaUnRDdWM2cHpuYkRaUGdYZ0hOTlMw
-MWJ1Ckljdk1VZlRUMDZXalBvc1VmY0YyanVnNmdQYk05Wll0b0p2MUVEUk01aUNoRlV4U3UzZjBu
-NFpCTUhIWUM3YU9FNVB3ZlJzaVkvbXYKYVYzaUQ3Tng2Rjl5dUJLdGxsSXhzTnpRRWsrS3VwY0FR
-OEJqSE1sdVRXL0UxNmtpZWtldlRTYnFJOUhMWFhBRXdnNVhaVHFlVEh5NQpaQlNzSjcxQ282ZHhL
-dVRReE0yVU5GK1JJQWxJWlhvZHV5Nlkrbk55VFhzMEFSWHhIdGxWZGVVVDArTlNCbHhzbGZuMUN4
-OWJSRmtNCmF0ZDg2OUo0MmgyR2NOdjF0TkJzNFk2RU0xZERHMHFBVmRmaUlCZEltbUV1bTlpQndp
-V3c5dz09PC9kczpYNTA5Q2VydGlmaWNhdGU+PC9kczpYNTA5RGF0YT48L2RzOktleUluZm8+PC9k
-czpTaWduYXR1cmU+PC9zbWQ6c2lnbmVkTWFyaz4=
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/revoked/tmv/TMVRevoked-Trademark-Agent-English-Active.smd b/core/src/test/resources/google/registry/tmch/revoked/tmv/TMVRevoked-Trademark-Agent-English-Active.smd
deleted file mode 100644
index af3b9daed..000000000
--- a/core/src/test/resources/google/registry/tmch/revoked/tmv/TMVRevoked-Trademark-Agent-English-Active.smd
+++ /dev/null
@@ -1,102 +0,0 @@
-Marks: Test & Validate
-smdID: 000000871527807322259-65535
-U-labels: test---validate, test--validate, test-and-validate, test-andvalidate, test-validate, testand-validate, testandvalidate, testet-validate, testetvalidate, testvalidate
-notBefore: 2018-05-31T22:55:22.259Z
-notAfter: 2022-08-18T14:57:36.681Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il8wZjE0
-MzA0Zi0xY2VkLTRkYTgtYWU5Ni1iZWUwZDY2MGRiNmUiPjxzbWQ6aWQ+MDAwMDAwODcxNTI3ODA3
-MzIyMjU5LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0zMVQyMjo1NToyMi4yNTlaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0xOFQxNDo1NzozNi42ODFaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
-cmFkZW1hcms+PG1hcms6aWQ+MDAwMTM3MTUwMzA2ODA0OTE1MDMwNjgwNDktMTwvbWFyazppZD48
-bWFyazptYXJrTmFtZT5UZXN0ICZhbXA7IFZhbGlkYXRlPC9tYXJrOm1hcmtOYW1lPjxtYXJrOmhv
-bGRlciBlbnRpdGxlbWVudD0ib3duZXIiPjxtYXJrOm5hbWU+VG9ueSBIb2xsYW5kPC9tYXJrOm5h
-bWU+PG1hcms6b3JnPkFnIGNvcnBvcmF0aW9uPC9tYXJrOm9yZz48bWFyazphZGRyPjxtYXJrOnN0
-cmVldD4xMzA1IEJyaWdodCBBdmVudWU8L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+QXJjYWRpYTwv
-bWFyazpjaXR5PjxtYXJrOnBjPjkwMDI4PC9tYXJrOnBjPjxtYXJrOmNjPlVTPC9tYXJrOmNjPjwv
-bWFyazphZGRyPjwvbWFyazpob2xkZXI+PG1hcms6Y29udGFjdCB0eXBlPSJhZ2VudCI+PG1hcms6
-bmFtZT5Ub255IEhvbGxhbmQ8L21hcms6bmFtZT48bWFyazpvcmc+QWcgY29ycG9yYXRpb248L21h
-cms6b3JnPjxtYXJrOmFkZHI+PG1hcms6c3RyZWV0PkJyaWdodCBBdmVudWUgMTMwNSA8L21hcms6
-c3RyZWV0PjxtYXJrOmNpdHk+QXJjYWRpYTwvbWFyazpjaXR5PjxtYXJrOnNwPkNBPC9tYXJrOnNw
-PjxtYXJrOnBjPjkwMDI4PC9tYXJrOnBjPjxtYXJrOmNjPlVTPC9tYXJrOmNjPjwvbWFyazphZGRy
-PjxtYXJrOnZvaWNlPisxLjIwMjU1NjIzMDI8L21hcms6dm9pY2U+PG1hcms6ZmF4PisxLjIwMjU1
-NjIzMDE8L21hcms6ZmF4PjxtYXJrOmVtYWlsPmluZm9AYWdjb3Jwb3JhdGlvbi5jb208L21hcms6
-ZW1haWw+PC9tYXJrOmNvbnRhY3Q+PG1hcms6anVyaXNkaWN0aW9uPlVTPC9tYXJrOmp1cmlzZGlj
-dGlvbj48bWFyazpjbGFzcz4xNTwvbWFyazpjbGFzcz48bWFyazpsYWJlbD50ZXN0LS0tdmFsaWRh
-dGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+dGVzdC0tdmFsaWRhdGU8L21hcms6bGFiZWw+PG1h
-cms6bGFiZWw+dGVzdC1hbmQtdmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+dGVzdC1h
-bmR2YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0LXZhbGlkYXRlPC9tYXJrOmxh
-YmVsPjxtYXJrOmxhYmVsPnRlc3RhbmQtdmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+
-dGVzdGFuZHZhbGlkYXRlPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnRlc3RldC12YWxpZGF0ZTwv
-bWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0ZXR2YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazps
-YWJlbD50ZXN0dmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6Z29vZHNBbmRTZXJ2aWNlcz5ndWl0
-YXI8L21hcms6Z29vZHNBbmRTZXJ2aWNlcz48bWFyazpyZWdOdW0+MTIzNDwvbWFyazpyZWdOdW0+
-PG1hcms6cmVnRGF0ZT4yMDEzLTAxLTAxVDAwOjAwOjAwLjAwMFo8L21hcms6cmVnRGF0ZT48L21h
-cms6dHJhZGVtYXJrPjwvbWFyazptYXJrPjxkczpTaWduYXR1cmUgeG1sbnM6ZHM9Imh0dHA6Ly93
-d3cudzMub3JnLzIwMDAvMDkveG1sZHNpZyMiIElkPSJfYTcyMDdjYjUtMDFkNS00NmI0LTlhOGMt
-MzU4NWI2ODhhNGM1Ij48ZHM6U2lnbmVkSW5mbz48ZHM6Q2Fub25pY2FsaXphdGlvbk1ldGhvZCBB
-bGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjxkczpT
-aWduYXR1cmVNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGRz
-aWctbW9yZSNyc2Etc2hhMjU2Ii8+PGRzOlJlZmVyZW5jZSBVUkk9IiNfMGYxNDMwNGYtMWNlZC00
-ZGE4LWFlOTYtYmVlMGQ2NjBkYjZlIj48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29y
-aXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1
-cmUiLz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94
-bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGht
-PSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFs
-dWU+WDdnZ3gxVDNhNFRhMldDMjhsWFBzUG1EWkRGQTNaR08wR2VnclliRFRqST08L2RzOkRpZ2Vz
-dFZhbHVlPjwvZHM6UmVmZXJlbmNlPjxkczpSZWZlcmVuY2UgVVJJPSIjXzAyMzZjNmNkLWEwMmQt
-NGNmNy1iOTM5LThkYWQwNjU2NzNlMSI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdv
-cml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJh
-bnNmb3Jtcz48ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAw
-MS8wNC94bWxlbmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPm5wWEZ6cVM4WmQ3YXJQZWR4Y0ZZ
-ZHc5endFd1B3VFplNjN5QXJhRDd6TlU9PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48
-L2RzOlNpZ25lZEluZm8+PGRzOlNpZ25hdHVyZVZhbHVlIElkPSJfM2I0MDE0OGMtYThkYy00Yzhi
-LWFkOWYtMDMxNzRlNzAwZjIzIj5HS2VNOGw5ZExGQndmYzZJTFA2Q1NYbjFma1hDQVc3eTVGcEE3
-V004WDhEV1hBb3dlYWx3ZjBQbFkzdEhVci9JcTlpN2czeEhOVGl2CldVTndyY3pWc1MyQStieGQr
-OWwyZS9zc2FhUnQ5MnpxTmpHTGtleUp5TTk1UVNXZS9kYWp6SzNmSlVDUDhiMkpwcGtnVU5RKzhF
-ZkEKRG5YNlA4QlhPcUdSTWpSck5zZjRyV3Y3VDY5cUVVNmNHRjh5VjlMbGg1cEt5azhrZ0Y5eUtw
-VlBRa0YrR2hXdFZsN2trdVhMM3ZhYQp2N0h2ZXFtcnNKVGNqZGxJeDdBYkdCUUdoOTBFVzJmRzV6
-K0ZJLzJXSDZocW9aK3BxQzQ0OFZWMkRTTW4rWEVVQk9TazQ0UXpydFdPCjZIRkZ3c3YrMkN6SnB3
-SytMTWZkc3lXdGZiNitBOWtrYTlXTE93PT08L2RzOlNpZ25hdHVyZVZhbHVlPjxkczpLZXlJbmZv
-IElkPSJfMDIzNmM2Y2QtYTAyZC00Y2Y3LWI5MzktOGRhZDA2NTY3M2UxIj48ZHM6WDUwOURhdGE+
-PGRzOlg1MDlDZXJ0aWZpY2F0ZT5NSUlGUXpDQ0JDdWdBd0lCQWdJZ0xyQWJldm9hZTUyeTNmNkMy
-dEIwU24zcDdYSm0wVDAyRm9neEtDZk5oWmd3RFFZSktvWklodmNOCkFRRUxCUUF3ZkRFTE1Ba0dB
-MVVFQmhNQ1ZWTXhQREE2QmdOVkJBb1RNMGx1ZEdWeWJtVjBJRU52Y25CdmNtRjBhVzl1SUdadmNp
-QkIKYzNOcFoyNWxaQ0JPWVcxbGN5QmhibVFnVG5WdFltVnljekV2TUMwR0ExVUVBeE1tU1VOQlRr
-NGdWSEpoWkdWdFlYSnJJRU5zWldGeQphVzVuYUc5MWMyVWdVR2xzYjNRZ1EwRXdIaGNOTVRnd01q
-STRNREF3TURBd1doY05Nak13TXpNeE1qTTFPVFU1V2pDQmx6RUxNQWtHCkExVUVCaE1DUWtVeElE
-QWVCZ05WQkFnVEYwSnlkWE56Wld4ekxVTmhjR2wwWVd3Z1VtVm5hVzl1TVJFd0R3WURWUVFIRXdo
-Q2NuVnoKYzJWc2N6RVJNQThHQTFVRUNoTUlSR1ZzYjJsMGRHVXhRREErQmdOVkJBTVROMUpGVms5
-TFJVUWdTVU5CVGs0Z1ZFMURTQ0JCZFhSbwpiM0pwZW1Wa0lGUnlZV1JsYldGeWF5QlFhV3h2ZENC
-V1lXeHBaR0YwYjNJd2dnRWlNQTBHQ1NxR1NJYjNEUUVCQVFVQUE0SUJEd0F3CmdnRUtBb0lCQVFE
-R1duY3FsZ2RmZGJJQ3dXRktUY3ZCWitjYVhHZFFNV29Wa0RkU2k0eGlQOWVLQnN5UTE0UmNpT1dS
-RTRwUGc0OFoKOUhIOHNESkdWQkNNSXkvaXFGdVJ4ZldudHF2cmQrV3JoSmsxVnlYWG1YdUhTNVBu
-d1hOSitlWFBTN211UWQ4a2lZUGpmNlpvLy95QwovZm9WSGJ1TmJ4SDNCamlHVDVhemdnSFNJVkoz
-eEplL1VxdnpEOG1ZeEJJT1NLNGI1RjhpSzV2QkQ5L0xzU1NQbEJhRTluRDZZekUwCnFjZFF2TGZG
-alBZdkJWOSsyUEJTNTVweStvMUVLUXhlVUtVNEFPcDlQeWhKbWg0TmQ2RWUrVSt3c0o2WVlHaE1x
-NnV5UWhMcjBYVEkKOFFmbURON1FmNS93VkU2d2lncEt4VkRmZ0hoTCtPZ1RydWVtd2s5TjBxdzA4
-bFBKQWdNQkFBR2pnZ0dUTUlJQmp6QU1CZ05WSFJNQgpBZjhFQWpBQU1CMEdBMVVkRGdRV0JCU2dX
-bGp2cW5uS2cwTkVhMUNuTlc1SHpWUlpEVENCeGdZRFZSMGpCSUcrTUlHN2dCVERyVDZtCjFoRUFS
-WUJjT2xkS2ltM2NNUTJlY2FHQmdLUitNSHd4Q3pBSkJnTlZCQVlUQWxWVE1Ud3dPZ1lEVlFRS0V6
-TkpiblJsY201bGRDQkQKYjNKd2IzSmhkR2x2YmlCbWIzSWdRWE56YVdkdVpXUWdUbUZ0WlhNZ1lX
-NWtJRTUxYldKbGNuTXhMekF0QmdOVkJBTVRKa2xEUVU1TwpJRlJ5WVdSbGJXRnlheUJEYkdWaGNt
-bHVaMmh2ZFhObElGQnBiRzkwSUVOQmdpQXVzQnQ2K2hwN25iTGQvb0xhMEhSS2ZlbnRjbWJSClBU
-WVdpREVvSjgyRmVUQU9CZ05WSFE4QkFmOEVCQU1DQjRBd05BWURWUjBmQkMwd0t6QXBvQ2VnSllZ
-amFIUjBjRG92TDJOeWJDNXAKWTJGdWJpNXZjbWN2ZEcxamFGOXdhV3h2ZEM1amNtd3dVUVlEVlIw
-Z0JFb3dTREFRQmc0ckJnRUVBWUxKR3dFRmd6c01DakEwQmdncgpCZ0VGQlFjQ0FUQW9NQ1lHQ0Nz
-R0FRVUZCd0lCRmhwb2RIUndjem92TDJOaExtbGpZVzV1TG05eVp5OXdhV3h2ZERBTkJna3Foa2lH
-Cjl3MEJBUXNGQUFPQ0FRRUFtRnRjOVRjY1grVTFXSVdqVjV0aDBsQ1dLWlBBMUZqNDJtcVpSdEN1
-YzZwem5iRFpQZ1hnSE5OUzAxYnUKSWN2TVVmVFQwNldqUG9zVWZjRjJqdWc2Z1BiTTlaWXRvSnYx
-RURSTTVpQ2hGVXhTdTNmMG40WkJNSEhZQzdhT0U1UHdmUnNpWS9tdgphVjNpRDdOeDZGOXl1Qkt0
-bGxJeHNOelFFaytLdXBjQVE4QmpITWx1VFcvRTE2a2lla2V2VFNicUk5SExYWEFFd2c1WFpUcWVU
-SHk1ClpCU3NKNzFDbzZkeEt1VFF4TTJVTkYrUklBbElaWG9kdXk2WStuTnlUWHMwQVJYeEh0bFZk
-ZVVUMCtOU0JseHNsZm4xQ3g5YlJGa00KYXRkODY5SjQyaDJHY052MXROQnM0WTZFTTFkREcwcUFW
-ZGZpSUJkSW1tRXVtOWlCd2lXdzl3PT08L2RzOlg1MDlDZXJ0aWZpY2F0ZT48L2RzOlg1MDlEYXRh
-PjwvZHM6S2V5SW5mbz48L2RzOlNpZ25hdHVyZT48L3NtZDpzaWduZWRNYXJrPg==
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/revoked/tmv/TMVRevoked-Trademark-Agent-French-Active.smd b/core/src/test/resources/google/registry/tmch/revoked/tmv/TMVRevoked-Trademark-Agent-French-Active.smd
deleted file mode 100644
index f129cbbce..000000000
--- a/core/src/test/resources/google/registry/tmch/revoked/tmv/TMVRevoked-Trademark-Agent-French-Active.smd
+++ /dev/null
@@ -1,103 +0,0 @@
-Marks: Essai & évaluation
-smdID: 000000831527807320231-65535
-U-labels: xn--essai---valuation-itb, xn--essai--valuation-hqb, xn--essai-and-valuation-kzb, xn--essai-andvaluation-jwb, xn--essai-valuation-gnb, xn--essaiand-valuation-jwb, xn--essaiandvaluation-itb, xn--essaiet-valuation-itb, xn--essaietvaluation-hqb, xn--essaivaluation-fkb
-notBefore: 2018-05-31T22:55:20.231Z
-notAfter: 2022-08-18T14:46:53.013Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il9jNTBi
-YzU4ZC1lOWRjLTQ5YWEtYTk3MS1jODdjMzJiMGU5OWIiPjxzbWQ6aWQ+MDAwMDAwODMxNTI3ODA3
-MzIwMjMxLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0zMVQyMjo1NToyMC4yMzFaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0xOFQxNDo0Njo1My4wMTNaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
-cmFkZW1hcms+PG1hcms6aWQ+MDAwMTM5MTUwMzA2NzM4MjE1MDMwNjczODItMTwvbWFyazppZD48
-bWFyazptYXJrTmFtZT5Fc3NhaSAmYW1wOyDDqXZhbHVhdGlvbjwvbWFyazptYXJrTmFtZT48bWFy
-azpob2xkZXIgZW50aXRsZW1lbnQ9Im93bmVyIj48bWFyazpvcmc+QWdlbmNlIGVuIEZyYW5jZTwv
-bWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpzdHJlZXQ+MTAgQXZlbnVlIFJvdXNzZWF1eDwvbWFy
-azpzdHJlZXQ+PG1hcms6Y2l0eT5WZXJzYWlsbGVzPC9tYXJrOmNpdHk+PG1hcms6cGM+MzMwODE8
-L21hcms6cGM+PG1hcms6Y2M+RlI8L21hcms6Y2M+PC9tYXJrOmFkZHI+PC9tYXJrOmhvbGRlcj48
-bWFyazpjb250YWN0IHR5cGU9ImFnZW50Ij48bWFyazpuYW1lPkZyYW5jIExlYnJ1bjwvbWFyazpu
-YW1lPjxtYXJrOm9yZz5BZ2VuY2UgZW4gRnJhbmNlPC9tYXJrOm9yZz48bWFyazphZGRyPjxtYXJr
-OnN0cmVldD5BdmVudWUgUm91c3NlYXV4IDEwIDwvbWFyazpzdHJlZXQ+PG1hcms6Y2l0eT5WZXJz
-YWlsbGVzPC9tYXJrOmNpdHk+PG1hcms6cGM+MzMwODE8L21hcms6cGM+PG1hcms6Y2M+RlI8L21h
-cms6Y2M+PC9tYXJrOmFkZHI+PG1hcms6dm9pY2U+KzMzLjEyNTc4MTI1MDwvbWFyazp2b2ljZT48
-bWFyazpmYXg+KzMzLjEyNTc4MTI1MTwvbWFyazpmYXg+PG1hcms6ZW1haWw+aW5mb0BhZ2VuY2Ut
-ZW4tZnJhbmNlLmZyPC9tYXJrOmVtYWlsPjwvbWFyazpjb250YWN0PjxtYXJrOmp1cmlzZGljdGlv
-bj5VUzwvbWFyazpqdXJpc2RpY3Rpb24+PG1hcms6Y2xhc3M+MTU8L21hcms6Y2xhc3M+PG1hcms6
-bGFiZWw+eG4tLWVzc2FpLS0tdmFsdWF0aW9uLWl0YjwvbWFyazpsYWJlbD48bWFyazpsYWJlbD54
-bi0tZXNzYWktLXZhbHVhdGlvbi1ocWI8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+eG4tLWVzc2Fp
-LWFuZC12YWx1YXRpb24ta3piPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1lc3NhaS1hbmR2
-YWx1YXRpb24tandiPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1lc3NhaS12YWx1YXRpb24t
-Z25iPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1lc3NhaWFuZC12YWx1YXRpb24tandiPC9t
-YXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1lc3NhaWFuZHZhbHVhdGlvbi1pdGI8L21hcms6bGFi
-ZWw+PG1hcms6bGFiZWw+eG4tLWVzc2FpZXQtdmFsdWF0aW9uLWl0YjwvbWFyazpsYWJlbD48bWFy
-azpsYWJlbD54bi0tZXNzYWlldHZhbHVhdGlvbi1ocWI8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+
-eG4tLWVzc2FpdmFsdWF0aW9uLWZrYjwvbWFyazpsYWJlbD48bWFyazpnb29kc0FuZFNlcnZpY2Vz
-Pmd1aXRhcjwvbWFyazpnb29kc0FuZFNlcnZpY2VzPjxtYXJrOnJlZ051bT4xMjM0PC9tYXJrOnJl
-Z051bT48bWFyazpyZWdEYXRlPjIwMTMtMDEtMDFUMDA6MDA6MDAuMDAwWjwvbWFyazpyZWdEYXRl
-PjwvbWFyazp0cmFkZW1hcms+PC9tYXJrOm1hcms+PGRzOlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0
-cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyIgSWQ9Il9kOTNiZDdkYy01OWEzLTRiMWQt
-OWYyMi00NDg0YzczOWVjOTMiPjxkczpTaWduZWRJbmZvPjxkczpDYW5vbmljYWxpemF0aW9uTWV0
-aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+
-PGRzOlNpZ25hdHVyZU1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQv
-eG1sZHNpZy1tb3JlI3JzYS1zaGEyNTYiLz48ZHM6UmVmZXJlbmNlIFVSST0iI19jNTBiYzU4ZC1l
-OWRjLTQ5YWEtYTk3MS1jODdjMzJiMGU5OWIiPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0g
-QWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjZW52ZWxvcGVkLXNp
-Z25hdHVyZSIvPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAx
-LzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdv
-cml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdl
-c3RWYWx1ZT5vV1hiaDFTYWxsbzFYWDVtY0NYLzVMUXB2OFhyZ21JU0RhS0R4M2pSNWtjPTwvZHM6
-RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PGRzOlJlZmVyZW5jZSBVUkk9IiNfNjFlOTJlMTAt
-MWU4Yy00ODdlLTg2YzktZmUzOGQ4MDY0MzUxIj48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3Jt
-IEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9k
-czpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9y
-Zy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+RkhXUFNwSTdLZmxLN2Ro
-c0h1clFaQjdodFdmaWpRMkY0RVEwYStybklCdz08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJl
-bmNlPjwvZHM6U2lnbmVkSW5mbz48ZHM6U2lnbmF0dXJlVmFsdWUgSWQ9Il8wYmQ1ZjhkMC04ZDY1
-LTRkOGEtOGFmOC02MmIzNzg2Mjc1YmUiPlE2QVRnRkhNZ2ZlTDMrcUgxSnRadkxiV1FUeVd3Q2d6
-UFhVS0VpSUtRQ1BjTWdKMFBEcVNjSHVaYnZLOHNSK3ZaRkVRK3M3K3FpYngKeDhkVG50S2lsRGdp
-LzhYazhxNHZtUVdhQnhXOXF6bnZGMmlLWkpUbmN5Yk91YTg3ZjFudlpVTC91c1NvREVuQ2twVENK
-RW56OHYyegpFdkJ1Tlc4ZmVwVUQ2RnVuVkQzZnJSMjBGdkF0WWVFS1FiQ3l5aGpEMUJQTGZlR0VM
-ZjQyWThna2hrWVlpRmNDU1duQnRTdC9MZkJNCmMrUVlCOHlrQzljUnc4VmhUMXJabjhDb2pmbjNm
-NXlVSkNzTjdCWkZCTUJtK0Z4OEprQW0xSi9kRnkvTEdEYlkzWURZQ0tod3l2WTMKWmJkbDhsc1Vx
-Q2UvZHFxak5FY0xheFFzajlyMlVHZ05yd0k3OHc9PTwvZHM6U2lnbmF0dXJlVmFsdWU+PGRzOktl
-eUluZm8gSWQ9Il82MWU5MmUxMC0xZThjLTQ4N2UtODZjOS1mZTM4ZDgwNjQzNTEiPjxkczpYNTA5
-RGF0YT48ZHM6WDUwOUNlcnRpZmljYXRlPk1JSUZRekNDQkN1Z0F3SUJBZ0lnTHJBYmV2b2FlNTJ5
-M2Y2QzJ0QjBTbjNwN1hKbTBUMDJGb2d4S0NmTmhaZ3dEUVlKS29aSWh2Y04KQVFFTEJRQXdmREVM
-TUFrR0ExVUVCaE1DVlZNeFBEQTZCZ05WQkFvVE0wbHVkR1Z5Ym1WMElFTnZjbkJ2Y21GMGFXOXVJ
-R1p2Y2lCQgpjM05wWjI1bFpDQk9ZVzFsY3lCaGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF4TW1T
-VU5CVGs0Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5CmFXNW5hRzkxYzJVZ1VHbHNiM1FnUTBFd0hoY05N
-VGd3TWpJNE1EQXdNREF3V2hjTk1qTXdNek14TWpNMU9UVTVXakNCbHpFTE1Ba0cKQTFVRUJoTUNR
-a1V4SURBZUJnTlZCQWdURjBKeWRYTnpaV3h6TFVOaGNHbDBZV3dnVW1WbmFXOXVNUkV3RHdZRFZR
-UUhFd2hDY25WegpjMlZzY3pFUk1BOEdBMVVFQ2hNSVJHVnNiMmwwZEdVeFFEQStCZ05WQkFNVE4x
-SkZWazlMUlVRZ1NVTkJUazRnVkUxRFNDQkJkWFJvCmIzSnBlbVZrSUZSeVlXUmxiV0Z5YXlCUWFX
-eHZkQ0JXWVd4cFpHRjBiM0l3Z2dFaU1BMEdDU3FHU0liM0RRRUJBUVVBQTRJQkR3QXcKZ2dFS0Fv
-SUJBUURHV25jcWxnZGZkYklDd1dGS1RjdkJaK2NhWEdkUU1Xb1ZrRGRTaTR4aVA5ZUtCc3lRMTRS
-Y2lPV1JFNHBQZzQ4Wgo5SEg4c0RKR1ZCQ01JeS9pcUZ1UnhmV250cXZyZCtXcmhKazFWeVhYbVh1
-SFM1UG53WE5KK2VYUFM3bXVRZDhraVlQamY2Wm8vL3lDCi9mb1ZIYnVOYnhIM0JqaUdUNWF6Z2dI
-U0lWSjN4SmUvVXF2ekQ4bVl4QklPU0s0YjVGOGlLNXZCRDkvTHNTU1BsQmFFOW5ENll6RTAKcWNk
-UXZMZkZqUFl2QlY5KzJQQlM1NXB5K28xRUtReGVVS1U0QU9wOVB5aEptaDROZDZFZStVK3dzSjZZ
-WUdoTXE2dXlRaExyMFhUSQo4UWZtRE43UWY1L3dWRTZ3aWdwS3hWRGZnSGhMK09nVHJ1ZW13azlO
-MHF3MDhsUEpBZ01CQUFHamdnR1RNSUlCanpBTUJnTlZIUk1CCkFmOEVBakFBTUIwR0ExVWREZ1FX
-QkJTZ1dsanZxbm5LZzBORWExQ25OVzVIelZSWkRUQ0J4Z1lEVlIwakJJRytNSUc3Z0JURHJUNm0K
-MWhFQVJZQmNPbGRLaW0zY01RMmVjYUdCZ0tSK01Id3hDekFKQmdOVkJBWVRBbFZUTVR3d09nWURW
-UVFLRXpOSmJuUmxjbTVsZENCRApiM0p3YjNKaGRHbHZiaUJtYjNJZ1FYTnphV2R1WldRZ1RtRnRa
-WE1nWVc1a0lFNTFiV0psY25NeEx6QXRCZ05WQkFNVEprbERRVTVPCklGUnlZV1JsYldGeWF5QkRi
-R1ZoY21sdVoyaHZkWE5sSUZCcGJHOTBJRU5CZ2lBdXNCdDYraHA3bmJMZC9vTGEwSFJLZmVudGNt
-YlIKUFRZV2lERW9KODJGZVRBT0JnTlZIUThCQWY4RUJBTUNCNEF3TkFZRFZSMGZCQzB3S3pBcG9D
-ZWdKWVlqYUhSMGNEb3ZMMk55YkM1cApZMkZ1Ymk1dmNtY3ZkRzFqYUY5d2FXeHZkQzVqY213d1VR
-WURWUjBnQkVvd1NEQVFCZzRyQmdFRUFZTEpHd0VGZ3pzTUNqQTBCZ2dyCkJnRUZCUWNDQVRBb01D
-WUdDQ3NHQVFVRkJ3SUJGaHBvZEhSd2N6b3ZMMk5oTG1sallXNXVMbTl5Wnk5d2FXeHZkREFOQmdr
-cWhraUcKOXcwQkFRc0ZBQU9DQVFFQW1GdGM5VGNjWCtVMVdJV2pWNXRoMGxDV0taUEExRmo0Mm1x
-WlJ0Q3VjNnB6bmJEWlBnWGdITk5TMDFidQpJY3ZNVWZUVDA2V2pQb3NVZmNGMmp1ZzZnUGJNOVpZ
-dG9KdjFFRFJNNWlDaEZVeFN1M2YwbjRaQk1ISFlDN2FPRTVQd2ZSc2lZL212CmFWM2lEN054NkY5
-eXVCS3RsbEl4c056UUVrK0t1cGNBUThCakhNbHVUVy9FMTZraWVrZXZUU2JxSTlITFhYQUV3ZzVY
-WlRxZVRIeTUKWkJTc0o3MUNvNmR4S3VUUXhNMlVORitSSUFsSVpYb2R1eTZZK25OeVRYczBBUlh4
-SHRsVmRlVVQwK05TQmx4c2xmbjFDeDliUkZrTQphdGQ4NjlKNDJoMkdjTnYxdE5CczRZNkVNMWRE
-RzBxQVZkZmlJQmRJbW1FdW05aUJ3aVd3OXc9PTwvZHM6WDUwOUNlcnRpZmljYXRlPjwvZHM6WDUw
-OURhdGE+PC9kczpLZXlJbmZvPjwvZHM6U2lnbmF0dXJlPjwvc21kOnNpZ25lZE1hcms+
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/revoked/tmv/TMVRevoked-Trademark-Agent-Russian-Active.smd b/core/src/test/resources/google/registry/tmch/revoked/tmv/TMVRevoked-Trademark-Agent-Russian-Active.smd
deleted file mode 100644
index 91a0f84e0..000000000
--- a/core/src/test/resources/google/registry/tmch/revoked/tmv/TMVRevoked-Trademark-Agent-Russian-Active.smd
+++ /dev/null
@@ -1,104 +0,0 @@
-Marks: суда & ошибки
-smdID: 000000741527807313522-65535
-U-labels: xn------5cdin6abr1b1ay5e, xn-----6kcgl1abp7azaw9d, xn---and--3vemr6bbv9b5a2a7f, xn---and-43dkp1bbt5b3a0a1f, xn----7sbejwbn3axu3d, xn--and--43dkp1bbt5b3a0a1f, xn--and-5cdin6abr1b1ay5e, xn--et--5cdin6abr1b1ay5e, xn--et-6kcgl1abp7azaw9d, xn--80achrblzvs7c
-notBefore: 2018-05-31T22:55:13.522Z
-notAfter: 2022-08-18T14:16:55.554Z
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il8wZDBj
-MjkwYi1kNTU3LTRiOGMtODU3OC00MzAyYzkzNTZmODQiPjxzbWQ6aWQ+MDAwMDAwNzQxNTI3ODA3
-MzEzNTIyLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
-ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
-YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
-OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
-PHNtZDpub3RCZWZvcmU+MjAxOC0wNS0zMVQyMjo1NToxMy41MjJaPC9zbWQ6bm90QmVmb3JlPjxz
-bWQ6bm90QWZ0ZXI+MjAyMi0wOC0xOFQxNDoxNjo1NS41NTRaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
-bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
-cmFkZW1hcms+PG1hcms6aWQ+MDAwMTQxMTUwMzA2NTU1MDE1MDMwNjU1NTAtMTwvbWFyazppZD48
-bWFyazptYXJrTmFtZT7RgdGD0LTQsCAmYW1wOyDQvtGI0LjQsdC60Lg8L21hcms6bWFya05hbWU+
-PG1hcms6aG9sZGVyIGVudGl0bGVtZW50PSJvd25lciI+PG1hcms6b3JnPtCQ0LPQtdC90YLRgdGC
-0LLQvjwvbWFyazpvcmc+PG1hcms6YWRkcj48bWFyazpzdHJlZXQ+0J/RgNC+0YHQv9C10LrRgiDQ
-ktC10YDQvdCw0LTRgdC60L7Qs9C+IDE1PC9tYXJrOnN0cmVldD48bWFyazpjaXR5PtCc0L7RgdC6
-0LLQsDwvbWFyazpjaXR5PjxtYXJrOnBjPjExNzQ4NTwvbWFyazpwYz48bWFyazpjYz5SVTwvbWFy
-azpjYz48L21hcms6YWRkcj48L21hcms6aG9sZGVyPjxtYXJrOmNvbnRhY3QgdHlwZT0iYWdlbnQi
-PjxtYXJrOm5hbWU+0J3QsNGC0LDQu9GM0Y8g0JDQvdGC0L7QvdC+0LLQsDwvbWFyazpuYW1lPjxt
-YXJrOm9yZz7QkNCz0LXQvdGC0YHRgtCy0L48L21hcms6b3JnPjxtYXJrOmFkZHI+PG1hcms6c3Ry
-ZWV0PtCf0YDQvtGB0L/QtdC60YIg0JLQtdGA0L3QsNC00YHQutC+0LPQviAxNTwvbWFyazpzdHJl
-ZXQ+PG1hcms6Y2l0eT7QnNC+0YHQutCy0LA8L21hcms6Y2l0eT48bWFyazpwYz4xMTc0ODU8L21h
-cms6cGM+PG1hcms6Y2M+UlU8L21hcms6Y2M+PC9tYXJrOmFkZHI+PG1hcms6dm9pY2U+KzcuOTE4
-ODIyMTY3NDwvbWFyazp2b2ljZT48bWFyazpmYXg+KzcuOTE4ODIyMTY3MzwvbWFyazpmYXg+PG1h
-cms6ZW1haWw+aW5mb0BhZ2VuY3kucnU8L21hcms6ZW1haWw+PC9tYXJrOmNvbnRhY3Q+PG1hcms6
-anVyaXNkaWN0aW9uPlVTPC9tYXJrOmp1cmlzZGljdGlvbj48bWFyazpjbGFzcz4xNTwvbWFyazpj
-bGFzcz48bWFyazpsYWJlbD54bi0tLS0tLTVjZGluNmFicjFiMWF5NWU8L21hcms6bGFiZWw+PG1h
-cms6bGFiZWw+eG4tLS0tLTZrY2dsMWFicDdhemF3OWQ8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+
-eG4tLS1hbmQtLTN2ZW1yNmJidjliNWEyYTdmPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS0t
-YW5kLTQzZGtwMWJidDViM2EwYTFmPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS0tLTdzYmVq
-d2JuM2F4dTNkPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1hbmQtLTQzZGtwMWJidDViM2Ew
-YTFmPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnhuLS1hbmQtNWNkaW42YWJyMWIxYXk1ZTwvbWFy
-azpsYWJlbD48bWFyazpsYWJlbD54bi0tZXQtLTVjZGluNmFicjFiMWF5NWU8L21hcms6bGFiZWw+
-PG1hcms6bGFiZWw+eG4tLWV0LTZrY2dsMWFicDdhemF3OWQ8L21hcms6bGFiZWw+PG1hcms6bGFi
-ZWw+eG4tLTgwYWNocmJsenZzN2M8L21hcms6bGFiZWw+PG1hcms6Z29vZHNBbmRTZXJ2aWNlcz7Q
-s9C40YLQsNGA0LAgPC9tYXJrOmdvb2RzQW5kU2VydmljZXM+PG1hcms6cmVnTnVtPjEyMzQ8L21h
-cms6cmVnTnVtPjxtYXJrOnJlZ0RhdGU+MjAxMy0wMS0wMVQwMDowMDowMC4wMDBaPC9tYXJrOnJl
-Z0RhdGU+PC9tYXJrOnRyYWRlbWFyaz48L21hcms6bWFyaz48ZHM6U2lnbmF0dXJlIHhtbG5zOmRz
-PSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjIiBJZD0iXzdlMWU0NDY5LTY3Njgt
-NDE1Yi04MzJlLWU1MzQyNjAyZmNhZCI+PGRzOlNpZ25lZEluZm8+PGRzOkNhbm9uaWNhbGl6YXRp
-b25NZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0
-biMiLz48ZHM6U2lnbmF0dXJlTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAw
-MS8wNC94bWxkc2lnLW1vcmUjcnNhLXNoYTI1NiIvPjxkczpSZWZlcmVuY2UgVVJJPSIjXzBkMGMy
-OTBiLWQ1NTctNGI4Yy04NTc4LTQzMDJjOTM1NmY4NCI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5z
-Zm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1sZHNpZyNlbnZlbG9w
-ZWQtc2lnbmF0dXJlIi8+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3Jn
-LzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6RGlnZXN0TWV0aG9k
-IEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxlbmMjc2hhMjU2Ii8+PGRz
-OkRpZ2VzdFZhbHVlPjh5WkxnZ1JoUndBUGhvLytGQVZPQXBEZkEySnR2emoyRDdiODgyTkp3ZUE9
-PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48ZHM6UmVmZXJlbmNlIFVSST0iI19jNDNi
-MDBjZi05NTlkLTQ5YWMtOWE4ZS1lZWQxNTMyMWQyMTMiPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFu
-c2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMi
-Lz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cu
-dzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1ZT5LSnVjRkFpSmlv
-ZzUydXcyU2c1a1V6dE81V0NNeHFrdGVPU3NtWVk4Y1h3PTwvZHM6RGlnZXN0VmFsdWU+PC9kczpS
-ZWZlcmVuY2U+PC9kczpTaWduZWRJbmZvPjxkczpTaWduYXR1cmVWYWx1ZSBJZD0iXzY5ZTNiZmIx
-LWI1YjItNDgzNC1iNjlkLThkYTlmYzFkMzQzOCI+aWJKajdIVndDOHlSTExGTlROV0FBeXViV3lV
-ejdjVHJPQlp3U0RCbXo3aFY5UWlxLzNEZm9KcEg4Z1Y0dFF0RE9MTU80RDdkZS9wZApIM3ZXOEJN
-OThOL3B1NHFaMTF5bk9GZTljT0d3RHlNTDVNS0c4WmhFUm1vR0MrRFZzQ09IRUJIVER1WG02TDFs
-OGlnb3FjUEw2aDcrCmFtdUwyb3RSTFh0d1JSeWlpMk51MW9EK09XYTVWR1ZYS2lFMlRsbnQvS3cr
-bW8yMWo5SDhuUzRBSkpCUnBJeWlvaXorMmpnNDdFNnMKcFpWQ096aTNoQ1VsMWREbSsxNk9wdlMy
-d0pKQTYxWHhHdy9TckN4bUNpcUFXWEhWRHluT0xJVVNaazQ1b1cxMFZFK3YvUUZCZzByMgo5RU9o
-WlFIUlJyUVU2L0FFeDJubjFKREVraU81MENtMmQ2bjJVQT09PC9kczpTaWduYXR1cmVWYWx1ZT48
-ZHM6S2V5SW5mbyBJZD0iX2M0M2IwMGNmLTk1OWQtNDlhYy05YThlLWVlZDE1MzIxZDIxMyI+PGRz
-Olg1MDlEYXRhPjxkczpYNTA5Q2VydGlmaWNhdGU+TUlJRlF6Q0NCQ3VnQXdJQkFnSWdMckFiZXZv
-YWU1MnkzZjZDMnRCMFNuM3A3WEptMFQwMkZvZ3hLQ2ZOaFpnd0RRWUpLb1pJaHZjTgpBUUVMQlFB
-d2ZERUxNQWtHQTFVRUJoTUNWVk14UERBNkJnTlZCQW9UTTBsdWRHVnlibVYwSUVOdmNuQnZjbUYw
-YVc5dUlHWnZjaUJCCmMzTnBaMjVsWkNCT1lXMWxjeUJoYm1RZ1RuVnRZbVZ5Y3pFdk1DMEdBMVVF
-QXhNbVNVTkJUazRnVkhKaFpHVnRZWEpySUVOc1pXRnkKYVc1bmFHOTFjMlVnVUdsc2IzUWdRMEV3
-SGhjTk1UZ3dNakk0TURBd01EQXdXaGNOTWpNd016TXhNak0xT1RVNVdqQ0JsekVMTUFrRwpBMVVF
-QmhNQ1FrVXhJREFlQmdOVkJBZ1RGMEp5ZFhOelpXeHpMVU5oY0dsMFlXd2dVbVZuYVc5dU1SRXdE
-d1lEVlFRSEV3aENjblZ6CmMyVnNjekVSTUE4R0ExVUVDaE1JUkdWc2IybDBkR1V4UURBK0JnTlZC
-QU1UTjFKRlZrOUxSVVFnU1VOQlRrNGdWRTFEU0NCQmRYUm8KYjNKcGVtVmtJRlJ5WVdSbGJXRnlh
-eUJRYVd4dmRDQldZV3hwWkdGMGIzSXdnZ0VpTUEwR0NTcUdTSWIzRFFFQkFRVUFBNElCRHdBdwpn
-Z0VLQW9JQkFRREdXbmNxbGdkZmRiSUN3V0ZLVGN2QlorY2FYR2RRTVdvVmtEZFNpNHhpUDllS0Jz
-eVExNFJjaU9XUkU0cFBnNDhaCjlISDhzREpHVkJDTUl5L2lxRnVSeGZXbnRxdnJkK1dyaEprMVZ5
-WFhtWHVIUzVQbndYTkorZVhQUzdtdVFkOGtpWVBqZjZaby8veUMKL2ZvVkhidU5ieEgzQmppR1Q1
-YXpnZ0hTSVZKM3hKZS9VcXZ6RDhtWXhCSU9TSzRiNUY4aUs1dkJEOS9Mc1NTUGxCYUU5bkQ2WXpF
-MApxY2RRdkxmRmpQWXZCVjkrMlBCUzU1cHkrbzFFS1F4ZVVLVTRBT3A5UHloSm1oNE5kNkVlK1Ur
-d3NKNllZR2hNcTZ1eVFoTHIwWFRJCjhRZm1ETjdRZjUvd1ZFNndpZ3BLeFZEZmdIaEwrT2dUcnVl
-bXdrOU4wcXcwOGxQSkFnTUJBQUdqZ2dHVE1JSUJqekFNQmdOVkhSTUIKQWY4RUFqQUFNQjBHQTFV
-ZERnUVdCQlNnV2xqdnFubktnME5FYTFDbk5XNUh6VlJaRFRDQnhnWURWUjBqQklHK01JRzdnQlRE
-clQ2bQoxaEVBUllCY09sZEtpbTNjTVEyZWNhR0JnS1IrTUh3eEN6QUpCZ05WQkFZVEFsVlRNVHd3
-T2dZRFZRUUtFek5KYm5SbGNtNWxkQ0JECmIzSndiM0poZEdsdmJpQm1iM0lnUVhOemFXZHVaV1Fn
-VG1GdFpYTWdZVzVrSUU1MWJXSmxjbk14THpBdEJnTlZCQU1USmtsRFFVNU8KSUZSeVlXUmxiV0Z5
-YXlCRGJHVmhjbWx1WjJodmRYTmxJRkJwYkc5MElFTkJnaUF1c0J0NitocDduYkxkL29MYTBIUktm
-ZW50Y21iUgpQVFlXaURFb0o4MkZlVEFPQmdOVkhROEJBZjhFQkFNQ0I0QXdOQVlEVlIwZkJDMHdL
-ekFwb0NlZ0pZWWphSFIwY0RvdkwyTnliQzVwClkyRnViaTV2Y21jdmRHMWphRjl3YVd4dmRDNWpj
-bXd3VVFZRFZSMGdCRW93U0RBUUJnNHJCZ0VFQVlMSkd3RUZnenNNQ2pBMEJnZ3IKQmdFRkJRY0NB
-VEFvTUNZR0NDc0dBUVVGQndJQkZocG9kSFJ3Y3pvdkwyTmhMbWxqWVc1dUxtOXlaeTl3YVd4dmRE
-QU5CZ2txaGtpRwo5dzBCQVFzRkFBT0NBUUVBbUZ0YzlUY2NYK1UxV0lXalY1dGgwbENXS1pQQTFG
-ajQybXFaUnRDdWM2cHpuYkRaUGdYZ0hOTlMwMWJ1Ckljdk1VZlRUMDZXalBvc1VmY0YyanVnNmdQ
-Yk05Wll0b0p2MUVEUk01aUNoRlV4U3UzZjBuNFpCTUhIWUM3YU9FNVB3ZlJzaVkvbXYKYVYzaUQ3
-Tng2Rjl5dUJLdGxsSXhzTnpRRWsrS3VwY0FROEJqSE1sdVRXL0UxNmtpZWtldlRTYnFJOUhMWFhB
-RXdnNVhaVHFlVEh5NQpaQlNzSjcxQ282ZHhLdVRReE0yVU5GK1JJQWxJWlhvZHV5Nlkrbk55VFhz
-MEFSWHhIdGxWZGVVVDArTlNCbHhzbGZuMUN4OWJSRmtNCmF0ZDg2OUo0MmgyR2NOdjF0TkJzNFk2
-RU0xZERHMHFBVmRmaUlCZEltbUV1bTlpQndpV3c5dz09PC9kczpYNTA5Q2VydGlmaWNhdGU+PC9k
-czpYNTA5RGF0YT48L2RzOktleUluZm8+PC9kczpTaWduYXR1cmU+PC9zbWQ6c2lnbmVkTWFyaz4=
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/revoked/tmv/TMVRevoked-TreatyStatute-Agent-Chinese-Active.smd b/core/src/test/resources/google/registry/tmch/revoked/tmv/TMVRevoked-TreatyStatute-Agent-Chinese-Active.smd
deleted file mode 100644
index e66adb4fe..000000000
--- a/core/src/test/resources/google/registry/tmch/revoked/tmv/TMVRevoked-TreatyStatute-Agent-Chinese-Active.smd
+++ /dev/null
@@ -1,105 +0,0 @@
-Marks: 检查&查询
-smdID: 0000001881375789106727-65535
-U-labels: 检查-查询, 检查和查询, 检查查询
-notBefore: 2013-08-06 13:38:26
-notAfter: 2017-07-24 00:00:00
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il9lZGQz
-MjcyNC0yYjM3LTQ1NGQtODQ2Mi0yNjg0OWRlY2YxZGUiPgogIDxzbWQ6aWQ+MDAwMDAwMTg4MTM3
-NTc4OTEwNjcyNy02NTUzNTwvc21kOmlkPgogIDxzbWQ6aXNzdWVySW5mbyBpc3N1ZXJJRD0iNjU1
-MzUiPgogICAgPHNtZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz4KICAgIDxz
-bWQ6ZW1haWw+bm90YXZhaWxhYmxlQGV4YW1wbGUuY29tPC9zbWQ6ZW1haWw+CiAgICA8c21kOnVy
-bD5odHRwOi8vd3d3LmV4YW1wbGUuY29tPC9zbWQ6dXJsPgogICAgPHNtZDp2b2ljZT4rMzIuMDAw
-MDAwPC9zbWQ6dm9pY2U+CiAgPC9zbWQ6aXNzdWVySW5mbz4KICA8c21kOm5vdEJlZm9yZT4yMDEz
-LTA4LTA2VDExOjM4OjI2LjcyN1o8L3NtZDpub3RCZWZvcmU+CiAgPHNtZDpub3RBZnRlcj4yMDE3
-LTA3LTIzVDIyOjAwOjAwLjAwMFo8L3NtZDpub3RBZnRlcj4KICA8bWFyazptYXJrIHhtbG5zOm1h
-cms9InVybjppZXRmOnBhcmFtczp4bWw6bnM6bWFyay0xLjAiPgogICAgPG1hcms6dHJlYXR5T3JT
-dGF0dXRlPgogICAgICA8bWFyazppZD4wMDA1MjgxMzczNDczMTkxMTM3MzQ3MzE5MS02NTUzNTwv
-bWFyazppZD4KICAgICAgPG1hcms6bWFya05hbWU+5qOA5p+lJmFtcDvmn6Xor6I8L21hcms6bWFy
-a05hbWU+CiAgICAgIDxtYXJrOmhvbGRlciBlbnRpdGxlbWVudD0ib3duZXIiPgogICAgICAgIDxt
-YXJrOm9yZz7lt6XnqIvlpIQ8L21hcms6b3JnPgogICAgICAgIDxtYXJrOmFkZHI+CiAgICAgICAg
-ICA8bWFyazpzdHJlZXQ+6aaZ5riv5Lic6LevNuWPt++8jDXlj7fmpbzvvIw45Y+35a6kPC9tYXJr
-OnN0cmVldD4KICAgICAgICAgIDxtYXJrOmNpdHk+6Z2S5bKb5biCPC9tYXJrOmNpdHk+CiAgICAg
-ICAgICA8bWFyazpwYz4zNTAwPC9tYXJrOnBjPgogICAgICAgICAgPG1hcms6Y2M+Q048L21hcms6
-Y2M+CiAgICAgICAgPC9tYXJrOmFkZHI+CiAgICAgIDwvbWFyazpob2xkZXI+CiAgICAgIDxtYXJr
-OmNvbnRhY3QgdHlwZT0iYWdlbnQiPgogICAgICAgIDxtYXJrOm5hbWU+5p2O5bCP5pa5PC9tYXJr
-Om5hbWU+CiAgICAgICAgPG1hcms6b3JnPuW3peeoi+WkhDwvbWFyazpvcmc+CiAgICAgICAgPG1h
-cms6YWRkcj4KICAgICAgICAgIDxtYXJrOnN0cmVldD7pppnmuK/kuJzot6825Y+377yMNeWPt+al
-vO+8jDjlj7flrqQ8L21hcms6c3RyZWV0PgogICAgICAgICAgPG1hcms6Y2l0eT7pnZLlspvluII8
-L21hcms6Y2l0eT4KICAgICAgICAgIDxtYXJrOnBjPjM1MDA8L21hcms6cGM+CiAgICAgICAgICA8
-bWFyazpjYz5DTjwvbWFyazpjYz4KICAgICAgICA8L21hcms6YWRkcj4KICAgICAgICA8bWFyazp2
-b2ljZT4rODYuMTA4NDY1NzE3MzwvbWFyazp2b2ljZT4KICAgICAgICA8bWFyazpmYXg+Kzg2LjEw
-ODQ2NTcxNzU8L21hcms6ZmF4PgogICAgICAgIDxtYXJrOmVtYWlsPmluZm9AY2hpbmVzZS1hZ2Vu
-Y3kuY29tPC9tYXJrOmVtYWlsPgogICAgICA8L21hcms6Y29udGFjdD4KICAgICAgPG1hcms6cHJv
-dGVjdGlvbj4KICAgICAgICA8bWFyazpjYz5DTjwvbWFyazpjYz4KICAgICAgICA8bWFyazpydWxp
-bmc+Q048L21hcms6cnVsaW5nPgogICAgICA8L21hcms6cHJvdGVjdGlvbj4KICAgICAgPG1hcms6
-bGFiZWw+eG4tLTB0cjEzNmJiYTc4Zjc4OWo8L21hcms6bGFiZWw+CiAgICAgIDxtYXJrOmxhYmVs
-PnhuLS1qdnZhOTZkaTQwaTwvbWFyazpsYWJlbD4KICAgICAgPG1hcms6bGFiZWw+eG4tLS0tc2g3
-YmI3OGY3ODlqPC9tYXJrOmxhYmVsPgogICAgICA8bWFyazpnb29kc0FuZFNlcnZpY2VzPuS5kOWZ
-qDwvbWFyazpnb29kc0FuZFNlcnZpY2VzPgogICAgICA8bWFyazpyZWZOdW0+MTIzNDwvbWFyazpy
-ZWZOdW0+CiAgICAgIDxtYXJrOnByb0RhdGU+MjAxMy0wMi0wMVQyMzowMDowMC4wMDBaPC9tYXJr
-OnByb0RhdGU+CiAgICAgIDxtYXJrOnRpdGxlPlRlc3QgVHJlYXR5PC9tYXJrOnRpdGxlPgogICAg
-ICA8bWFyazpleGVjRGF0ZT4yMDEzLTAyLTAxVDIzOjAwOjAwLjAwMFo8L21hcms6ZXhlY0RhdGU+
-CiAgICA8L21hcms6dHJlYXR5T3JTdGF0dXRlPgogIDwvbWFyazptYXJrPgo8ZHM6U2lnbmF0dXJl
-IHhtbG5zOmRzPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjIiBJZD0iXzVmZWI3
-ZGExLTUzMmMtNDQ1MC1iZjhlLTkyOGE5YTRiOTVmZCI+PGRzOlNpZ25lZEluZm8+PGRzOkNhbm9u
-aWNhbGl6YXRpb25NZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3ht
-bC1leGMtYzE0biMiLz48ZHM6U2lnbmF0dXJlTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53
-My5vcmcvMjAwMS8wNC94bWxkc2lnLW1vcmUjcnNhLXNoYTI1NiIvPjxkczpSZWZlcmVuY2UgVVJJ
-PSIjX2VkZDMyNzI0LTJiMzctNDU0ZC04NDYyLTI2ODQ5ZGVjZjFkZSI+PGRzOlRyYW5zZm9ybXM+
-PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1sZHNp
-ZyNlbnZlbG9wZWQtc2lnbmF0dXJlIi8+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93
-d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6RGln
-ZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxlbmMjc2hh
-MjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPno1eWMwYWRXcXlFOWJqTm8vbVhtN3lISlJlQXZpbWdrSGFJ
-elQwaDdRMTQ9PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48ZHM6UmVmZXJlbmNlIFVS
-ST0iI18xMTA3OGRjZC1lY2FhLTRmYTctYTVmMC0xNTE3ZjA3MTA1MmYiPjxkczpUcmFuc2Zvcm1z
-PjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1l
-eGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0
-dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdlc3RWYWx1ZT42
-dWlFVzY3eTh1ZlJNcTRSSWE3M2JiQkZaZDR1SlJmOERoU3V2VDdSSWR3PTwvZHM6RGlnZXN0VmFs
-dWU+PC9kczpSZWZlcmVuY2U+PC9kczpTaWduZWRJbmZvPjxkczpTaWduYXR1cmVWYWx1ZSBJZD0i
-X2JmOThiN2MzLWQ5ZTItNDVlYS04YTNmLTAxMzIyYjQ0YjFiNyI+WnNWaDN4NUlaY2owQU9yRXBC
-azV3VG5EMFZmME5TRDA1bVFKdFNSb2tTYWlHbGtyaXk1ckxkeGV1ZWwxVXVVYmt0cHZQS0RaYXBq
-eQptdkptek81eTlSNHJLNHlSOUtPZHJDUkgzZllLL3NwU2VPMW5tUzVCUHdydU0rZThNcmNZekQv
-Q3dXbXU2aEFVenNZZ3ZGL1R3SjdWCkY0dkxic0pTdmxpampoa0hobTF3V1JyekVvNmM2ZDNCbjhR
-Nld0ZVJ2ZVh5YXAxMHA1cWIvWFNJU3dMVHJaUGM5U0sxK0tRZTZUeDUKS3BzZVYxR0xZTzJzZmRr
-ZkxTamQ4c2FUNXRDREVPYlRuR1AvaFEvL29OeFVRZHJXekV2Um9WZGFsUjRId29VN1dtbDAwWHdt
-T29vTApoZGdkb2tvZXNjUFpyL2tRU1BWbm1GcUdGVTVneWRsK3U5Qk45QT09PC9kczpTaWduYXR1
-cmVWYWx1ZT48ZHM6S2V5SW5mbyBJZD0iXzExMDc4ZGNkLWVjYWEtNGZhNy1hNWYwLTE1MTdmMDcx
-MDUyZiI+PGRzOlg1MDlEYXRhPjxkczpYNTA5Q2VydGlmaWNhdGU+TUlJRk56Q0NCQitnQXdJQkFn
-SWdMckFiZXZvYWU1MnkzZjZDMnRCMFNuM3A3WEptMFQwMkZvZ3hLQ2ZOaFhzd0RRWUpLb1pJaHZj
-TgpBUUVMQlFBd2ZERUxNQWtHQTFVRUJoTUNWVk14UERBNkJnTlZCQW9UTTBsdWRHVnlibVYwSUVO
-dmNuQnZjbUYwYVc5dUlHWnZjaUJCCmMzTnBaMjVsWkNCT1lXMWxjeUJoYm1RZ1RuVnRZbVZ5Y3pF
-dk1DMEdBMVVFQXhNbVNVTkJUazRnVkhKaFpHVnRZWEpySUVOc1pXRnkKYVc1bmFHOTFjMlVnVUds
-c2IzUWdRMEV3SGhjTk1UTXdOekE1TURBd01EQXdXaGNOTVRnd056QTRNak0xT1RVNVdqQ0JsekVM
-TUFrRwpBMVVFQmhNQ1FrVXhJREFlQmdOVkJBZ1RGMEp5ZFhOelpXeHpMVU5oY0dsMFlXd2dVbVZu
-YVc5dU1SRXdEd1lEVlFRSEV3aENjblZ6CmMyVnNjekVSTUE4R0ExVUVDaE1JUkdWc2IybDBkR1V4
-UURBK0JnTlZCQU1UTjFKRlZrOUxSVVFnU1VOQlRrNGdWRTFEU0NCQmRYUm8KYjNKcGVtVmtJRlJ5
-WVdSbGJXRnlheUJRYVd4dmRDQldZV3hwWkdGMGIzSXdnZ0VpTUEwR0NTcUdTSWIzRFFFQkFRVUFB
-NElCRHdBdwpnZ0VLQW9JQkFRQ3RNdFFTenRST2NRRmVKSE5uL3lRTVluVlphcVVwRUdodVF6NHM5
-Q2VQUXoxYjAzVmxuWXlqYU5WazVMc2tHSkZpCnNSZ2laTkJBampqdGwyQVZ6RDVZOG13bXBDVjI0
-UjBOdHJLQWZsbkc2Q0ExNXJCVHNIVUZEZjZCYXF5TWFpekFzNFFJQUdoZFdPVjcKOUd5M3dueFdT
-bXZDa0J0NUJQa2FNb1YzeGtVdlhsL08rOUNDRmVIMFVlQnBzNWkzcjdBNTNmN1g1amp1VXVzZ2hP
-RDdHVnZZME5ONwppY2x1UytjV0VvUkE1d1BJTS9mOWJDQUZGTmdCdktLblhDdFR0SUxuUDNCY25T
-dGJKZ2h0SU9iU2Vqa2FlaWRNRDJYbHptajh1d0lQCnRwVmJzZFlWeEFoZ3Q1MnNlUXZ6RlM0RVdY
-cnBPeC9sRjdGUFNMSjBpOXJEVDFiQkFnTUJBQUdqZ2dHSE1JSUJnekFNQmdOVkhSTUIKQWY4RUFq
-QUFNQjBHQTFVZERnUVdCQlI4OHRnYUdOSVBXckZvNWdmZlF1MFpmU2ZWaERDQnhnWURWUjBqQklH
-K01JRzdnQlREclQ2bQoxaEVBUllCY09sZEtpbTNjTVEyZWNhR0JnS1IrTUh3eEN6QUpCZ05WQkFZ
-VEFsVlRNVHd3T2dZRFZRUUtFek5KYm5SbGNtNWxkQ0JECmIzSndiM0poZEdsdmJpQm1iM0lnUVhO
-emFXZHVaV1FnVG1GdFpYTWdZVzVrSUU1MWJXSmxjbk14THpBdEJnTlZCQU1USmtsRFFVNU8KSUZS
-eVlXUmxiV0Z5YXlCRGJHVmhjbWx1WjJodmRYTmxJRkJwYkc5MElFTkJnaUF1c0J0NitocDduYkxk
-L29MYTBIUktmZW50Y21iUgpQVFlXaURFb0o4MkZlVEFPQmdOVkhROEJBZjhFQkFNQ0I0QXdOQVlE
-VlIwZkJDMHdLekFwb0NlZ0pZWWphSFIwY0RvdkwyTnliQzVwClkyRnViaTV2Y21jdmRHMWphRjl3
-YVd4dmRDNWpjbXd3UlFZRFZSMGdCRDR3UERBNkJnTXFBd1F3TXpBeEJnZ3JCZ0VGQlFjQ0FSWWwK
-YUhSMGNEb3ZMM2QzZHk1cFkyRnViaTV2Y21jdmNHbHNiM1JmY21Wd2IzTnBkRzl5ZVRBTkJna3Fo
-a2lHOXcwQkFRc0ZBQU9DQVFFQQp1amw2ZjZlNkQrSUp1RmVCUjRSUGhWb2dFTEpHNi9YKzRuMWRu
-TFNEcC92MmtvSW5mUXFTcVJjUmszeHV0aFlqejd2NnkzcDdvVzZiCnRzM0JUdlFJTWV1NUo0VElr
-Yk9qTmxWZ2FvL2plOWYvZ1Q3aUs1RGFKV0hGUXBuWW52alhoUTNWNlJrUzdkSmw0RlpFaXk2cEw4
-bTUKWDFwNXBDemNGcU95TS93UjhLemZCVVgrS2hYYUFXZ3R1RGVrQVRtUjV5Q0ZnUG1Bb1pmUGtw
-VUZnTUpwWTVZY1J1K0syNFdWbnQ0WQpXN3l3L0dGNWk2ZHBUVXRwRk03L1lVQXJ6cGRmVStlY29u
-WTRkTUtkWjZzSzhmYWo0aVVJRytLRWN6c1kxbTk4OVZJYnB0Z3hEVnM1CkZlTTRnVi9IN3dhTW1t
-WmR5WVA0cFlSQzN5ZEhPa2JiWmdsWFp3PT08L2RzOlg1MDlDZXJ0aWZpY2F0ZT48L2RzOlg1MDlE
-YXRhPjwvZHM6S2V5SW5mbz48L2RzOlNpZ25hdHVyZT48L3NtZDpzaWduZWRNYXJrPg==
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/revoked/tmv/TMVRevoked-TreatyStatute-Agent-English-Active.smd b/core/src/test/resources/google/registry/tmch/revoked/tmv/TMVRevoked-TreatyStatute-Agent-English-Active.smd
deleted file mode 100644
index 1e609e31b..000000000
--- a/core/src/test/resources/google/registry/tmch/revoked/tmv/TMVRevoked-TreatyStatute-Agent-English-Active.smd
+++ /dev/null
@@ -1,110 +0,0 @@
-Marks: Test & Validate
-smdID: 0000001771375789104608-65535
-U-labels: test---validate, test--validate, test-and-validate, test-andvalidate, test-validate, testand-validate, testandvalidate, testvalidate
-notBefore: 2013-08-06 13:38:24
-notAfter: 2017-07-24 00:00:00
------BEGIN ENCODED SMD-----
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
-bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il9jYjEz
-YjgwYy1hNTE4LTQ1MTktODUxYy0wYWUxNGMxZWJhZjMiPgogIDxzbWQ6aWQ+MDAwMDAwMTc3MTM3
-NTc4OTEwNDYwOC02NTUzNTwvc21kOmlkPgogIDxzbWQ6aXNzdWVySW5mbyBpc3N1ZXJJRD0iNjU1
-MzUiPgogICAgPHNtZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz4KICAgIDxz
-bWQ6ZW1haWw+bm90YXZhaWxhYmxlQGV4YW1wbGUuY29tPC9zbWQ6ZW1haWw+CiAgICA8c21kOnVy
-bD5odHRwOi8vd3d3LmV4YW1wbGUuY29tPC9zbWQ6dXJsPgogICAgPHNtZDp2b2ljZT4rMzIuMDAw
-MDAwPC9zbWQ6dm9pY2U+CiAgPC9zbWQ6aXNzdWVySW5mbz4KICA8c21kOm5vdEJlZm9yZT4yMDEz
-LTA4LTA2VDExOjM4OjI0LjYwOFo8L3NtZDpub3RCZWZvcmU+CiAgPHNtZDpub3RBZnRlcj4yMDE3
-LTA3LTIzVDIyOjAwOjAwLjAwMFo8L3NtZDpub3RBZnRlcj4KICA8bWFyazptYXJrIHhtbG5zOm1h
-cms9InVybjppZXRmOnBhcmFtczp4bWw6bnM6bWFyay0xLjAiPgogICAgPG1hcms6dHJlYXR5T3JT
-dGF0dXRlPgogICAgICA8bWFyazppZD4wMDA1MjAxMzczNDY5MjQ0MTM3MzQ2OTI0NC02NTUzNTwv
-bWFyazppZD4KICAgICAgPG1hcms6bWFya05hbWU+VGVzdCAmYW1wOyBWYWxpZGF0ZTwvbWFyazpt
-YXJrTmFtZT4KICAgICAgPG1hcms6aG9sZGVyIGVudGl0bGVtZW50PSJvd25lciI+CiAgICAgICAg
-PG1hcms6b3JnPkFnIGNvcnBvcmF0aW9uPC9tYXJrOm9yZz4KICAgICAgICA8bWFyazphZGRyPgog
-ICAgICAgICAgPG1hcms6c3RyZWV0PjEzMDUgQnJpZ2h0IEF2ZW51ZTwvbWFyazpzdHJlZXQ+CiAg
-ICAgICAgICA8bWFyazpjaXR5PkFyY2FkaWE8L21hcms6Y2l0eT4KICAgICAgICAgIDxtYXJrOnNw
-PkNBPC9tYXJrOnNwPgogICAgICAgICAgPG1hcms6cGM+OTAwMjg8L21hcms6cGM+CiAgICAgICAg
-ICA8bWFyazpjYz5VUzwvbWFyazpjYz4KICAgICAgICA8L21hcms6YWRkcj4KICAgICAgPC9tYXJr
-OmhvbGRlcj4KICAgICAgPG1hcms6Y29udGFjdCB0eXBlPSJhZ2VudCI+CiAgICAgICAgPG1hcms6
-bmFtZT5Ub255IEhvbGxhbmQ8L21hcms6bmFtZT4KICAgICAgICA8bWFyazpvcmc+QWcgY29ycG9y
-YXRpb248L21hcms6b3JnPgogICAgICAgIDxtYXJrOmFkZHI+CiAgICAgICAgICA8bWFyazpzdHJl
-ZXQ+MTMwNSBCcmlnaHQgQXZlbnVlPC9tYXJrOnN0cmVldD4KICAgICAgICAgIDxtYXJrOmNpdHk+
-QXJjYWRpYTwvbWFyazpjaXR5PgogICAgICAgICAgPG1hcms6c3A+Q0E8L21hcms6c3A+CiAgICAg
-ICAgICA8bWFyazpwYz45MDAyODwvbWFyazpwYz4KICAgICAgICAgIDxtYXJrOmNjPlVTPC9tYXJr
-OmNjPgogICAgICAgIDwvbWFyazphZGRyPgogICAgICAgIDxtYXJrOnZvaWNlPisxLjIwMjU1NjIz
-MDI8L21hcms6dm9pY2U+CiAgICAgICAgPG1hcms6ZmF4PisxLjIwMjU1NjIzMDE8L21hcms6ZmF4
-PgogICAgICAgIDxtYXJrOmVtYWlsPmluZm9AYWdjb3Jwb3JhdGlvbi5jb208L21hcms6ZW1haWw+
-CiAgICAgIDwvbWFyazpjb250YWN0PgogICAgICA8bWFyazpwcm90ZWN0aW9uPgogICAgICAgIDxt
-YXJrOmNjPlVTPC9tYXJrOmNjPgogICAgICAgIDxtYXJrOnJ1bGluZz5VUzwvbWFyazpydWxpbmc+
-CiAgICAgIDwvbWFyazpwcm90ZWN0aW9uPgogICAgICA8bWFyazpsYWJlbD50ZXN0YW5kdmFsaWRh
-dGU8L21hcms6bGFiZWw+CiAgICAgIDxtYXJrOmxhYmVsPnRlc3QtLS12YWxpZGF0ZTwvbWFyazps
-YWJlbD4KICAgICAgPG1hcms6bGFiZWw+dGVzdGFuZC12YWxpZGF0ZTwvbWFyazpsYWJlbD4KICAg
-ICAgPG1hcms6bGFiZWw+dGVzdC12YWxpZGF0ZTwvbWFyazpsYWJlbD4KICAgICAgPG1hcms6bGFi
-ZWw+dGVzdC1hbmR2YWxpZGF0ZTwvbWFyazpsYWJlbD4KICAgICAgPG1hcms6bGFiZWw+dGVzdC0t
-dmFsaWRhdGU8L21hcms6bGFiZWw+CiAgICAgIDxtYXJrOmxhYmVsPnRlc3R2YWxpZGF0ZTwvbWFy
-azpsYWJlbD4KICAgICAgPG1hcms6bGFiZWw+dGVzdC1hbmQtdmFsaWRhdGU8L21hcms6bGFiZWw+
-CiAgICAgIDxtYXJrOmdvb2RzQW5kU2VydmljZXM+TXVzaWNhbCBpbnN0cnVtZW50czwvbWFyazpn
-b29kc0FuZFNlcnZpY2VzPgogICAgICA8bWFyazpyZWZOdW0+MTIzNDwvbWFyazpyZWZOdW0+CiAg
-ICAgIDxtYXJrOnByb0RhdGU+MjAxMy0wMi0wMVQyMzowMDowMC4wMDBaPC9tYXJrOnByb0RhdGU+
-CiAgICAgIDxtYXJrOnRpdGxlPmd1aXRhcjwvbWFyazp0aXRsZT4KICAgICAgPG1hcms6ZXhlY0Rh
-dGU+MjAxMy0wMi0wMVQyMzowMDowMC4wMDBaPC9tYXJrOmV4ZWNEYXRlPgogICAgPC9tYXJrOnRy
-ZWF0eU9yU3RhdHV0ZT4KICA8L21hcms6bWFyaz4KPGRzOlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0
-cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyIgSWQ9Il83NmFkOGJiYy0xMTZjLTRiYzAt
-OTI3ZC1mOWVmODAyMjI1NTUiPjxkczpTaWduZWRJbmZvPjxkczpDYW5vbmljYWxpemF0aW9uTWV0
-aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+
-PGRzOlNpZ25hdHVyZU1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQv
-eG1sZHNpZy1tb3JlI3JzYS1zaGEyNTYiLz48ZHM6UmVmZXJlbmNlIFVSST0iI19jYjEzYjgwYy1h
-NTE4LTQ1MTktODUxYy0wYWUxNGMxZWJhZjMiPjxkczpUcmFuc2Zvcm1zPjxkczpUcmFuc2Zvcm0g
-QWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjZW52ZWxvcGVkLXNp
-Z25hdHVyZSIvPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAx
-LzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdv
-cml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1NiIvPjxkczpEaWdl
-c3RWYWx1ZT5jVlFIVFJubTg2T2RzUUFPTGVpNWNGTnYrYUpvcUY1TkY3Uk1ObERpcS9NPTwvZHM6
-RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PGRzOlJlZmVyZW5jZSBVUkk9IiNfNDQwODMyZjIt
-YjNlNS00NmI0LTkzZGUtMDNiYTcxZGVmMGM1Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3Jt
-IEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9k
-czpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9y
-Zy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+MWtnVnh3WXpRTjExb1Zl
-Vk1lME9Wc1hHL2lNbU1qWVVQS0RQNlZqNEc0QT08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJl
-bmNlPjwvZHM6U2lnbmVkSW5mbz48ZHM6U2lnbmF0dXJlVmFsdWUgSWQ9Il9iODVhY2Y0Mi05YmE1
-LTQ0NzMtODhhNy0wZDVkNjVlYTUzYjUiPmpSclNYdExEaDVtbUtrRUxGYTh5NWlwK3VUQTVqRkY2
-bEw4dS9TNW04b1orR1dGUUlSUzlIUU85ZGJCTk9YQU5HemtUQ0FEMW1qU0wKeGY5NStIRVJUVFFG
-ZkRKb2hTY1pBbkR0YVpTYlJxT2pQSUFMWmE4bjRkc090VlAzZHg1Y3d0QXRNaE1OK1ROdUF0c1dD
-b0tuMSt0SwovRDlwSlRoRWlTRjBKQkdQWWZ4U0NMSnZzWVgvc3hMSFo5Mlk4MWh3b0xVVE0yTkdo
-SlRaWnoxdVdsUFo0WERPOWJ2QVlMNTc2MVoyClNraFppSitFcHk0U0p5aTl1M2NoaThlR3cxWVI2
-R3VFMDA3WUVYdmg1MDhZdGdlV3hOeVRiSE04UEI2VDREakxwbmsxQjhhbzVCS2cKK25tRXBqd2E5
-aTEzR1JLcDdiZ1JBN2dtNjdndnJxaEordVFLdXc9PTwvZHM6U2lnbmF0dXJlVmFsdWU+PGRzOktl
-eUluZm8gSWQ9Il80NDA4MzJmMi1iM2U1LTQ2YjQtOTNkZS0wM2JhNzFkZWYwYzUiPjxkczpYNTA5
-RGF0YT48ZHM6WDUwOUNlcnRpZmljYXRlPk1JSUZOekNDQkIrZ0F3SUJBZ0lnTHJBYmV2b2FlNTJ5
-M2Y2QzJ0QjBTbjNwN1hKbTBUMDJGb2d4S0NmTmhYc3dEUVlKS29aSWh2Y04KQVFFTEJRQXdmREVM
-TUFrR0ExVUVCaE1DVlZNeFBEQTZCZ05WQkFvVE0wbHVkR1Z5Ym1WMElFTnZjbkJ2Y21GMGFXOXVJ
-R1p2Y2lCQgpjM05wWjI1bFpDQk9ZVzFsY3lCaGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF4TW1T
-VU5CVGs0Z1ZISmhaR1Z0WVhKcklFTnNaV0Z5CmFXNW5hRzkxYzJVZ1VHbHNiM1FnUTBFd0hoY05N
-VE13TnpBNU1EQXdNREF3V2hjTk1UZ3dOekE0TWpNMU9UVTVXakNCbHpFTE1Ba0cKQTFVRUJoTUNR
-a1V4SURBZUJnTlZCQWdURjBKeWRYTnpaV3h6TFVOaGNHbDBZV3dnVW1WbmFXOXVNUkV3RHdZRFZR
-UUhFd2hDY25WegpjMlZzY3pFUk1BOEdBMVVFQ2hNSVJHVnNiMmwwZEdVeFFEQStCZ05WQkFNVE4x
-SkZWazlMUlVRZ1NVTkJUazRnVkUxRFNDQkJkWFJvCmIzSnBlbVZrSUZSeVlXUmxiV0Z5YXlCUWFX
-eHZkQ0JXWVd4cFpHRjBiM0l3Z2dFaU1BMEdDU3FHU0liM0RRRUJBUVVBQTRJQkR3QXcKZ2dFS0Fv
-SUJBUUN0TXRRU3p0Uk9jUUZlSkhObi95UU1ZblZaYXFVcEVHaHVRejRzOUNlUFF6MWIwM1Zsbll5
-amFOVms1THNrR0pGaQpzUmdpWk5CQWpqanRsMkFWekQ1WThtd21wQ1YyNFIwTnRyS0FmbG5HNkNB
-MTVyQlRzSFVGRGY2QmFxeU1haXpBczRRSUFHaGRXT1Y3CjlHeTN3bnhXU212Q2tCdDVCUGthTW9W
-M3hrVXZYbC9PKzlDQ0ZlSDBVZUJwczVpM3I3QTUzZjdYNWpqdVV1c2doT0Q3R1Z2WTBOTjcKaWNs
-dVMrY1dFb1JBNXdQSU0vZjliQ0FGRk5nQnZLS25YQ3RUdElMblAzQmNuU3RiSmdodElPYlNlamth
-ZWlkTUQyWGx6bWo4dXdJUAp0cFZic2RZVnhBaGd0NTJzZVF2ekZTNEVXWHJwT3gvbEY3RlBTTEow
-aTlyRFQxYkJBZ01CQUFHamdnR0hNSUlCZ3pBTUJnTlZIUk1CCkFmOEVBakFBTUIwR0ExVWREZ1FX
-QkJSODh0Z2FHTklQV3JGbzVnZmZRdTBaZlNmVmhEQ0J4Z1lEVlIwakJJRytNSUc3Z0JURHJUNm0K
-MWhFQVJZQmNPbGRLaW0zY01RMmVjYUdCZ0tSK01Id3hDekFKQmdOVkJBWVRBbFZUTVR3d09nWURW
-UVFLRXpOSmJuUmxjbTVsZENCRApiM0p3YjNKaGRHbHZiaUJtYjNJZ1FYTnphV2R1WldRZ1RtRnRa
-WE1nWVc1a0lFNTFiV0psY25NeEx6QXRCZ05WQkFNVEprbERRVTVPCklGUnlZV1JsYldGeWF5QkRi
-R1ZoY21sdVoyaHZkWE5sSUZCcGJHOTBJRU5CZ2lBdXNCdDYraHA3bmJMZC9vTGEwSFJLZmVudGNt
-YlIKUFRZV2lERW9KODJGZVRBT0JnTlZIUThCQWY4RUJBTUNCNEF3TkFZRFZSMGZCQzB3S3pBcG9D
-ZWdKWVlqYUhSMGNEb3ZMMk55YkM1cApZMkZ1Ymk1dmNtY3ZkRzFqYUY5d2FXeHZkQzVqY213d1JR
-WURWUjBnQkQ0d1BEQTZCZ01xQXdRd016QXhCZ2dyQmdFRkJRY0NBUllsCmFIUjBjRG92TDNkM2R5
-NXBZMkZ1Ymk1dmNtY3ZjR2xzYjNSZmNtVndiM05wZEc5eWVUQU5CZ2txaGtpRzl3MEJBUXNGQUFP
-Q0FRRUEKdWpsNmY2ZTZEK0lKdUZlQlI0UlBoVm9nRUxKRzYvWCs0bjFkbkxTRHAvdjJrb0luZlFx
-U3FSY1JrM3h1dGhZano3djZ5M3A3b1c2Ygp0czNCVHZRSU1ldTVKNFRJa2JPak5sVmdhby9qZTlm
-L2dUN2lLNURhSldIRlFwblludmpYaFEzVjZSa1M3ZEpsNEZaRWl5NnBMOG01ClgxcDVwQ3pjRnFP
-eU0vd1I4S3pmQlVYK0toWGFBV2d0dURla0FUbVI1eUNGZ1BtQW9aZlBrcFVGZ01KcFk1WWNSdStL
-MjRXVm50NFkKVzd5dy9HRjVpNmRwVFV0cEZNNy9ZVUFyenBkZlUrZWNvblk0ZE1LZFo2c0s4ZmFq
-NGlVSUcrS0VjenNZMW05ODlWSWJwdGd4RFZzNQpGZU00Z1YvSDd3YU1tbVpkeVlQNHBZUkMzeWRI
-T2tiYlpnbFhadz09PC9kczpYNTA5Q2VydGlmaWNhdGU+PC9kczpYNTA5RGF0YT48L2RzOktleUlu
-Zm8+PC9kczpTaWduYXR1cmU+PC9zbWQ6c2lnbmVkTWFyaz4=
------END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/smd/active.smd b/core/src/test/resources/google/registry/tmch/smd/active.smd
new file mode 100644
index 000000000..45e39c7aa
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/smd/active.smd
@@ -0,0 +1,123 @@
+Marks: Test & Validate
+smdID: 000000851669081693741-65535
+U-labels: test---validate, test--validate, test-and-validate, test-andvalidate, test-validate, testand-validate, testandvalidate, testvalidate
+notBefore: 2022-11-22T01:48:13.741Z
+notAfter: 2027-10-18T14:57:36.681Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il9jMDJk
+ZTdhNC00YjBjLTQwYTYtOWYzMy04NTgwZTY2YjY0YWIiPjxzbWQ6aWQ+MDAwMDAwODUxNjY5MDgx
+NjkzNzQxLTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMTo0ODoxMy43NDFaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0xOFQxNDo1NzozNi42ODFaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazpj
+b3VydD48bWFyazppZD4wMDAxMzcxNTAzMDY3ODY4MTUwMzA2Nzg2OC0xPC9tYXJrOmlkPjxtYXJr
+Om1hcmtOYW1lPlRlc3QgJmFtcDsgVmFsaWRhdGU8L21hcms6bWFya05hbWU+PG1hcms6aG9sZGVy
+IGVudGl0bGVtZW50PSJvd25lciI+PG1hcms6bmFtZT5Ub255IEhvbGxhbmQ8L21hcms6bmFtZT48
+bWFyazpvcmc+QWcgY29ycG9yYXRpb248L21hcms6b3JnPjxtYXJrOmFkZHI+PG1hcms6c3RyZWV0
+PjEzMDUgQnJpZ2h0IEF2ZW51ZTwvbWFyazpzdHJlZXQ+PG1hcms6Y2l0eT5BcmNhZGlhPC9tYXJr
+OmNpdHk+PG1hcms6cGM+OTAwMjg8L21hcms6cGM+PG1hcms6Y2M+VVM8L21hcms6Y2M+PC9tYXJr
+OmFkZHI+PC9tYXJrOmhvbGRlcj48bWFyazpjb250YWN0IHR5cGU9ImFnZW50Ij48bWFyazpuYW1l
+PlRvbnkgSG9sbGFuZDwvbWFyazpuYW1lPjxtYXJrOm9yZz5BZyBjb3Jwb3JhdGlvbjwvbWFyazpv
+cmc+PG1hcms6YWRkcj48bWFyazpzdHJlZXQ+QnJpZ2h0IEF2ZW51ZSAxMzA1IDwvbWFyazpzdHJl
+ZXQ+PG1hcms6Y2l0eT5BcmNhZGlhPC9tYXJrOmNpdHk+PG1hcms6c3A+Q0E8L21hcms6c3A+PG1h
+cms6cGM+OTAwMjg8L21hcms6cGM+PG1hcms6Y2M+VVM8L21hcms6Y2M+PC9tYXJrOmFkZHI+PG1h
+cms6dm9pY2U+KzEuMjAyNTU2MjMwMjwvbWFyazp2b2ljZT48bWFyazpmYXg+KzEuMjAyNTU2MjMw
+MTwvbWFyazpmYXg+PG1hcms6ZW1haWw+aW5mb0BhZ2NvcnBvcmF0aW9uLmNvbTwvbWFyazplbWFp
+bD48L21hcms6Y29udGFjdD48bWFyazpsYWJlbD50ZXN0LS0tdmFsaWRhdGU8L21hcms6bGFiZWw+
+PG1hcms6bGFiZWw+dGVzdC0tdmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+dGVzdC1h
+bmQtdmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+dGVzdC1hbmR2YWxpZGF0ZTwvbWFy
+azpsYWJlbD48bWFyazpsYWJlbD50ZXN0LXZhbGlkYXRlPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVs
+PnRlc3RhbmQtdmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+dGVzdGFuZHZhbGlkYXRl
+PC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnRlc3R2YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazpn
+b29kc0FuZFNlcnZpY2VzPmd1aXRhcjwvbWFyazpnb29kc0FuZFNlcnZpY2VzPjxtYXJrOnJlZk51
+bT4xMjM0PC9tYXJrOnJlZk51bT48bWFyazpwcm9EYXRlPjIwMTMtMDEtMDFUMDA6MDA6MDAuMDAw
+WjwvbWFyazpwcm9EYXRlPjxtYXJrOmNjPlVTPC9tYXJrOmNjPjxtYXJrOmNvdXJ0TmFtZT5Ib3Zl
+PC9tYXJrOmNvdXJ0TmFtZT48L21hcms6Y291cnQ+PC9tYXJrOm1hcms+PGRzOlNpZ25hdHVyZSB4
+bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyIgSWQ9Il83MWU3MWEw
+My1mNzlmLTQ4NzQtYmQ0Zi1hZTJkZTliMDljMjAiPjxkczpTaWduZWRJbmZvPjxkczpDYW5vbmlj
+YWxpemF0aW9uTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwt
+ZXhjLWMxNG4jIi8+PGRzOlNpZ25hdHVyZU1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMu
+b3JnLzIwMDEvMDQveG1sZHNpZy1tb3JlI3JzYS1zaGEyNTYiLz48ZHM6UmVmZXJlbmNlIFVSST0i
+I19jMDJkZTdhNC00YjBjLTQwYTYtOWYzMy04NTgwZTY2YjY0YWIiPjxkczpUcmFuc2Zvcm1zPjxk
+czpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcj
+ZW52ZWxvcGVkLXNpZ25hdHVyZSIvPjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3
+LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2Vz
+dE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZW5jI3NoYTI1
+NiIvPjxkczpEaWdlc3RWYWx1ZT5wU1JWZy9zcVIxOC9RSFQ5SHV4SnlnekV0b3BsZ2Jwc2FjYk51
+bzZhcnhrPTwvZHM6RGlnZXN0VmFsdWU+PC9kczpSZWZlcmVuY2U+PGRzOlJlZmVyZW5jZSBVUkk9
+IiNfZTk5MmRmNTMtYjU3ZC00OTk4LThlMjktNTVkZjFkNGYxMThiIj48ZHM6VHJhbnNmb3Jtcz48
+ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhj
+LWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRw
+Oi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+ZXRE
+MTRyZngrbnVQMVJ3TDlub3NqcFoweUE4bGJQNVFyWHZjaCtGYmJHND08L2RzOkRpZ2VzdFZhbHVl
+PjwvZHM6UmVmZXJlbmNlPjwvZHM6U2lnbmVkSW5mbz48ZHM6U2lnbmF0dXJlVmFsdWUgSWQ9Il9k
+N2MyMmU0Mi1jOTk4LTRiMDktYTkwMC03N2NmNjU4NTNiZmMiPlBBenJhaXpueUdNWjhBdk44cUFN
+WEgwL0g2WGl3ZDByRlJHUVBqS2U1bGJsM01IN3J2MHhLQzgyTFF4MEVYRndpVzhvSCt4ZExobGsm
+IzEzOwo3ZmVpbHk4R0dwaTA4STM0d2F4MnJVMkxZaFE3VTVBcDZUUHMxTWFVdWVwRjl6SDZHS1ZG
+UmwrdjJmYmVCMzV3akdMelN2Y0tXTDllJiMxMzsKb21kTFBrclRTSSs4OFc1ejdJWi9EMDJzZzlq
+ek9QSUVLOG9IR2djczNyRjRpWTVWNjVxSlVFUldqaUxia1Uxa0VYTXZFdXBJaDJGRiYjMTM7CmQy
+RlFkOUJqS09jNWZ2UWFOdmhlU084eFppU3ZUaWtFdkVod2VuSCtnMU9JMlJsWmdZWjNLQVhQUGZX
+WUo3WlYzN1liTXIxc3FsUDMmIzEzOwpKTkNySFRCdUxYY25tMS9pUVF2WnU1ekw0TmIwZjR3UHdn
+NHlDbHJVRkVRMDdXcDJYUWRBMFFzTk5jT0oyeDVDWTZpS2VCazEvMmZPJiMxMzsKZzVUM3dHYVVx
+dThuUVJsbzhvMnk4RUFFYXQxTUJTMTlIMDJjUmZkWEgzcEdOb1dMTGErdlVRZldzUEY5Q1R0a3Zr
+L3BBeHpXSmM5eSYjMTM7CmtsekVjbVNUK3FVTmsrdkxlZzUxUWhwZ0h4L0syWmdtMFJEL0tMM0x4
+a1YwWjhPZXhyNHVDRHA0UW91OWhKbmZ4eURmOGFuNnRLdDgmIzEzOwpDeU5KLzNwSzlOQ0NCM0li
+Q3ovTWVIOEVTSmFWdTh0ajJFMVNMWC9BWk1HVXlMZlhxNmZMNHNxUkN0MGpDSHkyWDlXU2Rvamt2
+bjYwJiMxMzsKejh5cnROTVFSbFVoWW9qaWllajJ3ajFlY2taUE1HUUNUQ1dpSzZva1Q0cGtwZ0N5
+elF3bjNKeEwvazFBMFRSUU1pNnVxL3BXaHNzPTwvZHM6U2lnbmF0dXJlVmFsdWU+PGRzOktleUlu
+Zm8gSWQ9Il9lOTkyZGY1My1iNTdkLTQ5OTgtOGUyOS01NWRmMWQ0ZjExOGIiPjxkczpYNTA5RGF0
+YT48ZHM6WDUwOUNlcnRpZmljYXRlPk1JSUhYekNDQlVlZ0F3SUJBZ0lVWHFJL3ZkMThDYWc5OG9O
+cGR6VjdCaXkvNkVBd0RRWUpLb1pJaHZjTkFRRU5CUUF3ZkRFTE1Ba0cmIzEzOwpBMVVFQmhNQ1ZW
+TXhQREE2QmdOVkJBb01NMGx1ZEdWeWJtVjBJRU52Y25CdmNtRjBhVzl1SUdadmNpQkJjM05wWjI1
+bFpDQk9ZVzFsJiMxMzsKY3lCaGJtUWdUblZ0WW1WeWN6RXZNQzBHQTFVRUF3d21TVU5CVGs0Z1ZI
+SmhaR1Z0WVhKcklFTnNaV0Z5YVc1bmFHOTFjMlVnVUdscyYjMTM7CmIzUWdRMEV3SGhjTk1qSXhN
+VEUyTVRNeU9EVTVXaGNOTWpjeE1URTFNVE15T0RVNVdqQ0IwREVMTUFrR0ExVUVCaE1DUWtVeEVU
+QVAmIzEzOwpCZ05WQkFnVENFSnlkWE56Wld4ek1SSXdFQVlEVlFRSEV3bFdhV3gyYjI5eVpHVXhN
+ekF4QmdOVkJBb1RLa1JsYkc5cGRIUmxJRU52JiMxMzsKYm5OMWJIUnBibWNnWVc1a0lFRmtkbWx6
+YjNKNUlFTldRa0V2VTBOU1RERStNRHdHQTFVRUF4TTFTVU5CVGs0Z1ZFMURTQ0JCZFhSbyYjMTM7
+CmIzSnBlbVZrSUZSeVlXUmxiV0Z5YXlCUWFXeHZkQ0JXWVd4cFpHRjBiM0lnVm1Gc2FXUXhKVEFq
+QmdrcWhraUc5dzBCQ1FFV0ZtSmwmIzEzOwpkRzFqYUhOdFpFQmtaV3h2YVhSMFpTNWpiMjB3Z2dJ
+aU1BMEdDU3FHU0liM0RRRUJBUVVBQTRJQ0R3QXdnZ0lLQW9JQ0FRQzZGSnd6JiMxMzsKS3FRVlg2
+ZkczL0VMUlNHV1Y5R3JLYUZNS21oV0l4ZXB3UlpONk14TXFrZDVEbllmaVQrV3A5OGpFa3FnVHgy
+VU1iOXF1Z2NHTlY2ZyYjMTM7CjM1L0NyUWIvRi9tejNDNHNmTE51RHBTcUs5UUY4K3BhVEg2aFFt
+ck9wcVYrVVR2ZGo5U01nS0d5Rml6Uzg4Q0RXTXg0dzNpNEZBS2UmIzEzOwo2TlJzSlJHVEF0S0R1
+TUhjQTRzajA4R2plM2xQV2NnRnZjUU5EVmVFQlR1T0hCRytSaGo3VjFKaU5HUC80ZXBUWFRGWGdQ
+RkRnZXozJiMxMzsKWUFmeHFwYnVPNFRYNmJiWWRrMm52TUxGdkxFTmtDRll1bG5ZUHpnbkVCR1NN
+S0lhQUlsYitzY0hDdldnV2oyVExnd2gyR0pOY3pWTSYjMTM7CjFMUE1xR1MrVWtpOU1oNzk4MjIv
+eG9hcjQ5OHhEeDJZeC84c3dnRU5MU2dDc1FBVzhuTWd3V242QWJZbDJSQUJYdXJheUZzbjRQMVIm
+IzEzOwp1UU5tVXAvcXJSS1J2U0pyMU9Ma0haZkZUY1NZUWFWaXVNWVBYekd6OHRtTUxsbUkvQjZB
+Q0g0QXdSTWRuWXZGTzNLSTFSQm5QS0lkJiMxMzsKd3dmVXBaNUlUSXBiQTdDR2dUeDFxeHRNMXdJ
+VXI3cEhlS1A2alZlM2tkRExnKy9CWjJ4TUV0Qms1YThZN0I0djN4d0hYR1R2VjhtTiYjMTM7CjBB
+Zy9TeVQvUVV5RVJoWFV5QU4yK0V3WitTUUNVeU5memlvV1E4NzhlR3lrVSs0NitCYmdJM0lJcjM2
+WEtQd216dDBTWitLSTN0bkYmIzEzOwpUbG45bVgwS0MwaWRvajV5a3pQb0MvTUllZDBzcDRUaWd4
+RWJXTng3RUY4MFB2Ui9EREV3VlBFRWtrank2M1hGdWx4aUNRSURBUUFCJiMxMzsKbzRJQmdqQ0NB
+WDR3REFZRFZSMFRBUUgvQkFJd0FEQU9CZ05WSFE4QkFmOEVCQU1DQjRBd0hRWURWUjBPQkJZRUZI
+bjlzMERFYTJrdiYjMTM7CmdFL2VJT1RzcW9XODVNWEZNSUc2QmdOVkhTTUVnYkl3Z2ErQUZFZDdU
+NjU2VVpHMTBiK2ROdW1HZnpZV0JLbEZvWUdBcEg0d2ZERUwmIzEzOwpNQWtHQTFVRUJoTUNWVk14
+UERBNkJnTlZCQW9NTTBsdWRHVnlibVYwSUVOdmNuQnZjbUYwYVc5dUlHWnZjaUJCYzNOcFoyNWxa
+Q0JPJiMxMzsKWVcxbGN5QmhibVFnVG5WdFltVnljekV2TUMwR0ExVUVBd3dtU1VOQlRrNGdWSEpo
+WkdWdFlYSnJJRU5zWldGeWFXNW5hRzkxYzJVZyYjMTM7ClVHbHNiM1FnUTBHQ0ZIcHFiVEZlSmNQ
+dFVDOVh1dVBLUHNMd0RSK01NRFFHQTFVZEh3UXRNQ3N3S2FBbm9DV0dJMmgwZEhBNkx5OWomIzEz
+OwpjbXd1YVdOaGJtNHViM0puTDNSdFkyaGZjR2xzYjNRdVkzSnNNRXdHQTFVZElBUkZNRU13RUFZ
+T0t3WUJCQUdDeVJzQkJZTTdEQW93JiMxMzsKTHdZSUt3WUJCUVVIQWdFd0l6QWhCZ2dyQmdFRkJR
+Y0NBUllWYUhSMGNITTZMeTlqY0hNdWFXTmhibTR1YjNKbk1BMEdDU3FHU0liMyYjMTM7CkRRRUJE
+UVVBQTRJQ0FRQmRTYXQ1NnVlakxuQWpGSUY5NWRqWVdJNnMvL042WVh4c3JyTWtHQlA4RWV6UHlo
+TGg2YXdQNHo3UTlRQUkmIzEzOwpRWmtZb3hybC8xeTArYnlWMnFuVFVVQ0xScEsvQkRwL2hjZndQ
+ZktDQS8yUlFDSEpyYjYrejBlbkRQRlJLME5LbXdPY2RsR3RVazBtJiMxMzsKUGdXR1NLdHV3VnNQ
+QWhUREp1aG9zWk9oa05mK25TT09IclFPbjFFMnJ6T3JkL2tRbHFpQ3dSSDk3OTZOcFRBK0hTTWZP
+b2JKRUVQcSYjMTM7CnRwRjdQNXFid3RsOTVVYTVPcDRBaGE3MEhIZlVGUzRCT1FLTEJWZk1aZE9S
+K2lQb2g1T3dBSytodFlrRkNHOVAyV0h1N3dmOEVDK1cmIzEzOwo3azk2Z3ZUZDh4RTdvdW9hYlQy
+eDZZZllxRWxQSGlVL0lNOWdWeldXTC9zdllEeVNWdW9Gd0JqRE5OMWNkcTBxT1lSMXl1UzFjLzlE
+JiMxMzsKRlI3ZW83R0ZFQ3krVEJkN0lpS1JmQlZlWUdPT1BNbm9GZnhSTFdycHNXTm53RDdsa1Br
+TENnRkNrKzh5RWNPUmc2MjVtbzY1ejR5NiYjMTM7Cko0Szhmb2RhN3F3bVhOUDNSUzE4b242Qkh0
+OGxRK2JYZ09IbXhJSGswYU8wcU5EcWd2THIyRmx5TEdKR2lFTVJxRE1NUjYvYTA2YnQmIzEzOwpr
+blVNSGw3Q3FNZmpJa2pQNFZOTnlHUGRKZ3dWazJrZWI5dU5GdkpDeFQrTTJmR1hRMU5iSk5mdHY1
+TWdTc3A5TjF5K3g2Z0EzRWh3JiMxMzsKeUhsbUpCNFlNdG84dFRWMWk4NHhQWHhpMkNBZURhR0R1
+d29zdDhZVUNTanE3UkNLOHRHY2FBWXJrWFFZMnlRZlgzY3dEc0V4UnFWVyYjMTM7CnlyanlSdCtO
+Nm1LOTlRPT08L2RzOlg1MDlDZXJ0aWZpY2F0ZT48L2RzOlg1MDlEYXRhPjwvZHM6S2V5SW5mbz48
+L2RzOlNpZ25hdHVyZT48L3NtZDpzaWduZWRNYXJrPgo=
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/smd/invalid.smd b/core/src/test/resources/google/registry/tmch/smd/invalid.smd
new file mode 100644
index 000000000..38940928c
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/smd/invalid.smd
@@ -0,0 +1,125 @@
+Marks: Test & Validate
+smdID: 000000871669081697634-65535
+U-labels: test---validate, test--validate, test-and-validate, test-andvalidate, test-validate, testand-validate, testandvalidate, testet-validate, testetvalidate, testvalidate
+notBefore: 2022-11-22T01:48:17.634Z
+notAfter: 2027-10-18T14:57:36.681Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il84ODE1
+YTFlNC0wZDE2LTQzYzgtOWVlMS01MDI5YjZhODBjMjgiPjxzbWQ6aWQ+MDAwMDAwODcxNjY5MDgx
+Njk3NjM0LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMTo0ODoxNy42MzRaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0xOFQxNDo1NzozNi42ODFaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
+cmFkZW1hcms+PG1hcms6aWQ+MDAwMTM3MTUwMzA2ODA0OTE1MDMwNjgwNDktMTwvbWFyazppZD48
+bWFyazptYXJrTmFtZT5UZXN0ICZhbXA7IFZhbGlkYXRlPC9tYXJrOm1hcmtOYW1lPjxtYXJrOmhv
+bGRlciBlbnRpdGxlbWVudD0ib3duZXIiPjxtYXJrOm5hbWU+VG9ueSBIb2xsYW5kPC9tYXJrOm5h
+bWU+PG1hcms6b3JnPkFnIGNvcnBvcmF0aW9uPC9tYXJrOm9yZz48bWFyazphZGRyPjxtYXJrOnN0
+cmVldD4xMzA1IEJyaWdodCBBdmVudWU8L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+QXJjYWRpYTwv
+bWFyazpjaXR5PjxtYXJrOnBjPjkwMDI4PC9tYXJrOnBjPjxtYXJrOmNjPlVTPC9tYXJrOmNjPjwv
+bWFyazphZGRyPjwvbWFyazpob2xkZXI+PG1hcms6Y29udGFjdCB0eXBlPSJhZ2VudCI+PG1hcms6
+bmFtZT5Ub255IEhvbGxhbmQ8L21hcms6bmFtZT48bWFyazpvcmc+QWcgY29ycG9yYXRpb248L21h
+cms6b3JnPjxtYXJrOmFkZHI+PG1hcms6c3RyZWV0PkJyaWdodCBBdmVudWUgMTMwNSA8L21hcms6
+c3RyZWV0PjxtYXJrOmNpdHk+QXJjYWRpYTwvbWFyazpjaXR5PjxtYXJrOnNwPkNBPC9tYXJrOnNw
+PjxtYXJrOnBjPjkwMDI4PC9tYXJrOnBjPjxtYXJrOmNjPlVTPC9tYXJrOmNjPjwvbWFyazphZGRy
+PjxtYXJrOnZvaWNlPisxLjIwMjU1NjIzMDI8L21hcms6dm9pY2U+PG1hcms6ZmF4PisxLjIwMjU1
+NjIzMDE8L21hcms6ZmF4PjxtYXJrOmVtYWlsPmluZm9AYWdjb3Jwb3JhdGlvbi5jb208L21hcms6
+ZW1haWw+PC9tYXJrOmNvbnRhY3Q+PG1hcms6anVyaXNkaWN0aW9uPlVTPC9tYXJrOmp1cmlzZGlj
+dGlvbj48bWFyazpjbGFzcz4xNTwvbWFyazpjbGFzcz48bWFyazpsYWJlbD50ZXN0LS0tdmFsaWRh
+dGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+dGVzdC0tdmFsaWRhdGU8L21hcms6bGFiZWw+PG1h
+cms6bGFiZWw+dGVzdC1hbmQtdmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+dGVzdC1h
+bmR2YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0LXZhbGlkYXRlPC9tYXJrOmxh
+YmVsPjxtYXJrOmxhYmVsPnRlc3RhbmQtdmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+
+dGVzdGFuZHZhbGlkYXRlPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnRlc3RldC12YWxpZGF0ZTwv
+bWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0ZXR2YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazps
+YWJlbD50ZXN0dmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6Z29vZHNBbmRTZXJ2aWNlcz5ndWl0
+YXI8L21hcms6Z29vZHNBbmRTZXJ2aWNlcz48bWFyazpyZWdOdW0+MTIzNDwvbWFyazpyZWdOdW0+
+PG1hcms6cmVnRGF0ZT4yMDEzLTAxLTAxVDAwOjAwOjAwLjAwMFo8L21hcms6cmVnRGF0ZT48L21h
+cms6dHJhZGVtYXJrPjwvbWFyazptYXJrPjxkczpTaWduYXR1cmUgeG1sbnM6ZHM9Imh0dHA6Ly93
+d3cudzMub3JnLzIwMDAvMDkveG1sZHNpZyMiIElkPSJfODY1OTE3Y2ItNmNkOS00NDcxLWExMDMt
+M2MzYjEyNTYxY2I0Ij48ZHM6U2lnbmVkSW5mbz48ZHM6Q2Fub25pY2FsaXphdGlvbk1ldGhvZCBB
+bGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjxkczpT
+aWduYXR1cmVNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGRz
+aWctbW9yZSNyc2Etc2hhMjU2Ii8+PGRzOlJlZmVyZW5jZSBVUkk9IiNfODgxNWExZTQtMGQxNi00
+M2M4LTllZTEtNTAyOWI2YTgwYzI4Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29y
+aXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1
+cmUiLz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94
+bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGht
+PSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFs
+dWU+NXBGWnNMeXg0SU5iRmVJbStZUlZ6ZHI3dncyNHpmVmltRS9DL3JrTGIyST08L2RzOkRpZ2Vz
+dFZhbHVlPjwvZHM6UmVmZXJlbmNlPjxkczpSZWZlcmVuY2UgVVJJPSIjXzEzMzQ0ZTY4LWE1ZWYt
+NDAyZC05ZDg4LTRlMTdkMGE3N2YzZCI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdv
+cml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJh
+bnNmb3Jtcz48ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAw
+MS8wNC94bWxlbmMjc2hhMjU2Ii8+PGRzOkRpZ2VzdFZhbHVlPnd0RE1FWUxRaFcrdzdPM0pYYVRT
+clV1ejdwNHIzd3UyUldrSlJ1alRuVW89PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48
+L2RzOlNpZ25lZEluZm8+PGRzOlNpZ25hdHVyZVZhbHVlIElkPSJfOGFlZjEyMDEtMmUwYi00YmZh
+LTg0YTAtNmU5NzExYjVjOWE4Ij5HSnFjNCsyL2VvbzFnWm95SFVIVTk5ZkZ2WldJUUxXaVptdU42
+bEkzR3hHdWRFQVpETHhvdDJjSjZ5dWlYblJnOVErNnYzRlVnTnNDJiMxMzsKQU84OG45OFNhemhW
+aytlaFhVa0VHemQwMzQrK0JWZzlwaURnRTluNTczWHZvSVExQjNvQWpuYTI3dXRDOC9JS2RjWTM1
+Wkx0WThXdiYjMTM7CitIalZuOUVkNnFXaFk2eFFHS0xaQ2sxL0Fsa2VhdEZzaDVTRFBnVkJ2Y3J6
+aFNpenZnSFFZSTVQM2tZdTlLZzNGYVhDUk5OQWUwN0ImIzEzOwpQRUVLNkVXWnFWdHJZdVVUcUtM
+Tm1OQTlmWHgrZTkrNHZsa001TWE1Y2ZXQ0gzOWRoWkh2MG91Y090dEsxM1Bvd2laKzArdnRTRG1j
+JiMxMzsKWGtWK3lmREkwbkR4VDNsRUx6bGl1QUlxa0FvSGRYS1Vndk1tWVdWSThQTm4zU2hZOGpH
+M3ZJR3Z1NHVvYWVrZm8vWDdoSnhNajROeSYjMTM7Cm9GM2pocDVMTFlTRmE5bkFVSEZOYlp6QnhC
+Ry9NNlZmOE5kM0hoUERmL0xZcWxxZ0NrcWtjQ3h2blRJZWV2NHhCSTNDMkRDNkVqNFUmIzEzOwpx
+VnUxVnNGV0FmaUtWYVVwbVlDeFlaeWFLL3FsQTZqV0VjQU1QVUJSZGxTQWdTdUZDTmRiZnRXK294
+U1Jta1plbStPbE9oWHdoUCt3JiMxMzsKWlhrTGlzVmIzZksrQWlRYWpENjU2Rm41V0JWMmkvWWZI
+ckJJM2s3SlByeGFJTmxreVgxZmVCM3hieG5ORlJsS1hJUkpmdVMyQVRnRSYjMTM7CkhwWndPTlRM
+SXVJWGlUUDlZbFViVW5HY3NXU3NzNXd4cTBXK3g2eWk1OC84YUVVMnZXOGVteXpNRGZDYWJicGl2
+ZjlZbUJQMEpCST08L2RzOlNpZ25hdHVyZVZhbHVlPjxkczpLZXlJbmZvIElkPSJfMTMzNDRlNjgt
+YTVlZi00MDJkLTlkODgtNGUxN2QwYTc3ZjNkIj48ZHM6WDUwOURhdGE+PGRzOlg1MDlDZXJ0aWZp
+Y2F0ZT5NSUlIWHpDQ0JVZWdBd0lCQWdJVVhxSS92ZDE4Q2FnOThvTnBkelY3Qml5LzZFQXdEUVlK
+S29aSWh2Y05BUUVOQlFBd2ZERUxNQWtHJiMxMzsKQTFVRUJoTUNWVk14UERBNkJnTlZCQW9NTTBs
+dWRHVnlibVYwSUVOdmNuQnZjbUYwYVc5dUlHWnZjaUJCYzNOcFoyNWxaQ0JPWVcxbCYjMTM7CmN5
+QmhibVFnVG5WdFltVnljekV2TUMwR0ExVUVBd3dtU1VOQlRrNGdWSEpoWkdWdFlYSnJJRU5zWldG
+eWFXNW5hRzkxYzJVZ1VHbHMmIzEzOwpiM1FnUTBFd0hoY05Nakl4TVRFMk1UTXlPRFU1V2hjTk1q
+Y3hNVEUxTVRNeU9EVTVXakNCMERFTE1Ba0dBMVVFQmhNQ1FrVXhFVEFQJiMxMzsKQmdOVkJBZ1RD
+RUp5ZFhOelpXeHpNUkl3RUFZRFZRUUhFd2xXYVd4MmIyOXlaR1V4TXpBeEJnTlZCQW9US2tSbGJH
+OXBkSFJsSUVOdiYjMTM7CmJuTjFiSFJwYm1jZ1lXNWtJRUZrZG1semIzSjVJRU5XUWtFdlUwTlNU
+REUrTUR3R0ExVUVBeE0xU1VOQlRrNGdWRTFEU0NCQmRYUm8mIzEzOwpiM0pwZW1Wa0lGUnlZV1Js
+YldGeWF5QlFhV3h2ZENCV1lXeHBaR0YwYjNJZ1ZtRnNhV1F4SlRBakJna3Foa2lHOXcwQkNRRVdG
+bUpsJiMxMzsKZEcxamFITnRaRUJrWld4dmFYUjBaUzVqYjIwd2dnSWlNQTBHQ1NxR1NJYjNEUUVC
+QVFVQUE0SUNEd0F3Z2dJS0FvSUNBUUM2Rkp3eiYjMTM7CktxUVZYNmZHMy9FTFJTR1dWOUdyS2FG
+TUttaFdJeGVwd1JaTjZNeE1xa2Q1RG5ZZmlUK1dwOThqRWtxZ1R4MlVNYjlxdWdjR05WNmcmIzEz
+OwozNS9DclFiL0YvbXozQzRzZkxOdURwU3FLOVFGOCtwYVRINmhRbXJPcHFWK1VUdmRqOVNNZ0tH
+eUZpelM4OENEV014NHczaTRGQUtlJiMxMzsKNk5Sc0pSR1RBdEtEdU1IY0E0c2owOEdqZTNsUFdj
+Z0Z2Y1FORFZlRUJUdU9IQkcrUmhqN1YxSmlOR1AvNGVwVFhURlhnUEZEZ2V6MyYjMTM7CllBZnhx
+cGJ1TzRUWDZiYllkazJudk1MRnZMRU5rQ0ZZdWxuWVB6Z25FQkdTTUtJYUFJbGIrc2NIQ3ZXZ1dq
+MlRMZ3doMkdKTmN6Vk0mIzEzOwoxTFBNcUdTK1VraTlNaDc5ODIyL3hvYXI0OTh4RHgyWXgvOHN3
+Z0VOTFNnQ3NRQVc4bk1nd1duNkFiWWwyUkFCWHVyYXlGc240UDFSJiMxMzsKdVFObVVwL3FyUktS
+dlNKcjFPTGtIWmZGVGNTWVFhVml1TVlQWHpHejh0bU1MbG1JL0I2QUNINEF3Uk1kbll2Rk8zS0kx
+UkJuUEtJZCYjMTM7Cnd3ZlVwWjVJVElwYkE3Q0dnVHgxcXh0TTF3SVVyN3BIZUtQNmpWZTNrZERM
+ZysvQloyeE1FdEJrNWE4WTdCNHYzeHdIWEdUdlY4bU4mIzEzOwowQWcvU3lUL1FVeUVSaFhVeUFO
+MitFd1orU1FDVXlOZnppb1dRODc4ZUd5a1UrNDYrQmJnSTNJSXIzNlhLUHdtenQwU1orS0kzdG5G
+JiMxMzsKVGxuOW1YMEtDMGlkb2o1eWt6UG9DL01JZWQwc3A0VGlneEViV054N0VGODBQdlIvRERF
+d1ZQRUVra2p5NjNYRnVseGlDUUlEQVFBQiYjMTM7Cm80SUJnakNDQVg0d0RBWURWUjBUQVFIL0JB
+SXdBREFPQmdOVkhROEJBZjhFQkFNQ0I0QXdIUVlEVlIwT0JCWUVGSG45czBERWEya3YmIzEzOwpn
+RS9lSU9Uc3FvVzg1TVhGTUlHNkJnTlZIU01FZ2JJd2dhK0FGRWQ3VDY1NlVaRzEwYitkTnVtR2Z6
+WVdCS2xGb1lHQXBINHdmREVMJiMxMzsKTUFrR0ExVUVCaE1DVlZNeFBEQTZCZ05WQkFvTU0wbHVk
+R1Z5Ym1WMElFTnZjbkJ2Y21GMGFXOXVJR1p2Y2lCQmMzTnBaMjVsWkNCTyYjMTM7CllXMWxjeUJo
+Ym1RZ1RuVnRZbVZ5Y3pFdk1DMEdBMVVFQXd3bVNVTkJUazRnVkhKaFpHVnRZWEpySUVOc1pXRnlh
+VzVuYUc5MWMyVWcmIzEzOwpVR2xzYjNRZ1EwR0NGSHBxYlRGZUpjUHRVQzlYdXVQS1BzTHdEUitN
+TURRR0ExVWRId1F0TUNzd0thQW5vQ1dHSTJoMGRIQTZMeTlqJiMxMzsKY213dWFXTmhibTR1YjNK
+bkwzUnRZMmhmY0dsc2IzUXVZM0pzTUV3R0ExVWRJQVJGTUVNd0VBWU9Ld1lCQkFHQ3lSc0JCWU03
+REFvdyYjMTM7Ckx3WUlLd1lCQlFVSEFnRXdJekFoQmdnckJnRUZCUWNDQVJZVmFIUjBjSE02THk5
+amNITXVhV05oYm00dWIzSm5NQTBHQ1NxR1NJYjMmIzEzOwpEUUVCRFFVQUE0SUNBUUJkU2F0NTZ1
+ZWpMbkFqRklGOTVkallXSTZzLy9ONllYeHNyck1rR0JQOEVlelB5aExoNmF3UDR6N1E5UUFJJiMx
+MzsKUVprWW94cmwvMXkwK2J5VjJxblRVVUNMUnBLL0JEcC9oY2Z3UGZLQ0EvMlJRQ0hKcmI2K3ow
+ZW5EUEZSSzBOS213T2NkbEd0VWswbSYjMTM7ClBnV0dTS3R1d1ZzUEFoVERKdWhvc1pPaGtOZitu
+U09PSHJRT24xRTJyek9yZC9rUWxxaUN3Ukg5Nzk2TnBUQStIU01mT29iSkVFUHEmIzEzOwp0cEY3
+UDVxYnd0bDk1VWE1T3A0QWhhNzBISGZVRlM0Qk9RS0xCVmZNWmRPUitpUG9oNU93QUsraHRZa0ZD
+RzlQMldIdTd3ZjhFQytXJiMxMzsKN2s5Nmd2VGQ4eEU3b3VvYWJUMng2WWZZcUVsUEhpVS9JTTln
+VnpXV0wvc3ZZRHlTVnVvRndCakROTjFjZHEwcU9ZUjF5dVMxYy85RCYjMTM7CkZSN2VvN0dGRUN5
+K1RCZDdJaUtSZkJWZVlHT09QTW5vRmZ4UkxXcnBzV05ud0Q3bGtQa0xDZ0ZDays4eUVjT1JnNjI1
+bW82NXo0eTYmIzEzOwpKNEs4Zm9kYTdxd21YTlAzUlMxOG9uNkJIdDhsUStiWGdPSG14SUhrMGFP
+MHFORHFndkxyMkZseUxHSkdpRU1ScURNTVI2L2EwNmJ0JiMxMzsKa25VTUhsN0NxTWZqSWtqUDRW
+Tk55R1BkSmd3Vmsya2ViOXVORnZKQ3hUK00yZkdYUTFOYkpOZnR2NU1nU3NwOU4xeSt4NmdBM0Vo
+dyYjMTM7CnlIbG1KQjRZTXRvOHRUVjFpODR4UFh4aTJDQWVEYUdEdXdvc3Q4WVVDU2pxN1JDSzh0
+R2NhQVlya1hRWTJ5UWZYM2N3RHNFeFJxVlcmIzEzOwp5cmp5UnQrTjZtSzk5UT09PC9kczpYNTA5
+Q2VydGlmaWNhdGU+PC9kczpYNTA5RGF0YT48L2RzOktleUluZm8+PC9kczpTaWduYXR1cmU+PC9z
+bWQ6c2lnbmVkTWFyaz4K
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/smd/revoked.smd b/core/src/test/resources/google/registry/tmch/smd/revoked.smd
new file mode 100644
index 000000000..a1658d61e
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/smd/revoked.smd
@@ -0,0 +1,121 @@
+Marks: Test & Validate
+smdID: 000000541669081776937-65535
+U-labels: test---validate, test--validate, test-et-validate, test-etvalidate, test-validate, testand-validate, testandvalidate, testet-validate, testetvalidate, testvalidate
+notBefore: 2022-11-22T01:49:36.937Z
+notAfter: 2027-10-21T08:12:19.525Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il9lYmFj
+MzE3NS05Mjk4LTQ4NjMtYjlmMy0xMmUzNzcyYjQyZGYiPjxzbWQ6aWQ+MDAwMDAwNTQxNjY5MDgx
+Nzc2OTM3LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMTo0OTozNi45MzdaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0yMVQwODoxMjoxOS41MjVaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
+cmFkZW1hcms+PG1hcms6aWQ+MDAwMTM2MTUwMzA1NjkwOTE1MDMwNTY5MDktMTwvbWFyazppZD48
+bWFyazptYXJrTmFtZT5UZXN0ICZhbXA7IFZhbGlkYXRlPC9tYXJrOm1hcmtOYW1lPjxtYXJrOmhv
+bGRlciBlbnRpdGxlbWVudD0ib3duZXIiPjxtYXJrOm5hbWU+RnJhbmsgV2hpdGU8L21hcms6bmFt
+ZT48bWFyazpvcmc+VGVzdCBPcmdhbml6YXRpb248L21hcms6b3JnPjxtYXJrOmFkZHI+PG1hcms6
+c3RyZWV0Pldlc3QgQXJxdWVzIEF2ZW51ZSAxMDEgPC9tYXJrOnN0cmVldD48bWFyazpjaXR5PlN1
+bm55dmFsZTwvbWFyazpjaXR5PjxtYXJrOnNwPkNBPC9tYXJrOnNwPjxtYXJrOnBjPjEwMDIzLTMy
+NDE8L21hcms6cGM+PG1hcms6Y2M+VVM8L21hcms6Y2M+PC9tYXJrOmFkZHI+PG1hcms6dm9pY2U+
+KzEuMzAxNDU1NjYwMDwvbWFyazp2b2ljZT48bWFyazpmYXg+KzEuMzAxNDU1NjYwMTwvbWFyazpm
+YXg+PG1hcms6ZW1haWw+aW5mb0BleGFtcGxlLmV4YW1wbGU8L21hcms6ZW1haWw+PC9tYXJrOmhv
+bGRlcj48bWFyazpqdXJpc2RpY3Rpb24+VVM8L21hcms6anVyaXNkaWN0aW9uPjxtYXJrOmNsYXNz
+PjE1PC9tYXJrOmNsYXNzPjxtYXJrOmxhYmVsPnRlc3QtLS12YWxpZGF0ZTwvbWFyazpsYWJlbD48
+bWFyazpsYWJlbD50ZXN0LS12YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0LWV0
+LXZhbGlkYXRlPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnRlc3QtZXR2YWxpZGF0ZTwvbWFyazps
+YWJlbD48bWFyazpsYWJlbD50ZXN0LXZhbGlkYXRlPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVsPnRl
+c3RhbmQtdmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+dGVzdGFuZHZhbGlkYXRlPC9t
+YXJrOmxhYmVsPjxtYXJrOmxhYmVsPnRlc3RldC12YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazps
+YWJlbD50ZXN0ZXR2YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0dmFsaWRhdGU8
+L21hcms6bGFiZWw+PG1hcms6Z29vZHNBbmRTZXJ2aWNlcz5ndWl0YXI8L21hcms6Z29vZHNBbmRT
+ZXJ2aWNlcz48bWFyazpyZWdOdW0+MTIzNDwvbWFyazpyZWdOdW0+PG1hcms6cmVnRGF0ZT4yMDEz
+LTAxLTAxVDAwOjAwOjAwLjAwMFo8L21hcms6cmVnRGF0ZT48bWFyazpleERhdGU+MjAxNC0xMS0w
+NVQwMDowMDowMC4wMDBaPC9tYXJrOmV4RGF0ZT48L21hcms6dHJhZGVtYXJrPjwvbWFyazptYXJr
+PjxkczpTaWduYXR1cmUgeG1sbnM6ZHM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1sZHNp
+ZyMiIElkPSJfYTRkZjcyNzktNzZlYi00NTI2LWI0YjItMDMyN2IzNTJjMDZhIj48ZHM6U2lnbmVk
+SW5mbz48ZHM6Q2Fub25pY2FsaXphdGlvbk1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMu
+b3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjxkczpTaWduYXR1cmVNZXRob2QgQWxnb3JpdGht
+PSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGRzaWctbW9yZSNyc2Etc2hhMjU2Ii8+PGRz
+OlJlZmVyZW5jZSBVUkk9IiNfZWJhYzMxNzUtOTI5OC00ODYzLWI5ZjMtMTJlMzc3MmI0MmRmIj48
+ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcv
+MjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48ZHM6VHJhbnNmb3JtIEFsZ29y
+aXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpUcmFu
+c2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAx
+LzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+aS9JUHVxNllwNVh5UHloeWp4a1po
+VFJUOUgvZzBhc2d5cVZTR2psWE1BMD08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNlPjxk
+czpSZWZlcmVuY2UgVVJJPSIjX2I5YjA1MmRiLTE4MzktNDg0ZC04MzViLTIyMjM4MThmNTBhYyI+
+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3Jn
+LzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6RGlnZXN0TWV0aG9k
+IEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxlbmMjc2hhMjU2Ii8+PGRz
+OkRpZ2VzdFZhbHVlPmRUazE2M1huNW9qT3REOEFLVGtCL2ozMlA5dXNFN0U0T05KbjI3YWZLQWs9
+PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48L2RzOlNpZ25lZEluZm8+PGRzOlNpZ25h
+dHVyZVZhbHVlIElkPSJfMzE1MDliYjEtZWIyOC00ZDY1LWI5MjEtMjRmY2UzZWEwNDc3Ij5jZVNj
+V1lPbDBVK25POXFKczJoaGkrZC9CbkVxYy80cllwNktRNmVJV3dCYlVISTIvc24zRkM4aWdhQWRM
+TWZISXVzdGhsU0ZZQTZUJiMxMzsKSDZBa0t6R3pOT2RjZnhPRFZNSldFdlA3MWc5eFZWMHkyZllE
+bUpiMFVSbjJOZFBScE9KR2QxS2lLWDRQV1FPMHQ2bXFUMVZjNEtjNSYjMTM7CkZZRG1hVjcwM3U1
+Z0ZKYVU3TlVuZldHQ0hNSGk3ZmZobzVHb0VraTR2clJuc2REWGVncWxzYW12T2RNd2I5OEVJSGd1
+VmtpSHh5Y0smIzEzOwppckVQZTZqemZYVmF6N25uTnFOc3VycTk4LzFtVk9MRXI2Zlg1YjU4Snk0
+Wlc4Smc5UkxEVHFsb0tvT1p0dHNNdkZ2RC9EL2lOaXczJiMxMzsKcnlqczFUc0RjU1hmZVNUSmIy
+YnYwNGg5WHFkZ0tlWUZNRVI3MTlVdWNzbUltK3luYlgwb3d0UTB0S2NmeUpIN1pJcWF4NkJVMEQ1
+QiYjMTM7Cktwb2VQTVFialo0V3l4RnhNMEFIeEVrbFRQMFNremN2YTNlcEh3NjdCaXYzSFlUOUcx
+dDZDUVJpY05rUUZaeEg4SERid3BhZm1nWlkmIzEzOwp0Zktray9TaDVvdzFrRGxmWVpmYmVCZGVP
+Y1Y2aDY5K05FdWhDalZNaTI5VjVDRWFDKzFQUStMWXIrSG9HSlB0WHBQblh1S1A5Q3hQJiMxMzsK
+Z3Nrblk3MTM3OUFHb1BKMEhWczNEcmw2WGtaRFRLb1AycDkwejNldTBxWTByNmpweEdOV1V4eGJj
+TVNUcVdFNjU3cEpJNzNzVUNaMSYjMTM7CllucUgrMU5icFcwKzlsclpUSm4rdVNVMzZVa3ZjWjAv
+NkFDZm92eVo2U0lTM0hqVzAvbmdDZHRsZWE1VU1PN2ZudVk0bWxtdkhMOD08L2RzOlNpZ25hdHVy
+ZVZhbHVlPjxkczpLZXlJbmZvIElkPSJfYjliMDUyZGItMTgzOS00ODRkLTgzNWItMjIyMzgxOGY1
+MGFjIj48ZHM6WDUwOURhdGE+PGRzOlg1MDlDZXJ0aWZpY2F0ZT5NSUlIWHpDQ0JVZWdBd0lCQWdJ
+VVhxSS92ZDE4Q2FnOThvTnBkelY3Qml5LzZFQXdEUVlKS29aSWh2Y05BUUVOQlFBd2ZERUxNQWtH
+JiMxMzsKQTFVRUJoTUNWVk14UERBNkJnTlZCQW9NTTBsdWRHVnlibVYwSUVOdmNuQnZjbUYwYVc5
+dUlHWnZjaUJCYzNOcFoyNWxaQ0JPWVcxbCYjMTM7CmN5QmhibVFnVG5WdFltVnljekV2TUMwR0Ex
+VUVBd3dtU1VOQlRrNGdWSEpoWkdWdFlYSnJJRU5zWldGeWFXNW5hRzkxYzJVZ1VHbHMmIzEzOwpi
+M1FnUTBFd0hoY05Nakl4TVRFMk1UTXlPRFU1V2hjTk1qY3hNVEUxTVRNeU9EVTVXakNCMERFTE1B
+a0dBMVVFQmhNQ1FrVXhFVEFQJiMxMzsKQmdOVkJBZ1RDRUp5ZFhOelpXeHpNUkl3RUFZRFZRUUhF
+d2xXYVd4MmIyOXlaR1V4TXpBeEJnTlZCQW9US2tSbGJHOXBkSFJsSUVOdiYjMTM7CmJuTjFiSFJw
+Ym1jZ1lXNWtJRUZrZG1semIzSjVJRU5XUWtFdlUwTlNUREUrTUR3R0ExVUVBeE0xU1VOQlRrNGdW
+RTFEU0NCQmRYUm8mIzEzOwpiM0pwZW1Wa0lGUnlZV1JsYldGeWF5QlFhV3h2ZENCV1lXeHBaR0Yw
+YjNJZ1ZtRnNhV1F4SlRBakJna3Foa2lHOXcwQkNRRVdGbUpsJiMxMzsKZEcxamFITnRaRUJrWld4
+dmFYUjBaUzVqYjIwd2dnSWlNQTBHQ1NxR1NJYjNEUUVCQVFVQUE0SUNEd0F3Z2dJS0FvSUNBUUM2
+Rkp3eiYjMTM7CktxUVZYNmZHMy9FTFJTR1dWOUdyS2FGTUttaFdJeGVwd1JaTjZNeE1xa2Q1RG5Z
+ZmlUK1dwOThqRWtxZ1R4MlVNYjlxdWdjR05WNmcmIzEzOwozNS9DclFiL0YvbXozQzRzZkxOdURw
+U3FLOVFGOCtwYVRINmhRbXJPcHFWK1VUdmRqOVNNZ0tHeUZpelM4OENEV014NHczaTRGQUtlJiMx
+MzsKNk5Sc0pSR1RBdEtEdU1IY0E0c2owOEdqZTNsUFdjZ0Z2Y1FORFZlRUJUdU9IQkcrUmhqN1Yx
+SmlOR1AvNGVwVFhURlhnUEZEZ2V6MyYjMTM7CllBZnhxcGJ1TzRUWDZiYllkazJudk1MRnZMRU5r
+Q0ZZdWxuWVB6Z25FQkdTTUtJYUFJbGIrc2NIQ3ZXZ1dqMlRMZ3doMkdKTmN6Vk0mIzEzOwoxTFBN
+cUdTK1VraTlNaDc5ODIyL3hvYXI0OTh4RHgyWXgvOHN3Z0VOTFNnQ3NRQVc4bk1nd1duNkFiWWwy
+UkFCWHVyYXlGc240UDFSJiMxMzsKdVFObVVwL3FyUktSdlNKcjFPTGtIWmZGVGNTWVFhVml1TVlQ
+WHpHejh0bU1MbG1JL0I2QUNINEF3Uk1kbll2Rk8zS0kxUkJuUEtJZCYjMTM7Cnd3ZlVwWjVJVElw
+YkE3Q0dnVHgxcXh0TTF3SVVyN3BIZUtQNmpWZTNrZERMZysvQloyeE1FdEJrNWE4WTdCNHYzeHdI
+WEdUdlY4bU4mIzEzOwowQWcvU3lUL1FVeUVSaFhVeUFOMitFd1orU1FDVXlOZnppb1dRODc4ZUd5
+a1UrNDYrQmJnSTNJSXIzNlhLUHdtenQwU1orS0kzdG5GJiMxMzsKVGxuOW1YMEtDMGlkb2o1eWt6
+UG9DL01JZWQwc3A0VGlneEViV054N0VGODBQdlIvRERFd1ZQRUVra2p5NjNYRnVseGlDUUlEQVFB
+QiYjMTM7Cm80SUJnakNDQVg0d0RBWURWUjBUQVFIL0JBSXdBREFPQmdOVkhROEJBZjhFQkFNQ0I0
+QXdIUVlEVlIwT0JCWUVGSG45czBERWEya3YmIzEzOwpnRS9lSU9Uc3FvVzg1TVhGTUlHNkJnTlZI
+U01FZ2JJd2dhK0FGRWQ3VDY1NlVaRzEwYitkTnVtR2Z6WVdCS2xGb1lHQXBINHdmREVMJiMxMzsK
+TUFrR0ExVUVCaE1DVlZNeFBEQTZCZ05WQkFvTU0wbHVkR1Z5Ym1WMElFTnZjbkJ2Y21GMGFXOXVJ
+R1p2Y2lCQmMzTnBaMjVsWkNCTyYjMTM7CllXMWxjeUJoYm1RZ1RuVnRZbVZ5Y3pFdk1DMEdBMVVF
+QXd3bVNVTkJUazRnVkhKaFpHVnRZWEpySUVOc1pXRnlhVzVuYUc5MWMyVWcmIzEzOwpVR2xzYjNR
+Z1EwR0NGSHBxYlRGZUpjUHRVQzlYdXVQS1BzTHdEUitNTURRR0ExVWRId1F0TUNzd0thQW5vQ1dH
+STJoMGRIQTZMeTlqJiMxMzsKY213dWFXTmhibTR1YjNKbkwzUnRZMmhmY0dsc2IzUXVZM0pzTUV3
+R0ExVWRJQVJGTUVNd0VBWU9Ld1lCQkFHQ3lSc0JCWU03REFvdyYjMTM7Ckx3WUlLd1lCQlFVSEFn
+RXdJekFoQmdnckJnRUZCUWNDQVJZVmFIUjBjSE02THk5amNITXVhV05oYm00dWIzSm5NQTBHQ1Nx
+R1NJYjMmIzEzOwpEUUVCRFFVQUE0SUNBUUJkU2F0NTZ1ZWpMbkFqRklGOTVkallXSTZzLy9ONllY
+eHNyck1rR0JQOEVlelB5aExoNmF3UDR6N1E5UUFJJiMxMzsKUVprWW94cmwvMXkwK2J5VjJxblRV
+VUNMUnBLL0JEcC9oY2Z3UGZLQ0EvMlJRQ0hKcmI2K3owZW5EUEZSSzBOS213T2NkbEd0VWswbSYj
+MTM7ClBnV0dTS3R1d1ZzUEFoVERKdWhvc1pPaGtOZituU09PSHJRT24xRTJyek9yZC9rUWxxaUN3
+Ukg5Nzk2TnBUQStIU01mT29iSkVFUHEmIzEzOwp0cEY3UDVxYnd0bDk1VWE1T3A0QWhhNzBISGZV
+RlM0Qk9RS0xCVmZNWmRPUitpUG9oNU93QUsraHRZa0ZDRzlQMldIdTd3ZjhFQytXJiMxMzsKN2s5
+Nmd2VGQ4eEU3b3VvYWJUMng2WWZZcUVsUEhpVS9JTTlnVnpXV0wvc3ZZRHlTVnVvRndCakROTjFj
+ZHEwcU9ZUjF5dVMxYy85RCYjMTM7CkZSN2VvN0dGRUN5K1RCZDdJaUtSZkJWZVlHT09QTW5vRmZ4
+UkxXcnBzV05ud0Q3bGtQa0xDZ0ZDays4eUVjT1JnNjI1bW82NXo0eTYmIzEzOwpKNEs4Zm9kYTdx
+d21YTlAzUlMxOG9uNkJIdDhsUStiWGdPSG14SUhrMGFPMHFORHFndkxyMkZseUxHSkdpRU1ScURN
+TVI2L2EwNmJ0JiMxMzsKa25VTUhsN0NxTWZqSWtqUDRWTk55R1BkSmd3Vmsya2ViOXVORnZKQ3hU
+K00yZkdYUTFOYkpOZnR2NU1nU3NwOU4xeSt4NmdBM0VodyYjMTM7CnlIbG1KQjRZTXRvOHRUVjFp
+ODR4UFh4aTJDQWVEYUdEdXdvc3Q4WVVDU2pxN1JDSzh0R2NhQVlya1hRWTJ5UWZYM2N3RHNFeFJx
+VlcmIzEzOwp5cmp5UnQrTjZtSzk5UT09PC9kczpYNTA5Q2VydGlmaWNhdGU+PC9kczpYNTA5RGF0
+YT48L2RzOktleUluZm8+PC9kczpTaWduYXR1cmU+PC9zbWQ6c2lnbmVkTWFyaz4K
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/smd/smdrl.csv b/core/src/test/resources/google/registry/tmch/smd/smdrl.csv
new file mode 100644
index 000000000..734a2a904
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/smd/smdrl.csv
@@ -0,0 +1,7 @@
+1,2022-11-22T01:49:36.9Z
+smd-id,insertion-datetime
+0000001761385117375880-65535,2013-07-15T00:00:00.0Z
+0000001751501056761969-65535,2017-07-26T10:12:41.9Z
+000000541526299609231-65535,2018-05-14T17:52:23.7Z
+000000541602140609520-65535,2020-10-08T07:07:25.0Z
+000000541669081776937-65535,2022-11-22T01:49:36.9Z
diff --git a/core/src/test/resources/google/registry/tmch/smd/tmv-cert-revoked.smd b/core/src/test/resources/google/registry/tmch/smd/tmv-cert-revoked.smd
new file mode 100644
index 000000000..08be24a41
--- /dev/null
+++ b/core/src/test/resources/google/registry/tmch/smd/tmv-cert-revoked.smd
@@ -0,0 +1,125 @@
+Marks: Test & Validate
+smdID: 000000881669080980446-65535
+U-labels: test---validate, test--validate, test-and-validate, test-andvalidate, test-validate, testand-validate, testandvalidate, testvalidate
+notBefore: 2022-11-22T01:36:20.446Z
+notAfter: 2027-10-18T14:57:36.681Z
+-----BEGIN ENCODED SMD-----
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNtZDpzaWduZWRNYXJrIHht
+bG5zOnNtZD0idXJuOmlldGY6cGFyYW1zOnhtbDpuczpzaWduZWRNYXJrLTEuMCIgaWQ9Il80YjQ1
+MWQxZi0yNzJjLTRiNWQtOGViMy1kMTg0MWVlMTEyNzMiPjxzbWQ6aWQ+MDAwMDAwODgxNjY5MDgw
+OTgwNDQ2LTY1NTM1PC9zbWQ6aWQ+PHNtZDppc3N1ZXJJbmZvIGlzc3VlcklEPSI2NTUzNSI+PHNt
+ZDpvcmc+SUNBTk4gVE1DSCBURVNUSU5HIFRNVjwvc21kOm9yZz48c21kOmVtYWlsPm5vdGF2YWls
+YWJsZUBleGFtcGxlLmNvbTwvc21kOmVtYWlsPjxzbWQ6dXJsPnd3dy5leGFtcGxlLmNvbTwvc21k
+OnVybD48c21kOnZvaWNlPiszMi4yMDAwMDAwMDwvc21kOnZvaWNlPjwvc21kOmlzc3VlckluZm8+
+PHNtZDpub3RCZWZvcmU+MjAyMi0xMS0yMlQwMTozNjoyMC40NDZaPC9zbWQ6bm90QmVmb3JlPjxz
+bWQ6bm90QWZ0ZXI+MjAyNy0xMC0xOFQxNDo1NzozNi42ODFaPC9zbWQ6bm90QWZ0ZXI+PG1hcms6
+bWFyayB4bWxuczptYXJrPSJ1cm46aWV0ZjpwYXJhbXM6eG1sOm5zOm1hcmstMS4wIj48bWFyazp0
+cmVhdHlPclN0YXR1dGU+PG1hcms6aWQ+MDAwMTM3MTUwMzA2ODIzMjE1MDMwNjgyMzItMTwvbWFy
+azppZD48bWFyazptYXJrTmFtZT5UZXN0ICZhbXA7IFZhbGlkYXRlPC9tYXJrOm1hcmtOYW1lPjxt
+YXJrOmhvbGRlciBlbnRpdGxlbWVudD0ib3duZXIiPjxtYXJrOm5hbWU+VG9ueSBIb2xsYW5kPC9t
+YXJrOm5hbWU+PG1hcms6b3JnPkFnIGNvcnBvcmF0aW9uPC9tYXJrOm9yZz48bWFyazphZGRyPjxt
+YXJrOnN0cmVldD4xMzA1IEJyaWdodCBBdmVudWU8L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+QXJj
+YWRpYTwvbWFyazpjaXR5PjxtYXJrOnBjPjkwMDI4PC9tYXJrOnBjPjxtYXJrOmNjPlVTPC9tYXJr
+OmNjPjwvbWFyazphZGRyPjwvbWFyazpob2xkZXI+PG1hcms6Y29udGFjdCB0eXBlPSJhZ2VudCI+
+PG1hcms6bmFtZT5Ub255IEhvbGxhbmQ8L21hcms6bmFtZT48bWFyazpvcmc+QWcgY29ycG9yYXRp
+b248L21hcms6b3JnPjxtYXJrOmFkZHI+PG1hcms6c3RyZWV0PkJyaWdodCBBdmVudWUgMTMwNSA8
+L21hcms6c3RyZWV0PjxtYXJrOmNpdHk+QXJjYWRpYTwvbWFyazpjaXR5PjxtYXJrOnNwPkNBPC9t
+YXJrOnNwPjxtYXJrOnBjPjkwMDI4PC9tYXJrOnBjPjxtYXJrOmNjPlVTPC9tYXJrOmNjPjwvbWFy
+azphZGRyPjxtYXJrOnZvaWNlPisxLjIwMjU1NjIzMDI8L21hcms6dm9pY2U+PG1hcms6ZmF4Pisx
+LjIwMjU1NjIzMDE8L21hcms6ZmF4PjxtYXJrOmVtYWlsPmluZm9AYWdjb3Jwb3JhdGlvbi5jb208
+L21hcms6ZW1haWw+PC9tYXJrOmNvbnRhY3Q+PG1hcms6cHJvdGVjdGlvbj48bWFyazpjYz5VUzwv
+bWFyazpjYz48bWFyazpydWxpbmc+VVM8L21hcms6cnVsaW5nPjwvbWFyazpwcm90ZWN0aW9uPjxt
+YXJrOmxhYmVsPnRlc3QtLS12YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0LS12
+YWxpZGF0ZTwvbWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0LWFuZC12YWxpZGF0ZTwvbWFyazps
+YWJlbD48bWFyazpsYWJlbD50ZXN0LWFuZHZhbGlkYXRlPC9tYXJrOmxhYmVsPjxtYXJrOmxhYmVs
+PnRlc3QtdmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6bGFiZWw+dGVzdGFuZC12YWxpZGF0ZTwv
+bWFyazpsYWJlbD48bWFyazpsYWJlbD50ZXN0YW5kdmFsaWRhdGU8L21hcms6bGFiZWw+PG1hcms6
+bGFiZWw+dGVzdHZhbGlkYXRlPC9tYXJrOmxhYmVsPjxtYXJrOmdvb2RzQW5kU2VydmljZXM+Z3Vp
+dGFyPC9tYXJrOmdvb2RzQW5kU2VydmljZXM+PG1hcms6cmVmTnVtPjEyMzQ8L21hcms6cmVmTnVt
+PjxtYXJrOnByb0RhdGU+MjAwMC0wMS0wMVQwMDowMDowMC4wMDBaPC9tYXJrOnByb0RhdGU+PG1h
+cms6dGl0bGU+Z3VpdGFyPC9tYXJrOnRpdGxlPjxtYXJrOmV4ZWNEYXRlPjIwMTMtMDItMDJUMDA6
+MDA6MDAuMDAwWjwvbWFyazpleGVjRGF0ZT48L21hcms6dHJlYXR5T3JTdGF0dXRlPjwvbWFyazpt
+YXJrPjxkczpTaWduYXR1cmUgeG1sbnM6ZHM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1s
+ZHNpZyMiIElkPSJfZjgyYTY3YmUtYzYwOS00YjEyLTg2MDAtM2M0ZWRmYWI3NjI5Ij48ZHM6U2ln
+bmVkSW5mbz48ZHM6Q2Fub25pY2FsaXphdGlvbk1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cu
+dzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjxkczpTaWduYXR1cmVNZXRob2QgQWxnb3Jp
+dGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGRzaWctbW9yZSNyc2Etc2hhMjU2Ii8+
+PGRzOlJlZmVyZW5jZSBVUkk9IiNfNGI0NTFkMWYtMjcyYy00YjVkLThlYjMtZDE4NDFlZTExMjcz
+Ij48ZHM6VHJhbnNmb3Jtcz48ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5v
+cmcvMjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48ZHM6VHJhbnNmb3JtIEFs
+Z29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIi8+PC9kczpU
+cmFuc2Zvcm1zPjxkczpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8y
+MDAxLzA0L3htbGVuYyNzaGEyNTYiLz48ZHM6RGlnZXN0VmFsdWU+cmN3TStyOVMwcml3M0c1dnBu
+OHY4UTZmM1VXYmJpb3Y4R2NuMENJUVMwRT08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNl
+PjxkczpSZWZlcmVuY2UgVVJJPSIjXzY4Y2U1YTdlLTk1NWEtNGYzYi05OGYzLTkxNWVlYWZiOTNj
+ZiI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMu
+b3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjwvZHM6VHJhbnNmb3Jtcz48ZHM6RGlnZXN0TWV0
+aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8wNC94bWxlbmMjc2hhMjU2Ii8+
+PGRzOkRpZ2VzdFZhbHVlPjMxNnRURTMwMy9mOFNRdFk2ckh1ZUlTY29vL09ibkVBZkR5SEJoWVRy
+Lzg9PC9kczpEaWdlc3RWYWx1ZT48L2RzOlJlZmVyZW5jZT48L2RzOlNpZ25lZEluZm8+PGRzOlNp
+Z25hdHVyZVZhbHVlIElkPSJfOGZjN2RjYjYtM2Q4Zi00OWQwLTg4NTQtM2Y2NzM4NmVhYTFhIj5O
+c1pjL0c4MGc3THB1UXh4UDkzMXFzaG5pMmlIWTFUOFVlRjdEVWFiZTBKYTFjYXFvMDhlSzlpZStZ
+OVNBT3dQMzZhT0RuUHhtcnJsJiMxMzsKTStyNnc0RXhMWXV3bnlCNkFwdWJBR3FkL1orSCtTYXpJ
+b0tUeWl0L24wTUpSK1lSdkxpSkxUVUxlVDVQaTRSR213d0FLVEIzakZnZyYjMTM7CmNDTHBtc1dm
+Sjh5NG56ZkRQWWJLVWJMRVN3cDVEU2l0TW41VmFJZ2IrdHNqSmkrWHIvVnE5VEtyQWo3NzYxbVVz
+cVpBa29mLytqNUQmIzEzOwpzNC9wQkhTVzJjM1RoS0tld2JVVUxRZEhaWmVDOUNORk9va2MrNjUr
+ZGFOZGpsUWVCc1pDVzFuMjl5VlBtd0d3djdRZWVpR2tLcEd3JiMxMzsKNXp1bVVZSkp4NElRc2Y4
+TmlPZ20rY0pvS3JQK0l6ai91Q05sdFhDbk9qWVF5VGt3dkVjSFo5aTJlYWV1NHZvajVTM3pjSTJn
+LzRZSiYjMTM7CjBqZlZnVnVYSG9Sb1ZyLzRsTFhFeWJYSnZxUThwa3pkZTBEcVNUZHBKZld1aExW
+N2NsNDNycGg4Qmt0amlOZ0JZOFg5dUozdG92QUEmIzEzOwo4VGFXSVVNWUN3ano2RmhyZnRNeERB
+WVhNV281ODBFZnQvWXFKOUY5L0ljWEdvay9Lb1p5Q01zT0NzQmFSaWZERlM2aDdkYVJQSUx2JiMx
+MzsKZmtTcko2bTVHelZRd3B1ZkxmUHNQR29CREhtcXduaWtBYWVkbGlYeSticmhHNndQRlpIT3Fw
+a3lTdS9zMUZnOTdCaTFuVXlzRGtTZiYjMTM7CnVGZUo5NFdmNDZPQnQxbG9tdE9nM3hIYm9IaExE
+Z3pCMzdvNjhDbHhlZU9SMW5oZW0yZmJiaHNYVnUxWWtQb3R2T040YmFCV1NuST08L2RzOlNpZ25h
+dHVyZVZhbHVlPjxkczpLZXlJbmZvIElkPSJfNjhjZTVhN2UtOTU1YS00ZjNiLTk4ZjMtOTE1ZWVh
+ZmI5M2NmIj48ZHM6WDUwOURhdGE+PGRzOlg1MDlDZXJ0aWZpY2F0ZT5NSUlIWVRDQ0JVbWdBd0lC
+QWdJVUhPTTdvRXBsVjA2VFpJZ1pUaTBSVWt1cWdaNHdEUVlKS29aSWh2Y05BUUVOQlFBd2ZERUxN
+QWtHJiMxMzsKQTFVRUJoTUNWVk14UERBNkJnTlZCQW9NTTBsdWRHVnlibVYwSUVOdmNuQnZjbUYw
+YVc5dUlHWnZjaUJCYzNOcFoyNWxaQ0JPWVcxbCYjMTM7CmN5QmhibVFnVG5WdFltVnljekV2TUMw
+R0ExVUVBd3dtU1VOQlRrNGdWSEpoWkdWdFlYSnJJRU5zWldGeWFXNW5hRzkxYzJVZ1VHbHMmIzEz
+OwpiM1FnUTBFd0hoY05Nakl4TVRFMk1UTXpNREl6V2hjTk1qY3hNVEUxTVRNek1ESXpXakNCMGpF
+TE1Ba0dBMVVFQmhNQ1FrVXhFVEFQJiMxMzsKQmdOVkJBZ1RDRUp5ZFhOelpXeHpNUkl3RUFZRFZR
+UUhFd2xXYVd4MmIyOXlaR1V4TXpBeEJnTlZCQW9US2tSbGJHOXBkSFJsSUVOdiYjMTM7CmJuTjFi
+SFJwYm1jZ1lXNWtJRUZrZG1semIzSjVJRU5XUWtFdlUwTlNUREZBTUQ0R0ExVUVBeE0zU1VOQlRr
+NGdWRTFEU0NCQmRYUm8mIzEzOwpiM0pwZW1Wa0lGUnlZV1JsYldGeWF5QlFhV3h2ZENCV1lXeHBa
+R0YwYjNJZ1VtVjJiMnRsWkRFbE1DTUdDU3FHU0liM0RRRUpBUllXJiMxMzsKWW1WMGJXTm9jMjFr
+UUdSbGJHOXBkSFJsTG1OdmJUQ0NBaUl3RFFZSktvWklodmNOQVFFQkJRQURnZ0lQQURDQ0Fnb0Nn
+Z0lCQVB6RCYjMTM7Cno1T1p6aVVsZ0pDbEU4WUw3SFNYSlFUNGFhWnoxQW1Fby8rK2JaeTBnNzFB
+Qm5HRVJXYnJPVDJJZG0vNTZIVC9Rd1VxV0owVGtCWmImIzEzOwppcUJpaUQ1cjRFWnl5OWd6ZU9M
+aW9qNWo0a0UyRTB3WVBYVkFNd2pla09FODBnbzlYTndCRzA5ZUFXVzlDbXhjZnczOXlxMW0vSERY
+JiMxMzsKd2Q1cDdXYlFlMVBwU3NPT2tIb29OQlNTMEloRmZaZ0dmNnhvQzlGdVYxYnNvZVErVzFI
+bnlFM3lxUmdSeDd3VEh6TnNIa3RyNDJjTSYjMTM7CnFhOS9pRFdWWEIzV0R2OXhPbkZJMU5WNGNq
+YVhETUpya1BlbU9rNFMxS0lSMjljcjk4L0pNYVlWcndLanlnOE9kKzRGS24yd1BETEYmIzEzOwo1
+KzVoNms2QWx0b0tkZ1FOTFpOakp0ekd3ajFkY2RpemJxZ3F2RzRhMXYxS1huamQycy9mWVJKTnVU
+NHBTTGNyNXBaR2haa21TYXQ1JiMxMzsKdVpRYnlXaVExTEVUd2xISmN0ZnVydzBPMUxmYXU1RzNR
+Wk5LMW5ENWhQV2ErQVlVVTFnN0tHbHFZeWtnQlNDRmdONnh1ei9QY3BPQSYjMTM7Cis3QllBWXVx
+Q2tZVUxma0xBcFZMWE05U05pdlM5WnlWazFYR1ozUXcrdmRmMHJkKzExR2VsR1JxZFh3bm9GMVNT
+dXg4TVJhVkVSaVImIzEzOwpUN0I3NUxadk9VNUliTkVLSEd5eXNhc1A3V1ZNQzJ6UFJwQUdDTTMr
+OHJmdTVBd2RhcFNkbWdHVmE0LzdlbmxPdWkyVXZ5ZTVjUE9wJiMxMzsKS0ZETXRZZC9oZkNnMncv
+MVduVDlFL3pYTWVjZ1ZYdnFFS2k2WWovZVhXUzlob1lDQ1Btbkhaa0pFSGZ4ZGxRMmxOWDdxZ1Bu
+QWdNQiYjMTM7CkFBR2pnZ0dDTUlJQmZqQU1CZ05WSFJNQkFmOEVBakFBTUE0R0ExVWREd0VCL3dR
+RUF3SUhnREFkQmdOVkhRNEVGZ1FVMlErTnRieU0mIzEzOwpZZWYwc2xmbG0xbzlnb3g2aXJFd2di
+b0dBMVVkSXdTQnNqQ0JyNEFVUjN0UHJucFJrYlhSdjUwMjZZWi9OaFlFcVVXaGdZQ2tmakI4JiMx
+MzsKTVFzd0NRWURWUVFHRXdKVlV6RThNRG9HQTFVRUNnd3pTVzUwWlhKdVpYUWdRMjl5Y0c5eVlY
+UnBiMjRnWm05eUlFRnpjMmxuYm1WayYjMTM7CklFNWhiV1Z6SUdGdVpDQk9kVzFpWlhKek1TOHdM
+UVlEVlFRRERDWkpRMEZPVGlCVWNtRmtaVzFoY21zZ1EyeGxZWEpwYm1kb2IzVnomIzEzOwpaU0JR
+YVd4dmRDQkRRWUlVZW1wdE1WNGx3KzFRTDFlNjQ4byt3dkFOSDR3d05BWURWUjBmQkMwd0t6QXBv
+Q2VnSllZamFIUjBjRG92JiMxMzsKTDJOeWJDNXBZMkZ1Ymk1dmNtY3ZkRzFqYUY5d2FXeHZkQzVq
+Y213d1RBWURWUjBnQkVVd1F6QVFCZzRyQmdFRUFZTEpHd0VGZ3pzTSYjMTM7CkNqQXZCZ2dyQmdF
+RkJRY0NBVEFqTUNFR0NDc0dBUVVGQndJQkZoVm9kSFJ3Y3pvdkwyTndjeTVwWTJGdWJpNXZjbWN3
+RFFZSktvWkkmIzEzOwpodmNOQVFFTkJRQURnZ0lCQUlUMi9GZ2FzZ0NpQ1N4T0MrdXoyQzJrekZF
+ZkRiNkUvSDg5OHVyM21jYVNJMlBhb2NLQTBJd0crdGluJiMxMzsKR0JhQitscU8xemt5V3VOZXR1
+Y2lPaU1QZ1paNzJuNEJCYThIditjd3VkcGJXYkEvVlpKWmNHYUN4NEFYVkk1TG8yYlA5RFV5Yng3
+eCYjMTM7Ck0yejBscG41MkdhUE50c3JhdTAwYkRia29lWnZnTFlBL0JLQ3U0Y2dkQ0VtSUc4M3JQ
+ZXQ2Z2R2WmhtTVFnWCtaK1lzcWJSQ3dUTy8mIzEzOwpsWHZHOFo1UzFnSktPaVYvTzJMN3pYRG5Q
+SnhBUDVRay96aFAvQ1J3Q3dSRFF2eG9GRVA2bWdMNklvMHJNL1I1QW54eTlTZVI1ZCtrJiMxMzsK
+NExOQ1dQUzQvSTZhSy9iTDQyK05xZHIyRFFyRGdaWGQ5T3UzU2Z6NjlBRmoxbG55cGFMY3FhUUlW
+cHNRT1p3TmZQN0lRdFRqZUJJKyYjMTM7Ckh5VHgwb0R6akQwbXFXVG1FR1Q2MEZ0ZzJtaEtaSGp0
+WjdXK3RybnVob21pRHNMUStiMTBFQXJaWHE1QzhzT0t2T2VIcSsxRGR3YkwmIzEzOwpHMXBmM2dN
+YWNrenV1MTFPekMxcGk0eDlwOVVGc2VLMWNCTHE0cDllR3ZacDdLTzB5UWxXcG8yclJ1aStzRHR0
+a2hSWkV3WENJTDE5JiMxMzsKUzIva0tLdjRRdmM5MGpnWkhNV1dQWkNRL3VqT3piS0Fqbnk0MXJs
+bEZpVy9MVG1wSTVSb2FYN1l0d3pjbmc1MEdZT1RjMmNWVXNEVCYjMTM7CnBmUm9nVyt0eGE3NEc0
+YlB3R29wSWhrd2JMV0RWN1VNejFXTTlpZ1RKNm9MRUhBdnBPcDUxOFg3bjV0clJaRXk4dE9kQ3Qv
+S3M5ZlcmIzEzOwpVMUFsODFzb1F3cFAzanU3PC9kczpYNTA5Q2VydGlmaWNhdGU+PC9kczpYNTA5
+RGF0YT48L2RzOktleUluZm8+PC9kczpTaWduYXR1cmU+PC9zbWQ6c2lnbmVkTWFyaz4K
+-----END ENCODED SMD-----
diff --git a/core/src/test/resources/google/registry/tmch/smdrl-latest.csv b/core/src/test/resources/google/registry/tmch/smdrl/smdrl-latest.csv
similarity index 100%
rename from core/src/test/resources/google/registry/tmch/smdrl-latest.csv
rename to core/src/test/resources/google/registry/tmch/smdrl/smdrl-latest.csv
diff --git a/core/src/test/resources/google/registry/tmch/smdrl-latest.sig b/core/src/test/resources/google/registry/tmch/smdrl/smdrl-latest.sig
similarity index 100%
rename from core/src/test/resources/google/registry/tmch/smdrl-latest.sig
rename to core/src/test/resources/google/registry/tmch/smdrl/smdrl-latest.sig
diff --git a/docs/flows.md b/docs/flows.md
index e7277ccf6..50d149f94 100644
--- a/docs/flows.md
+++ b/docs/flows.md
@@ -378,6 +378,7 @@ An EPP flow that creates a new domain resource.
* Trademarked domains cannot be registered before the sunrise period.
* The provided mark is not yet valid.
* The provided mark has expired.
+ * Signed mark data is revoked.
* Domain names can only contain a-z, 0-9, '.' and '-'.
* Periods for domain registrations must be specified in years.
* The requested fees cannot be provided in the requested currency.
diff --git a/util/src/main/java/google/registry/util/ResourceUtils.java b/util/src/main/java/google/registry/util/ResourceUtils.java
index cbe313d4c..2f2de19f4 100644
--- a/util/src/main/java/google/registry/util/ResourceUtils.java
+++ b/util/src/main/java/google/registry/util/ResourceUtils.java
@@ -26,6 +26,8 @@ import java.net.URL;
/** Utility methods related to reading java resources. */
public final class ResourceUtils {
+ private ResourceUtils() {}
+
/** Loads a resource from a file as a string, assuming UTF-8 encoding. */
public static String readResourceUtf8(String filename) {
return readResourceUtf8(getResource(filename));