diff --git a/core/src/main/java/google/registry/reporting/ReportingModule.java b/core/src/main/java/google/registry/reporting/ReportingModule.java index 3da2e47ea..8e9112252 100644 --- a/core/src/main/java/google/registry/reporting/ReportingModule.java +++ b/core/src/main/java/google/registry/reporting/ReportingModule.java @@ -24,8 +24,8 @@ import google.registry.config.CredentialModule.DefaultCredential; import google.registry.config.RegistryConfig.Config; import google.registry.request.HttpException.BadRequestException; import google.registry.request.Parameter; -import google.registry.util.GoogleCredentialsBundle; import google.registry.util.Clock; +import google.registry.util.GoogleCredentialsBundle; import java.util.Optional; import javax.servlet.http.HttpServletRequest; import org.joda.time.DateTimeZone; diff --git a/core/src/test/java/google/registry/documentation/FlowContext.java b/core/src/test/java/google/registry/documentation/FlowContext.java index e198a4d43..38fd560a5 100644 --- a/core/src/test/java/google/registry/documentation/FlowContext.java +++ b/core/src/test/java/google/registry/documentation/FlowContext.java @@ -96,7 +96,7 @@ public class FlowContext { } /** - * Helper to locate test files for this flow by looking in javatests/ for all files with the + * Helper to locate test files for this flow by looking in src/test/java/ for all files with the * exact same relative filename as the flow file, but with a "*Test{,Case}.java" suffix. */ private static Set getTestFilenames(String flowName) throws IOException { diff --git a/core/src/test/java/google/registry/documentation/FlowExceptionsTest.java b/core/src/test/java/google/registry/documentation/FlowExceptionsTest.java index 4ff58786e..3d79cc218 100644 --- a/core/src/test/java/google/registry/documentation/FlowExceptionsTest.java +++ b/core/src/test/java/google/registry/documentation/FlowExceptionsTest.java @@ -35,10 +35,10 @@ import org.junit.runners.JUnit4; * condition. For example, there should always be a matching pair of lines such as the following: * * 
- *   java/.../flows/session/LoginFlow.java:
+ *   src/main/java/.../flows/session/LoginFlow.java:
  *     @error {@link AlreadyLoggedInException}
  *
- *   javatests/.../flows/session/LoginFlowTest.java:
+ *   src/test/java/.../flows/session/LoginFlowTest.java:
  *     import .....flows.session.LoginFlow.AlreadyLoggedInException;
  *
* diff --git a/core/src/test/java/google/registry/testing/FakeKeyringModule.java b/core/src/test/java/google/registry/testing/FakeKeyringModule.java index c57f4faa2..ddac2d4bb 100644 --- a/core/src/test/java/google/registry/testing/FakeKeyringModule.java +++ b/core/src/test/java/google/registry/testing/FakeKeyringModule.java @@ -38,7 +38,7 @@ import org.bouncycastle.openpgp.PGPUtil; import org.bouncycastle.openpgp.bc.BcPGPPublicKeyRingCollection; import org.bouncycastle.openpgp.bc.BcPGPSecretKeyRingCollection; -/** Keyring factory that loads keys from {@code javatests/.../testing/testdata} */ +/** Keyring factory that loads keys from {@code src/test/java/.../testing} */ @Module @Immutable public final class FakeKeyringModule { diff --git a/core/src/test/java/google/registry/testing/TestDataHelper.java b/core/src/test/java/google/registry/testing/TestDataHelper.java index 2e2c354c6..33e9d1566 100644 --- a/core/src/test/java/google/registry/testing/TestDataHelper.java +++ b/core/src/test/java/google/registry/testing/TestDataHelper.java @@ -79,7 +79,7 @@ public final class TestDataHelper { public static String loadFile(Class context, String filename) { return fileCache.computeIfAbsent( FileKey.create(context, filename), - k -> readResourceUtf8(context, "testdata/" + filename)); + k -> readResourceUtf8(context, filename)); } /** @@ -102,15 +102,16 @@ public final class TestDataHelper { public static ByteSource loadBytes(Class context, String filename) { return byteCache.computeIfAbsent( FileKey.create(context, filename), - k -> readResourceBytes(context, "testdata/" + filename)); + k -> readResourceBytes(context, filename)); } /** - * Returns the "real" location of the file loaded by the other commands, starting from javatests/. + * Returns the "real" location of the file loaded by the other commands, starting from + * src/test/resources/. */ public static String filePath(Class context, String filename) { String packagePath = context.getPackage().getName().replace('.', '/'); - return String.format("javatests/%s/testdata/%s", packagePath, filename); + return String.format("src/test/resources/%s/%s", packagePath, filename); } /** Returns a recursive iterable of all files in the given directory. */ diff --git a/core/src/test/java/google/registry/tmch/TmchTestDataExpirationTest.java b/core/src/test/java/google/registry/tmch/TmchTestDataExpirationTest.java index 202ce8de1..6e563946d 100644 --- a/core/src/test/java/google/registry/tmch/TmchTestDataExpirationTest.java +++ b/core/src/test/java/google/registry/tmch/TmchTestDataExpirationTest.java @@ -47,7 +47,7 @@ public class TmchTestDataExpirationTest { new TmchXmlSignature( new TmchCertificateAuthority(TmchCaMode.PILOT, new SystemClock()))); - for (Path path : listFiles(TmchTestDataExpirationTest.class, "testdata/active/")) { + for (Path path : listFiles(TmchTestDataExpirationTest.class, "active/")) { if (path.toString().endsWith(".smd")) { logger.atInfo().log("Verifying: %s", path); String tmchData = ResourceUtils.readResourceUtf8(path.toUri().toURL()); diff --git a/core/src/test/java/google/registry/beam/invoicing/testdata/billing_events_test.sql b/core/src/test/resources/google/registry/beam/invoicing/billing_events_test.sql similarity index 100% rename from core/src/test/java/google/registry/beam/invoicing/testdata/billing_events_test.sql rename to core/src/test/resources/google/registry/beam/invoicing/billing_events_test.sql diff --git a/core/src/test/java/google/registry/export/testdata/backup_operation_in_progress.json b/core/src/test/resources/google/registry/export/backup_operation_in_progress.json similarity index 100% rename from core/src/test/java/google/registry/export/testdata/backup_operation_in_progress.json rename to core/src/test/resources/google/registry/export/backup_operation_in_progress.json diff --git a/core/src/test/java/google/registry/export/testdata/backup_operation_success.json b/core/src/test/resources/google/registry/export/backup_operation_success.json similarity index 100% rename from core/src/test/java/google/registry/export/testdata/backup_operation_success.json rename to core/src/test/resources/google/registry/export/backup_operation_success.json diff --git a/core/src/test/java/google/registry/export/datastore/testdata/common_metadata.json b/core/src/test/resources/google/registry/export/datastore/common_metadata.json similarity index 100% rename from core/src/test/java/google/registry/export/datastore/testdata/common_metadata.json rename to core/src/test/resources/google/registry/export/datastore/common_metadata.json diff --git a/core/src/test/java/google/registry/export/datastore/testdata/entity_filter.json b/core/src/test/resources/google/registry/export/datastore/entity_filter.json similarity index 100% rename from core/src/test/java/google/registry/export/datastore/testdata/entity_filter.json rename to core/src/test/resources/google/registry/export/datastore/entity_filter.json diff --git a/core/src/test/java/google/registry/export/datastore/testdata/export_request_content.json b/core/src/test/resources/google/registry/export/datastore/export_request_content.json similarity index 100% rename from core/src/test/java/google/registry/export/datastore/testdata/export_request_content.json rename to core/src/test/resources/google/registry/export/datastore/export_request_content.json diff --git a/core/src/test/java/google/registry/export/datastore/testdata/metadata.json b/core/src/test/resources/google/registry/export/datastore/metadata.json similarity index 100% rename from core/src/test/java/google/registry/export/datastore/testdata/metadata.json rename to core/src/test/resources/google/registry/export/datastore/metadata.json diff --git a/core/src/test/java/google/registry/export/datastore/testdata/operation.json b/core/src/test/resources/google/registry/export/datastore/operation.json similarity index 100% rename from core/src/test/java/google/registry/export/datastore/testdata/operation.json rename to core/src/test/resources/google/registry/export/datastore/operation.json diff --git a/core/src/test/java/google/registry/export/datastore/testdata/operation_list.json b/core/src/test/resources/google/registry/export/datastore/operation_list.json similarity index 100% rename from core/src/test/java/google/registry/export/datastore/testdata/operation_list.json rename to core/src/test/resources/google/registry/export/datastore/operation_list.json diff --git a/core/src/test/java/google/registry/export/datastore/testdata/prettyprinted_operation.json b/core/src/test/resources/google/registry/export/datastore/prettyprinted_operation.json similarity index 100% rename from core/src/test/java/google/registry/export/datastore/testdata/prettyprinted_operation.json rename to core/src/test/resources/google/registry/export/datastore/prettyprinted_operation.json diff --git a/core/src/test/java/google/registry/export/datastore/testdata/progress.json b/core/src/test/resources/google/registry/export/datastore/progress.json similarity index 100% rename from core/src/test/java/google/registry/export/datastore/testdata/progress.json rename to core/src/test/resources/google/registry/export/datastore/progress.json diff --git a/core/src/test/java/google/registry/export/testdata/pretty_printed_success_backup_operation.json b/core/src/test/resources/google/registry/export/pretty_printed_success_backup_operation.json similarity index 100% rename from core/src/test/java/google/registry/export/testdata/pretty_printed_success_backup_operation.json rename to core/src/test/resources/google/registry/export/pretty_printed_success_backup_operation.json diff --git a/core/src/test/java/google/registry/flows/contact/testdata/contact_check.xml b/core/src/test/resources/google/registry/flows/contact/contact_check.xml similarity index 100% rename from core/src/test/java/google/registry/flows/contact/testdata/contact_check.xml rename to core/src/test/resources/google/registry/flows/contact/contact_check.xml diff --git a/core/src/test/java/google/registry/flows/contact/testdata/contact_check_50.xml b/core/src/test/resources/google/registry/flows/contact/contact_check_50.xml similarity index 100% rename from core/src/test/java/google/registry/flows/contact/testdata/contact_check_50.xml rename to core/src/test/resources/google/registry/flows/contact/contact_check_50.xml diff --git a/core/src/test/java/google/registry/flows/contact/testdata/contact_check_51.xml b/core/src/test/resources/google/registry/flows/contact/contact_check_51.xml similarity index 100% rename from core/src/test/java/google/registry/flows/contact/testdata/contact_check_51.xml rename to core/src/test/resources/google/registry/flows/contact/contact_check_51.xml diff --git a/core/src/test/java/google/registry/flows/contact/testdata/contact_check_response.xml b/core/src/test/resources/google/registry/flows/contact/contact_check_response.xml similarity index 100% rename from core/src/test/java/google/registry/flows/contact/testdata/contact_check_response.xml rename to core/src/test/resources/google/registry/flows/contact/contact_check_response.xml diff --git a/core/src/test/java/google/registry/flows/contact/testdata/contact_create.xml b/core/src/test/resources/google/registry/flows/contact/contact_create.xml similarity index 100% rename from core/src/test/java/google/registry/flows/contact/testdata/contact_create.xml rename to core/src/test/resources/google/registry/flows/contact/contact_create.xml diff --git a/core/src/test/java/google/registry/flows/contact/testdata/contact_create_decline_disclosure.xml b/core/src/test/resources/google/registry/flows/contact/contact_create_decline_disclosure.xml similarity index 100% rename from core/src/test/java/google/registry/flows/contact/testdata/contact_create_decline_disclosure.xml rename to core/src/test/resources/google/registry/flows/contact/contact_create_decline_disclosure.xml diff --git a/core/src/test/java/google/registry/flows/contact/testdata/contact_create_hebrew_int.xml b/core/src/test/resources/google/registry/flows/contact/contact_create_hebrew_int.xml similarity index 100% rename from core/src/test/java/google/registry/flows/contact/testdata/contact_create_hebrew_int.xml rename to core/src/test/resources/google/registry/flows/contact/contact_create_hebrew_int.xml diff --git a/core/src/test/java/google/registry/flows/contact/testdata/contact_create_hebrew_loc.xml b/core/src/test/resources/google/registry/flows/contact/contact_create_hebrew_loc.xml similarity index 100% rename from core/src/test/java/google/registry/flows/contact/testdata/contact_create_hebrew_loc.xml rename to core/src/test/resources/google/registry/flows/contact/contact_create_hebrew_loc.xml diff --git a/core/src/test/java/google/registry/flows/contact/testdata/contact_create_response.xml b/core/src/test/resources/google/registry/flows/contact/contact_create_response.xml similarity index 100% rename from core/src/test/java/google/registry/flows/contact/testdata/contact_create_response.xml rename to core/src/test/resources/google/registry/flows/contact/contact_create_response.xml diff --git a/core/src/test/java/google/registry/flows/contact/testdata/contact_delete.xml b/core/src/test/resources/google/registry/flows/contact/contact_delete.xml similarity index 100% rename from core/src/test/java/google/registry/flows/contact/testdata/contact_delete.xml rename to core/src/test/resources/google/registry/flows/contact/contact_delete.xml diff --git a/core/src/test/java/google/registry/flows/contact/testdata/contact_delete_no_cltrid.xml b/core/src/test/resources/google/registry/flows/contact/contact_delete_no_cltrid.xml similarity index 100% rename from core/src/test/java/google/registry/flows/contact/testdata/contact_delete_no_cltrid.xml rename to core/src/test/resources/google/registry/flows/contact/contact_delete_no_cltrid.xml diff --git a/core/src/test/java/google/registry/flows/contact/testdata/contact_delete_response.xml b/core/src/test/resources/google/registry/flows/contact/contact_delete_response.xml similarity index 100% rename from core/src/test/java/google/registry/flows/contact/testdata/contact_delete_response.xml rename to core/src/test/resources/google/registry/flows/contact/contact_delete_response.xml diff --git a/core/src/test/java/google/registry/flows/contact/testdata/contact_delete_response_no_cltrid.xml b/core/src/test/resources/google/registry/flows/contact/contact_delete_response_no_cltrid.xml similarity index 100% rename from core/src/test/java/google/registry/flows/contact/testdata/contact_delete_response_no_cltrid.xml rename to core/src/test/resources/google/registry/flows/contact/contact_delete_response_no_cltrid.xml diff --git a/core/src/test/java/google/registry/flows/contact/testdata/contact_info.xml b/core/src/test/resources/google/registry/flows/contact/contact_info.xml similarity index 100% rename from core/src/test/java/google/registry/flows/contact/testdata/contact_info.xml rename to core/src/test/resources/google/registry/flows/contact/contact_info.xml diff --git a/core/src/test/java/google/registry/flows/contact/testdata/contact_info_no_authinfo.xml b/core/src/test/resources/google/registry/flows/contact/contact_info_no_authinfo.xml similarity index 100% rename from core/src/test/java/google/registry/flows/contact/testdata/contact_info_no_authinfo.xml rename to core/src/test/resources/google/registry/flows/contact/contact_info_no_authinfo.xml diff --git a/core/src/test/java/google/registry/flows/contact/testdata/contact_info_response.xml b/core/src/test/resources/google/registry/flows/contact/contact_info_response.xml similarity index 100% rename from core/src/test/java/google/registry/flows/contact/testdata/contact_info_response.xml rename to core/src/test/resources/google/registry/flows/contact/contact_info_response.xml diff --git a/core/src/test/java/google/registry/flows/contact/testdata/contact_info_response_linked.xml b/core/src/test/resources/google/registry/flows/contact/contact_info_response_linked.xml similarity index 100% rename from core/src/test/java/google/registry/flows/contact/testdata/contact_info_response_linked.xml rename to core/src/test/resources/google/registry/flows/contact/contact_info_response_linked.xml diff --git a/core/src/test/java/google/registry/flows/contact/testdata/contact_info_response_no_authinfo.xml b/core/src/test/resources/google/registry/flows/contact/contact_info_response_no_authinfo.xml similarity index 100% rename from core/src/test/java/google/registry/flows/contact/testdata/contact_info_response_no_authinfo.xml rename to core/src/test/resources/google/registry/flows/contact/contact_info_response_no_authinfo.xml diff --git a/core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_approve.xml b/core/src/test/resources/google/registry/flows/contact/contact_transfer_approve.xml similarity index 100% rename from core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_approve.xml rename to core/src/test/resources/google/registry/flows/contact/contact_transfer_approve.xml diff --git a/core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_approve_response.xml b/core/src/test/resources/google/registry/flows/contact/contact_transfer_approve_response.xml similarity index 100% rename from core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_approve_response.xml rename to core/src/test/resources/google/registry/flows/contact/contact_transfer_approve_response.xml diff --git a/core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_approve_with_authinfo.xml b/core/src/test/resources/google/registry/flows/contact/contact_transfer_approve_with_authinfo.xml similarity index 100% rename from core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_approve_with_authinfo.xml rename to core/src/test/resources/google/registry/flows/contact/contact_transfer_approve_with_authinfo.xml diff --git a/core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_cancel.xml b/core/src/test/resources/google/registry/flows/contact/contact_transfer_cancel.xml similarity index 100% rename from core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_cancel.xml rename to core/src/test/resources/google/registry/flows/contact/contact_transfer_cancel.xml diff --git a/core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_cancel_response.xml b/core/src/test/resources/google/registry/flows/contact/contact_transfer_cancel_response.xml similarity index 100% rename from core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_cancel_response.xml rename to core/src/test/resources/google/registry/flows/contact/contact_transfer_cancel_response.xml diff --git a/core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_cancel_with_authinfo.xml b/core/src/test/resources/google/registry/flows/contact/contact_transfer_cancel_with_authinfo.xml similarity index 100% rename from core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_cancel_with_authinfo.xml rename to core/src/test/resources/google/registry/flows/contact/contact_transfer_cancel_with_authinfo.xml diff --git a/core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_query.xml b/core/src/test/resources/google/registry/flows/contact/contact_transfer_query.xml similarity index 100% rename from core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_query.xml rename to core/src/test/resources/google/registry/flows/contact/contact_transfer_query.xml diff --git a/core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_query_response.xml b/core/src/test/resources/google/registry/flows/contact/contact_transfer_query_response.xml similarity index 100% rename from core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_query_response.xml rename to core/src/test/resources/google/registry/flows/contact/contact_transfer_query_response.xml diff --git a/core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_query_response_client_approved.xml b/core/src/test/resources/google/registry/flows/contact/contact_transfer_query_response_client_approved.xml similarity index 100% rename from core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_query_response_client_approved.xml rename to core/src/test/resources/google/registry/flows/contact/contact_transfer_query_response_client_approved.xml diff --git a/core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_query_response_client_cancelled.xml b/core/src/test/resources/google/registry/flows/contact/contact_transfer_query_response_client_cancelled.xml similarity index 100% rename from core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_query_response_client_cancelled.xml rename to core/src/test/resources/google/registry/flows/contact/contact_transfer_query_response_client_cancelled.xml diff --git a/core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_query_response_client_rejected.xml b/core/src/test/resources/google/registry/flows/contact/contact_transfer_query_response_client_rejected.xml similarity index 100% rename from core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_query_response_client_rejected.xml rename to core/src/test/resources/google/registry/flows/contact/contact_transfer_query_response_client_rejected.xml diff --git a/core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_query_response_server_approved.xml b/core/src/test/resources/google/registry/flows/contact/contact_transfer_query_response_server_approved.xml similarity index 100% rename from core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_query_response_server_approved.xml rename to core/src/test/resources/google/registry/flows/contact/contact_transfer_query_response_server_approved.xml diff --git a/core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_query_response_server_cancelled.xml b/core/src/test/resources/google/registry/flows/contact/contact_transfer_query_response_server_cancelled.xml similarity index 100% rename from core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_query_response_server_cancelled.xml rename to core/src/test/resources/google/registry/flows/contact/contact_transfer_query_response_server_cancelled.xml diff --git a/core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_query_with_authinfo.xml b/core/src/test/resources/google/registry/flows/contact/contact_transfer_query_with_authinfo.xml similarity index 100% rename from core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_query_with_authinfo.xml rename to core/src/test/resources/google/registry/flows/contact/contact_transfer_query_with_authinfo.xml diff --git a/core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_query_with_roid.xml b/core/src/test/resources/google/registry/flows/contact/contact_transfer_query_with_roid.xml similarity index 100% rename from core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_query_with_roid.xml rename to core/src/test/resources/google/registry/flows/contact/contact_transfer_query_with_roid.xml diff --git a/core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_reject.xml b/core/src/test/resources/google/registry/flows/contact/contact_transfer_reject.xml similarity index 100% rename from core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_reject.xml rename to core/src/test/resources/google/registry/flows/contact/contact_transfer_reject.xml diff --git a/core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_reject_response.xml b/core/src/test/resources/google/registry/flows/contact/contact_transfer_reject_response.xml similarity index 100% rename from core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_reject_response.xml rename to core/src/test/resources/google/registry/flows/contact/contact_transfer_reject_response.xml diff --git a/core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_reject_with_authinfo.xml b/core/src/test/resources/google/registry/flows/contact/contact_transfer_reject_with_authinfo.xml similarity index 100% rename from core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_reject_with_authinfo.xml rename to core/src/test/resources/google/registry/flows/contact/contact_transfer_reject_with_authinfo.xml diff --git a/core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_request.xml b/core/src/test/resources/google/registry/flows/contact/contact_transfer_request.xml similarity index 100% rename from core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_request.xml rename to core/src/test/resources/google/registry/flows/contact/contact_transfer_request.xml diff --git a/core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_request_no_authinfo.xml b/core/src/test/resources/google/registry/flows/contact/contact_transfer_request_no_authinfo.xml similarity index 100% rename from core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_request_no_authinfo.xml rename to core/src/test/resources/google/registry/flows/contact/contact_transfer_request_no_authinfo.xml diff --git a/core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_request_response.xml b/core/src/test/resources/google/registry/flows/contact/contact_transfer_request_response.xml similarity index 100% rename from core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_request_response.xml rename to core/src/test/resources/google/registry/flows/contact/contact_transfer_request_response.xml diff --git a/core/src/test/java/google/registry/flows/contact/testdata/contact_update.xml b/core/src/test/resources/google/registry/flows/contact/contact_update.xml similarity index 100% rename from core/src/test/java/google/registry/flows/contact/testdata/contact_update.xml rename to core/src/test/resources/google/registry/flows/contact/contact_update.xml diff --git a/core/src/test/java/google/registry/flows/contact/testdata/contact_update_add_remove_same.xml b/core/src/test/resources/google/registry/flows/contact/contact_update_add_remove_same.xml similarity index 100% rename from core/src/test/java/google/registry/flows/contact/testdata/contact_update_add_remove_same.xml rename to core/src/test/resources/google/registry/flows/contact/contact_update_add_remove_same.xml diff --git a/core/src/test/java/google/registry/flows/contact/testdata/contact_update_decline_disclosure.xml b/core/src/test/resources/google/registry/flows/contact/contact_update_decline_disclosure.xml similarity index 100% rename from core/src/test/java/google/registry/flows/contact/testdata/contact_update_decline_disclosure.xml rename to core/src/test/resources/google/registry/flows/contact/contact_update_decline_disclosure.xml diff --git a/core/src/test/java/google/registry/flows/contact/testdata/contact_update_hebrew_int.xml b/core/src/test/resources/google/registry/flows/contact/contact_update_hebrew_int.xml similarity index 100% rename from core/src/test/java/google/registry/flows/contact/testdata/contact_update_hebrew_int.xml rename to core/src/test/resources/google/registry/flows/contact/contact_update_hebrew_int.xml diff --git a/core/src/test/java/google/registry/flows/contact/testdata/contact_update_hebrew_loc.xml b/core/src/test/resources/google/registry/flows/contact/contact_update_hebrew_loc.xml similarity index 100% rename from core/src/test/java/google/registry/flows/contact/testdata/contact_update_hebrew_loc.xml rename to core/src/test/resources/google/registry/flows/contact/contact_update_hebrew_loc.xml diff --git a/core/src/test/java/google/registry/flows/contact/testdata/contact_update_localized.xml b/core/src/test/resources/google/registry/flows/contact/contact_update_localized.xml similarity index 100% rename from core/src/test/java/google/registry/flows/contact/testdata/contact_update_localized.xml rename to core/src/test/resources/google/registry/flows/contact/contact_update_localized.xml diff --git a/core/src/test/java/google/registry/flows/contact/testdata/contact_update_partial_postalinfo.xml b/core/src/test/resources/google/registry/flows/contact/contact_update_partial_postalinfo.xml similarity index 100% rename from core/src/test/java/google/registry/flows/contact/testdata/contact_update_partial_postalinfo.xml rename to core/src/test/resources/google/registry/flows/contact/contact_update_partial_postalinfo.xml diff --git a/core/src/test/java/google/registry/flows/contact/testdata/contact_update_partial_postalinfo_preserve_int.xml b/core/src/test/resources/google/registry/flows/contact/contact_update_partial_postalinfo_preserve_int.xml similarity index 100% rename from core/src/test/java/google/registry/flows/contact/testdata/contact_update_partial_postalinfo_preserve_int.xml rename to core/src/test/resources/google/registry/flows/contact/contact_update_partial_postalinfo_preserve_int.xml diff --git a/core/src/test/java/google/registry/flows/contact/testdata/contact_update_prohibited_status.xml b/core/src/test/resources/google/registry/flows/contact/contact_update_prohibited_status.xml similarity index 100% rename from core/src/test/java/google/registry/flows/contact/testdata/contact_update_prohibited_status.xml rename to core/src/test/resources/google/registry/flows/contact/contact_update_prohibited_status.xml diff --git a/core/src/test/java/google/registry/flows/contact/testdata/contact_update_remove_client_update_prohibited.xml b/core/src/test/resources/google/registry/flows/contact/contact_update_remove_client_update_prohibited.xml similarity index 100% rename from core/src/test/java/google/registry/flows/contact/testdata/contact_update_remove_client_update_prohibited.xml rename to core/src/test/resources/google/registry/flows/contact/contact_update_remove_client_update_prohibited.xml diff --git a/core/src/test/java/google/registry/flows/contact/testdata/generic_success_response.xml b/core/src/test/resources/google/registry/flows/contact/generic_success_response.xml similarity index 100% rename from core/src/test/java/google/registry/flows/contact/testdata/generic_success_response.xml rename to core/src/test/resources/google/registry/flows/contact/generic_success_response.xml diff --git a/core/src/test/java/google/registry/flows/testdata/contact_create_billion_laughs.xml b/core/src/test/resources/google/registry/flows/contact_create_billion_laughs.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/contact_create_billion_laughs.xml rename to core/src/test/resources/google/registry/flows/contact_create_billion_laughs.xml diff --git a/core/src/test/java/google/registry/flows/testdata/contact_create_jd1234.xml b/core/src/test/resources/google/registry/flows/contact_create_jd1234.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/contact_create_jd1234.xml rename to core/src/test/resources/google/registry/flows/contact_create_jd1234.xml diff --git a/core/src/test/java/google/registry/flows/testdata/contact_create_local_xxe.xml b/core/src/test/resources/google/registry/flows/contact_create_local_xxe.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/contact_create_local_xxe.xml rename to core/src/test/resources/google/registry/flows/contact_create_local_xxe.xml diff --git a/core/src/test/java/google/registry/flows/testdata/contact_create_remote_xxe.xml b/core/src/test/resources/google/registry/flows/contact_create_remote_xxe.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/contact_create_remote_xxe.xml rename to core/src/test/resources/google/registry/flows/contact_create_remote_xxe.xml diff --git a/core/src/test/java/google/registry/flows/testdata/contact_create_response_jd1234.xml b/core/src/test/resources/google/registry/flows/contact_create_response_jd1234.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/contact_create_response_jd1234.xml rename to core/src/test/resources/google/registry/flows/contact_create_response_jd1234.xml diff --git a/core/src/test/java/google/registry/flows/testdata/contact_create_response_sh8013.xml b/core/src/test/resources/google/registry/flows/contact_create_response_sh8013.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/contact_create_response_sh8013.xml rename to core/src/test/resources/google/registry/flows/contact_create_response_sh8013.xml diff --git a/core/src/test/java/google/registry/flows/testdata/contact_create_sh8013.xml b/core/src/test/resources/google/registry/flows/contact_create_sh8013.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/contact_create_sh8013.xml rename to core/src/test/resources/google/registry/flows/contact_create_sh8013.xml diff --git a/core/src/test/java/google/registry/flows/testdata/contact_delete_response_sh8013.xml b/core/src/test/resources/google/registry/flows/contact_delete_response_sh8013.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/contact_delete_response_sh8013.xml rename to core/src/test/resources/google/registry/flows/contact_delete_response_sh8013.xml diff --git a/core/src/test/java/google/registry/flows/testdata/contact_delete_sh8013.xml b/core/src/test/resources/google/registry/flows/contact_delete_sh8013.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/contact_delete_sh8013.xml rename to core/src/test/resources/google/registry/flows/contact_delete_sh8013.xml diff --git a/core/src/test/java/google/registry/flows/testdata/contact_info.xml b/core/src/test/resources/google/registry/flows/contact_info.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/contact_info.xml rename to core/src/test/resources/google/registry/flows/contact_info.xml diff --git a/core/src/test/java/google/registry/flows/testdata/contact_info_from_create_response.xml b/core/src/test/resources/google/registry/flows/contact_info_from_create_response.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/contact_info_from_create_response.xml rename to core/src/test/resources/google/registry/flows/contact_info_from_create_response.xml diff --git a/core/src/test/java/google/registry/flows/testdata/contact_info_from_create_response_sanitized.xml b/core/src/test/resources/google/registry/flows/contact_info_from_create_response_sanitized.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/contact_info_from_create_response_sanitized.xml rename to core/src/test/resources/google/registry/flows/contact_info_from_create_response_sanitized.xml diff --git a/core/src/test/java/google/registry/flows/testdata/contact_info_sanitized.xml b/core/src/test/resources/google/registry/flows/contact_info_sanitized.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/contact_info_sanitized.xml rename to core/src/test/resources/google/registry/flows/contact_info_sanitized.xml diff --git a/core/src/test/java/google/registry/flows/testdata/contact_transfer_request.xml b/core/src/test/resources/google/registry/flows/contact_transfer_request.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/contact_transfer_request.xml rename to core/src/test/resources/google/registry/flows/contact_transfer_request.xml diff --git a/core/src/test/java/google/registry/flows/testdata/contact_transfer_request_response_alternate.xml b/core/src/test/resources/google/registry/flows/contact_transfer_request_response_alternate.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/contact_transfer_request_response_alternate.xml rename to core/src/test/resources/google/registry/flows/contact_transfer_request_response_alternate.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check.xml b/core/src/test/resources/google/registry/flows/domain/domain_check.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_50.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_50.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_50.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_50.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_50_allocationtoken.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_50_allocationtoken.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_50_allocationtoken.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_50_allocationtoken.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_51.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_51.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_51.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_51.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_allocationtoken.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_allocationtoken.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_allocationtoken.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_allocationtoken.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_allocationtoken_fee.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_allocationtoken_fee.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_allocationtoken_fee.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_allocationtoken_fee.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_allocationtoken_fee_response.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_allocationtoken_fee_response.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_allocationtoken_fee_response.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_allocationtoken_fee_response.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_anchor.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_anchor.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_anchor.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_anchor.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_avail.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_avail.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_avail.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_avail.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_claims.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_claims.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_claims.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_claims.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_claims_50.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_claims_50.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_claims_50.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_claims_50.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_claims_51.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_claims_51.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_claims_51.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_claims_51.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_claims_allocationtoken.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_claims_allocationtoken.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_claims_allocationtoken.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_claims_allocationtoken.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_claims_bad_tld.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_claims_bad_tld.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_claims_bad_tld.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_claims_bad_tld.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_claims_multiple_tlds.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_claims_multiple_tlds.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_claims_multiple_tlds.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_claims_multiple_tlds.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_claims_response.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_claims_response.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_claims_response.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_claims_response.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_claims_response_multiple_tlds.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_claims_response_multiple_tlds.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_claims_response_multiple_tlds.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_claims_response_multiple_tlds.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_claims_response_none.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_claims_response_none.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_claims_response_none.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_claims_response_none.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_duplicates.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_duplicates.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_duplicates.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_duplicates.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_eap_fee_response_date_v12.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_eap_fee_response_date_v12.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_eap_fee_response_date_v12.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_eap_fee_response_date_v12.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_eap_fee_response_v06.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_eap_fee_response_v06.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_eap_fee_response_v06.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_eap_fee_response_v06.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_eap_fee_response_v11.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_eap_fee_response_v11.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_eap_fee_response_v11.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_eap_fee_response_v11.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_eap_fee_response_v12.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_eap_fee_response_v12.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_eap_fee_response_v12.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_eap_fee_response_v12.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_bad_period_v06.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_bad_period_v06.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_bad_period_v06.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_bad_period_v06.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_bad_period_v11.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_bad_period_v11.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_bad_period_v11.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_bad_period_v11.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_bad_period_v12.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_bad_period_v12.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_bad_period_v12.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_bad_period_v12.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_command_phase_v06.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_command_phase_v06.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_command_phase_v06.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_command_phase_v06.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_command_phase_v11.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_command_phase_v11.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_command_phase_v11.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_command_phase_v11.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_command_phase_v12.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_command_phase_v12.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_command_phase_v12.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_command_phase_v12.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_command_subphase_v06.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_command_subphase_v06.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_command_subphase_v06.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_command_subphase_v06.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_command_subphase_v11.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_command_subphase_v11.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_command_subphase_v11.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_command_subphase_v11.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_command_subphase_v12.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_command_subphase_v12.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_command_subphase_v12.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_command_subphase_v12.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_date_v12.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_date_v12.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_date_v12.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_date_v12.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_euro_v06.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_euro_v06.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_euro_v06.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_euro_v06.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_euro_v11.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_euro_v11.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_euro_v11.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_euro_v11.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_euro_v12.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_euro_v12.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_euro_v12.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_euro_v12.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_fractional.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_fractional.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_fractional.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_fractional.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_fractional_response.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_fractional_response.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_fractional_response.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_fractional_response.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_invalid_command_v06.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_invalid_command_v06.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_invalid_command_v06.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_invalid_command_v06.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_invalid_command_v11.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_invalid_command_v11.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_invalid_command_v11.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_invalid_command_v11.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_invalid_command_v12.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_invalid_command_v12.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_invalid_command_v12.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_invalid_command_v12.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_multiple_commands_response_v06.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_multiple_commands_response_v06.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_multiple_commands_response_v06.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_multiple_commands_response_v06.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_multiple_commands_response_v12.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_multiple_commands_response_v12.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_multiple_commands_response_v12.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_multiple_commands_response_v12.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_multiple_commands_v06.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_multiple_commands_v06.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_multiple_commands_v06.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_multiple_commands_v06.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_multiple_commands_v12.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_multiple_commands_v12.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_multiple_commands_v12.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_multiple_commands_v12.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_multiyear_restore_v06.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_multiyear_restore_v06.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_multiyear_restore_v06.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_multiyear_restore_v06.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_multiyear_restore_v11.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_multiyear_restore_v11.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_multiyear_restore_v11.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_multiyear_restore_v11.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_multiyear_restore_v12.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_multiyear_restore_v12.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_multiyear_restore_v12.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_multiyear_restore_v12.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_multiyear_transfer_v06.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_multiyear_transfer_v06.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_multiyear_transfer_v06.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_multiyear_transfer_v06.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_multiyear_transfer_v11.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_multiyear_transfer_v11.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_multiyear_transfer_v11.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_multiyear_transfer_v11.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_multiyear_transfer_v12.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_multiyear_transfer_v12.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_multiyear_transfer_v12.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_multiyear_transfer_v12.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_not_in_avail.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_not_in_avail.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_not_in_avail.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_not_in_avail.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_eap_response_v06.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_eap_response_v06.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_eap_response_v06.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_eap_response_v06.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_response_v06.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_response_v06.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_response_v06.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_response_v06.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_response_v11_create.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_response_v11_create.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_response_v11_create.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_response_v11_create.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_response_v11_renew.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_response_v11_renew.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_response_v11_renew.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_response_v11_renew.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_response_v11_restore.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_response_v11_restore.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_response_v11_restore.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_response_v11_restore.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_response_v11_transfer.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_response_v11_transfer.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_response_v11_transfer.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_response_v11_transfer.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_response_v11_update.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_response_v11_update.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_response_v11_update.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_response_v11_update.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_response_v12.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_response_v12.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_response_v12.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_response_v12.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_v06.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_v06.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_v06.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_v06.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_v11_create.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_v11_create.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_v11_create.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_v11_create.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_v11_renew.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_v11_renew.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_v11_renew.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_v11_renew.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_v11_restore.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_v11_restore.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_v11_restore.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_v11_restore.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_v11_transfer.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_v11_transfer.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_v11_transfer.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_v11_transfer.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_v11_update.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_v11_update.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_v11_update.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_v11_update.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_v12.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_v12.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_v12.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_v12.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_response_v06.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_response_v06.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_response_v06.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_response_v06.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_response_v11_create.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_response_v11_create.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_response_v11_create.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_response_v11_create.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_response_v11_renew.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_response_v11_renew.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_response_v11_renew.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_response_v11_renew.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_response_v11_restore.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_response_v11_restore.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_response_v11_restore.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_response_v11_restore.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_response_v11_transfer.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_response_v11_transfer.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_response_v11_transfer.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_response_v11_transfer.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_response_v12.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_response_v12.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_response_v12.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_response_v12.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_sunrise_response_v06.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_sunrise_response_v06.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_sunrise_response_v06.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_sunrise_response_v06.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_sunrise_response_v11_create.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_sunrise_response_v11_create.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_sunrise_response_v11_create.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_sunrise_response_v11_create.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_sunrise_response_v11_renew.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_sunrise_response_v11_renew.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_sunrise_response_v11_renew.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_sunrise_response_v11_renew.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_sunrise_response_v11_restore.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_sunrise_response_v11_restore.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_sunrise_response_v11_restore.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_sunrise_response_v11_restore.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_sunrise_response_v11_transfer.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_sunrise_response_v11_transfer.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_sunrise_response_v11_transfer.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_sunrise_response_v11_transfer.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_sunrise_response_v12.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_sunrise_response_v12.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_sunrise_response_v12.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_sunrise_response_v12.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_v06.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_v06.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_v06.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_v06.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_v11_create.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_v11_create.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_v11_create.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_v11_create.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_v11_renew.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_v11_renew.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_v11_renew.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_v11_renew.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_v11_restore.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_v11_restore.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_v11_restore.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_v11_restore.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_v11_transfer.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_v11_transfer.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_v11_transfer.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_v11_transfer.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_v12.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_v12.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_v12.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_v12.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_response_v06.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_response_v06.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_response_v06.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_response_v06.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_response_v11.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_response_v11.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_response_v11.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_response_v11.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_response_v12.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_response_v12.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_response_v12.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_response_v12.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_unknown_command_v06.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_unknown_command_v06.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_unknown_command_v06.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_unknown_command_v06.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_unknown_command_v11.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_unknown_command_v11.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_unknown_command_v11.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_unknown_command_v11.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_unknown_command_v12.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_unknown_command_v12.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_unknown_command_v12.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_unknown_command_v12.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_v06.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_v06.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_v06.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_v06.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_v11.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_v11.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_v11.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_v11.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_v12.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_v12.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_v12.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_fee_v12.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_no_cltrid.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_no_cltrid.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_no_cltrid.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_no_cltrid.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_one_multipart_tld_reserved.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_one_multipart_tld_reserved.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_one_multipart_tld_reserved.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_one_multipart_tld_reserved.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_one_tld.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_one_tld.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_one_tld.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_one_tld.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_one_tld_reserved.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_one_tld_reserved.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_one_tld_reserved.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_one_tld_reserved.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_one_tld_response.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_one_tld_response.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_one_tld_response.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_one_tld_response.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_premium.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_premium.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_premium.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_premium.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_reserved_allocationtoken.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_reserved_allocationtoken.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_reserved_allocationtoken.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_reserved_allocationtoken.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_check_template.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_template.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_check_template.xml rename to core/src/test/resources/google/registry/flows/domain/domain_check_template.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create.xml b/core/src/test/resources/google/registry/flows/domain/domain_create.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_11_years.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_11_years.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_11_years.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_11_years.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_13_nameservers.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_13_nameservers.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_13_nameservers.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_13_nameservers.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_14_nameservers.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_14_nameservers.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_14_nameservers.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_14_nameservers.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_allocationtoken.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_allocationtoken.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_allocationtoken.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_allocationtoken.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_anchor_allocationtoken.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_anchor_allocationtoken.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_anchor_allocationtoken.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_anchor_allocationtoken.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_anchor_response.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_anchor_response.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_anchor_response.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_anchor_response.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_anchor_tenant_claims.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_anchor_tenant_claims.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_anchor_tenant_claims.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_anchor_tenant_claims.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_anchor_tenant_invalid_years.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_anchor_tenant_invalid_years.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_anchor_tenant_invalid_years.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_anchor_tenant_invalid_years.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_anchor_tenant_metadata_extension.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_anchor_tenant_metadata_extension.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_anchor_tenant_metadata_extension.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_anchor_tenant_metadata_extension.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_anchor_tenant_signed_mark.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_anchor_tenant_signed_mark.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_anchor_tenant_signed_mark.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_anchor_tenant_signed_mark.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_anchor_tenant_sunrise_metadata_extension.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_anchor_tenant_sunrise_metadata_extension.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_anchor_tenant_sunrise_metadata_extension.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_anchor_tenant_sunrise_metadata_extension.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_bad_checksum_claim_notice.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_bad_checksum_claim_notice.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_bad_checksum_claim_notice.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_bad_checksum_claim_notice.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_bad_idn_minna.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_bad_idn_minna.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_bad_idn_minna.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_bad_idn_minna.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_bad_validator_id.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_bad_validator_id.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_bad_validator_id.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_bad_validator_id.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_claim_notice.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_claim_notice.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_claim_notice.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_claim_notice.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_code_with_mark.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_code_with_mark.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_code_with_mark.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_code_with_mark.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_dsdata.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_dsdata.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_dsdata.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_dsdata.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_dsdata_8_records.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_dsdata_8_records.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_dsdata_8_records.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_dsdata_8_records.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_dsdata_9_records.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_dsdata_9_records.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_dsdata_9_records.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_dsdata_9_records.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_dsdata_no_maxsiglife.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_dsdata_no_maxsiglife.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_dsdata_no_maxsiglife.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_dsdata_no_maxsiglife.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_duplicate_contact.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_duplicate_contact.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_duplicate_contact.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_duplicate_contact.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_eap_combined_fee.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_eap_combined_fee.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_eap_combined_fee.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_eap_combined_fee.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_eap_fee.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_eap_fee.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_eap_fee.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_eap_fee.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_extra_fees.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_extra_fees.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_extra_fees.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_extra_fees.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_fee.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_fee.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_fee.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_fee.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_fee_applied.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_fee_applied.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_fee_applied.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_fee_applied.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_fee_bad_scale.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_fee_bad_scale.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_fee_bad_scale.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_fee_bad_scale.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_fee_defaults.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_fee_defaults.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_fee_defaults.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_fee_defaults.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_fee_grace_period.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_fee_grace_period.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_fee_grace_period.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_fee_grace_period.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_fee_refundable.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_fee_refundable.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_fee_refundable.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_fee_refundable.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_idn_minna.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_idn_minna.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_idn_minna.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_idn_minna.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_malformed_claim_notice1.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_malformed_claim_notice1.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_malformed_claim_notice1.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_malformed_claim_notice1.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_malformed_claim_notice2.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_malformed_claim_notice2.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_malformed_claim_notice2.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_malformed_claim_notice2.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_metadata.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_metadata.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_metadata.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_metadata.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_missing_admin.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_missing_admin.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_missing_admin.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_missing_admin.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_missing_contact_type.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_missing_contact_type.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_missing_contact_type.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_missing_contact_type.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_missing_non_registrant_contacts.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_missing_non_registrant_contacts.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_missing_non_registrant_contacts.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_missing_non_registrant_contacts.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_missing_period.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_missing_period.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_missing_period.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_missing_period.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_missing_registrant.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_missing_registrant.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_missing_registrant.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_missing_registrant.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_missing_tech.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_missing_tech.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_missing_tech.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_missing_tech.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_months.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_months.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_months.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_months.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_no_cltrid.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_no_cltrid.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_no_cltrid.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_no_cltrid.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_no_hosts_or_dsdata.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_no_hosts_or_dsdata.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_no_hosts_or_dsdata.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_no_hosts_or_dsdata.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_premium.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_premium.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_premium.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_premium.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_premium_allocationtoken.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_premium_allocationtoken.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_premium_allocationtoken.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_premium_allocationtoken.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_premium_eap.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_premium_eap.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_premium_eap.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_premium_eap.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_registration_encoded_signed_mark.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_registration_encoded_signed_mark.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_registration_encoded_signed_mark.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_registration_encoded_signed_mark.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_registration_start_date_sunrise_claims_notice.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_registration_start_date_sunrise_claims_notice.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_registration_start_date_sunrise_claims_notice.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_registration_start_date_sunrise_claims_notice.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_registration_sunrise.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_registration_sunrise.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_registration_sunrise.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_registration_sunrise.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_reserved.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_reserved.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_reserved.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_reserved.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_reserved_response.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_reserved_response.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_reserved_response.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_reserved_response.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_response.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_response.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_response.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_response.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_response_claims.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_response_claims.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_response_claims.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_response_claims.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_response_eap_fee.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_response_eap_fee.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_response_eap_fee.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_response_eap_fee.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/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 similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_response_encoded_signed_mark_name.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_response_encoded_signed_mark_name.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_response_fee.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_response_fee.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_response_fee.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_response_fee.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_response_idn_minna.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_response_idn_minna.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_response_idn_minna.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_response_idn_minna.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_response_no_cltrid.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_response_no_cltrid.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_response_no_cltrid.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_response_no_cltrid.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_response_premium.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_response_premium.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_response_premium.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_response_premium.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_response_premium_eap.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_response_premium_eap.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_response_premium_eap.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_response_premium_eap.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/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 similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_sunrise_encoded_signed_mark_no_type.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_sunrise_encoded_signed_mark_no_type.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_uppercase.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_uppercase.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_uppercase.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_uppercase.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_with_tld.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_with_tld.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_with_tld.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_with_tld.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_create_wrong_extension.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_wrong_extension.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_create_wrong_extension.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_wrong_extension.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_delete.xml b/core/src/test/resources/google/registry/flows/domain/domain_delete.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_delete.xml rename to core/src/test/resources/google/registry/flows/domain/domain_delete.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_delete_allocationtoken.xml b/core/src/test/resources/google/registry/flows/domain/domain_delete_allocationtoken.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_delete_allocationtoken.xml rename to core/src/test/resources/google/registry/flows/domain/domain_delete_allocationtoken.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_delete_flags.xml b/core/src/test/resources/google/registry/flows/domain/domain_delete_flags.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_delete_flags.xml rename to core/src/test/resources/google/registry/flows/domain/domain_delete_flags.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_delete_metadata.xml b/core/src/test/resources/google/registry/flows/domain/domain_delete_metadata.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_delete_metadata.xml rename to core/src/test/resources/google/registry/flows/domain/domain_delete_metadata.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_delete_response_autorenew_fee.xml b/core/src/test/resources/google/registry/flows/domain/domain_delete_response_autorenew_fee.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_delete_response_autorenew_fee.xml rename to core/src/test/resources/google/registry/flows/domain/domain_delete_response_autorenew_fee.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_delete_response_fee.xml b/core/src/test/resources/google/registry/flows/domain/domain_delete_response_fee.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_delete_response_fee.xml rename to core/src/test/resources/google/registry/flows/domain/domain_delete_response_fee.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_delete_response_pending.xml b/core/src/test/resources/google/registry/flows/domain/domain_delete_response_pending.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_delete_response_pending.xml rename to core/src/test/resources/google/registry/flows/domain/domain_delete_response_pending.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_delete_response_pending_fee.xml b/core/src/test/resources/google/registry/flows/domain/domain_delete_response_pending_fee.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_delete_response_pending_fee.xml rename to core/src/test/resources/google/registry/flows/domain/domain_delete_response_pending_fee.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_delete_superuser_and_metadata_extension.xml b/core/src/test/resources/google/registry/flows/domain/domain_delete_superuser_and_metadata_extension.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_delete_superuser_and_metadata_extension.xml rename to core/src/test/resources/google/registry/flows/domain/domain_delete_superuser_and_metadata_extension.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_delete_superuser_extension.xml b/core/src/test/resources/google/registry/flows/domain/domain_delete_superuser_extension.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_delete_superuser_extension.xml rename to core/src/test/resources/google/registry/flows/domain/domain_delete_superuser_extension.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_info.xml b/core/src/test/resources/google/registry/flows/domain/domain_info.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_info.xml rename to core/src/test/resources/google/registry/flows/domain/domain_info.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_info_default_hosts.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_default_hosts.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_info_default_hosts.xml rename to core/src/test/resources/google/registry/flows/domain/domain_info_default_hosts.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_info_delegated_hosts.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_delegated_hosts.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_info_delegated_hosts.xml rename to core/src/test/resources/google/registry/flows/domain/domain_info_delegated_hosts.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_info_fee.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_fee.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_info_fee.xml rename to core/src/test/resources/google/registry/flows/domain/domain_info_fee.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_info_fee_command_phase.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_fee_command_phase.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_info_fee_command_phase.xml rename to core/src/test/resources/google/registry/flows/domain/domain_info_fee_command_phase.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_info_fee_command_subphase.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_fee_command_subphase.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_info_fee_command_subphase.xml rename to core/src/test/resources/google/registry/flows/domain/domain_info_fee_command_subphase.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_info_fee_premium_response.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_fee_premium_response.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_info_fee_premium_response.xml rename to core/src/test/resources/google/registry/flows/domain/domain_info_fee_premium_response.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_info_fee_response.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_fee_response.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_info_fee_response.xml rename to core/src/test/resources/google/registry/flows/domain/domain_info_fee_response.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_info_fee_restore_premium_response.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_fee_restore_premium_response.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_info_fee_restore_premium_response.xml rename to core/src/test/resources/google/registry/flows/domain/domain_info_fee_restore_premium_response.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_info_fee_restore_response.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_fee_restore_response.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_info_fee_restore_response.xml rename to core/src/test/resources/google/registry/flows/domain/domain_info_fee_restore_response.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_info_flags_none.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_flags_none.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_info_flags_none.xml rename to core/src/test/resources/google/registry/flows/domain/domain_info_flags_none.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_info_flags_two.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_flags_two.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_info_flags_two.xml rename to core/src/test/resources/google/registry/flows/domain/domain_info_flags_two.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_info_no_cltrid.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_no_cltrid.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_info_no_cltrid.xml rename to core/src/test/resources/google/registry/flows/domain/domain_info_no_cltrid.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_info_none_hosts.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_none_hosts.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_info_none_hosts.xml rename to core/src/test/resources/google/registry/flows/domain/domain_info_none_hosts.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_info_response.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_response.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_info_response.xml rename to core/src/test/resources/google/registry/flows/domain/domain_info_response.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_addperiod.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_response_addperiod.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_addperiod.xml rename to core/src/test/resources/google/registry/flows/domain/domain_info_response_addperiod.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_autorenewperiod.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_response_autorenewperiod.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_autorenewperiod.xml rename to core/src/test/resources/google/registry/flows/domain/domain_info_response_autorenewperiod.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_delegated_hosts.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_response_delegated_hosts.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_delegated_hosts.xml rename to core/src/test/resources/google/registry/flows/domain/domain_info_response_delegated_hosts.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_dsdata.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_response_dsdata.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_dsdata.xml rename to core/src/test/resources/google/registry/flows/domain/domain_info_response_dsdata.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_dsdata_addperiod.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_response_dsdata_addperiod.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_dsdata_addperiod.xml rename to core/src/test/resources/google/registry/flows/domain/domain_info_response_dsdata_addperiod.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_no_cltrid.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_response_no_cltrid.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_no_cltrid.xml rename to core/src/test/resources/google/registry/flows/domain/domain_info_response_no_cltrid.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_none_hosts.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_response_none_hosts.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_none_hosts.xml rename to core/src/test/resources/google/registry/flows/domain/domain_info_response_none_hosts.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_pendingdelete.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_response_pendingdelete.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_pendingdelete.xml rename to core/src/test/resources/google/registry/flows/domain/domain_info_response_pendingdelete.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_redemptionperiod.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_response_redemptionperiod.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_redemptionperiod.xml rename to core/src/test/resources/google/registry/flows/domain/domain_info_response_redemptionperiod.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_renewperiod.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_response_renewperiod.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_renewperiod.xml rename to core/src/test/resources/google/registry/flows/domain/domain_info_response_renewperiod.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_stackedaddrenewperiod.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_response_stackedaddrenewperiod.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_stackedaddrenewperiod.xml rename to core/src/test/resources/google/registry/flows/domain/domain_info_response_stackedaddrenewperiod.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_subordinate_hosts.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_response_subordinate_hosts.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_subordinate_hosts.xml rename to core/src/test/resources/google/registry/flows/domain/domain_info_response_subordinate_hosts.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_transferperiod.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_response_transferperiod.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_transferperiod.xml rename to core/src/test/resources/google/registry/flows/domain/domain_info_response_transferperiod.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_unauthorized.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_response_unauthorized.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_unauthorized.xml rename to core/src/test/resources/google/registry/flows/domain/domain_info_response_unauthorized.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_info_subordinate_hosts.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_subordinate_hosts.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_info_subordinate_hosts.xml rename to core/src/test/resources/google/registry/flows/domain/domain_info_subordinate_hosts.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_info_with_auth.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_with_auth.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_info_with_auth.xml rename to core/src/test/resources/google/registry/flows/domain/domain_info_with_auth.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_info_with_contact_auth.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_with_contact_auth.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_info_with_contact_auth.xml rename to core/src/test/resources/google/registry/flows/domain/domain_info_with_contact_auth.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_renew.xml b/core/src/test/resources/google/registry/flows/domain/domain_renew.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_renew.xml rename to core/src/test/resources/google/registry/flows/domain/domain_renew.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_renew_11_years.xml b/core/src/test/resources/google/registry/flows/domain/domain_renew_11_years.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_renew_11_years.xml rename to core/src/test/resources/google/registry/flows/domain/domain_renew_11_years.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_renew_fee.xml b/core/src/test/resources/google/registry/flows/domain/domain_renew_fee.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_renew_fee.xml rename to core/src/test/resources/google/registry/flows/domain/domain_renew_fee.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_renew_fee_applied.xml b/core/src/test/resources/google/registry/flows/domain/domain_renew_fee_applied.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_renew_fee_applied.xml rename to core/src/test/resources/google/registry/flows/domain/domain_renew_fee_applied.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_renew_fee_bad_scale.xml b/core/src/test/resources/google/registry/flows/domain/domain_renew_fee_bad_scale.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_renew_fee_bad_scale.xml rename to core/src/test/resources/google/registry/flows/domain/domain_renew_fee_bad_scale.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_renew_fee_defaults.xml b/core/src/test/resources/google/registry/flows/domain/domain_renew_fee_defaults.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_renew_fee_defaults.xml rename to core/src/test/resources/google/registry/flows/domain/domain_renew_fee_defaults.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_renew_fee_grace_period.xml b/core/src/test/resources/google/registry/flows/domain/domain_renew_fee_grace_period.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_renew_fee_grace_period.xml rename to core/src/test/resources/google/registry/flows/domain/domain_renew_fee_grace_period.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_renew_fee_refundable.xml b/core/src/test/resources/google/registry/flows/domain/domain_renew_fee_refundable.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_renew_fee_refundable.xml rename to core/src/test/resources/google/registry/flows/domain/domain_renew_fee_refundable.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_renew_flags.xml b/core/src/test/resources/google/registry/flows/domain/domain_renew_flags.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_renew_flags.xml rename to core/src/test/resources/google/registry/flows/domain/domain_renew_flags.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_renew_missing_period.xml b/core/src/test/resources/google/registry/flows/domain/domain_renew_missing_period.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_renew_missing_period.xml rename to core/src/test/resources/google/registry/flows/domain/domain_renew_missing_period.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_renew_months.xml b/core/src/test/resources/google/registry/flows/domain/domain_renew_months.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_renew_months.xml rename to core/src/test/resources/google/registry/flows/domain/domain_renew_months.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_renew_premium.xml b/core/src/test/resources/google/registry/flows/domain/domain_renew_premium.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_renew_premium.xml rename to core/src/test/resources/google/registry/flows/domain/domain_renew_premium.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_renew_response.xml b/core/src/test/resources/google/registry/flows/domain/domain_renew_response.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_renew_response.xml rename to core/src/test/resources/google/registry/flows/domain/domain_renew_response.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_renew_response_fee.xml b/core/src/test/resources/google/registry/flows/domain/domain_renew_response_fee.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_renew_response_fee.xml rename to core/src/test/resources/google/registry/flows/domain/domain_renew_response_fee.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_renew_response_missing_period.xml b/core/src/test/resources/google/registry/flows/domain/domain_renew_response_missing_period.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_renew_response_missing_period.xml rename to core/src/test/resources/google/registry/flows/domain/domain_renew_response_missing_period.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_approve.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_approve.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_approve.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_approve.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_approve_contact_authinfo.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_approve_contact_authinfo.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_approve_contact_authinfo.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_approve_contact_authinfo.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_approve_domain_authinfo.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_approve_domain_authinfo.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_approve_domain_authinfo.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_approve_domain_authinfo.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_approve_extra.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_approve_extra.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_approve_extra.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_approve_extra.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_approve_net.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_approve_net.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_approve_net.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_approve_net.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_approve_response.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_approve_response.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_approve_response.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_approve_response.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_approve_response_autorenew.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_approve_response_autorenew.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_approve_response_autorenew.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_approve_response_autorenew.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_approve_response_net.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_approve_response_net.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_approve_response_net.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_approve_response_net.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_approve_response_zero_period.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_approve_response_zero_period.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_approve_response_zero_period.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_approve_response_zero_period.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_approve_response_zero_period_autorenew_grace.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_approve_response_zero_period_autorenew_grace.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_approve_response_zero_period_autorenew_grace.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_approve_response_zero_period_autorenew_grace.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_cancel.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_cancel.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_cancel.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_cancel.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_cancel_contact_authinfo.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_cancel_contact_authinfo.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_cancel_contact_authinfo.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_cancel_contact_authinfo.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_cancel_domain_authinfo.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_cancel_domain_authinfo.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_cancel_domain_authinfo.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_cancel_domain_authinfo.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_cancel_extra.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_cancel_extra.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_cancel_extra.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_cancel_extra.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_cancel_response.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_cancel_response.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_cancel_response.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_cancel_response.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_query.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_query.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_query.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_query.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_query_contact_authinfo.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_query_contact_authinfo.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_query_contact_authinfo.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_query_contact_authinfo.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_query_domain_authinfo.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_query_domain_authinfo.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_query_domain_authinfo.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_query_domain_authinfo.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_query_response.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_query_response.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_query_response.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_query_response.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_query_response_10_years.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_query_response_10_years.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_query_response_10_years.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_query_response_10_years.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_query_response_client_approved.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_query_response_client_approved.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_query_response_client_approved.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_query_response_client_approved.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_query_response_client_cancelled.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_query_response_client_cancelled.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_query_response_client_cancelled.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_query_response_client_cancelled.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_query_response_client_rejected.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_query_response_client_rejected.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_query_response_client_rejected.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_query_response_client_rejected.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_query_response_server_approved.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_query_response_server_approved.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_query_response_server_approved.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_query_response_server_approved.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_query_response_server_cancelled.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_query_response_server_cancelled.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_query_response_server_cancelled.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_query_response_server_cancelled.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_reject.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_reject.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_reject.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_reject.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_reject_contact_authinfo.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_reject_contact_authinfo.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_reject_contact_authinfo.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_reject_contact_authinfo.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_reject_domain_authinfo.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_reject_domain_authinfo.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_reject_domain_authinfo.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_reject_domain_authinfo.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_reject_extra.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_reject_extra.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_reject_extra.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_reject_extra.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_reject_response.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_reject_response.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_reject_response.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_reject_response.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_request.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_request.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_2_years.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_request_2_years.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_2_years.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_request_2_years.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_domain_authinfo.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_request_domain_authinfo.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_domain_authinfo.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_request_domain_authinfo.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_fee.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_request_fee.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_fee.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_request_fee.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_fee_and_superuser_extension.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_request_fee_and_superuser_extension.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_fee_and_superuser_extension.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_request_fee_and_superuser_extension.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_fee_applied.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_request_fee_applied.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_fee_applied.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_request_fee_applied.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_fee_bad_scale.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_request_fee_bad_scale.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_fee_bad_scale.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_request_fee_bad_scale.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_fee_defaults.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_request_fee_defaults.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_fee_defaults.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_request_fee_defaults.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_fee_grace_period.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_request_fee_grace_period.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_fee_grace_period.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_request_fee_grace_period.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_fee_refundable.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_request_fee_refundable.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_fee_refundable.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_request_fee_refundable.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_missing_period.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_request_missing_period.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_missing_period.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_request_missing_period.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_months.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_request_months.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_months.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_request_months.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_no_authinfo.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_request_no_authinfo.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_no_authinfo.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_request_no_authinfo.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_premium.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_request_premium.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_premium.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_request_premium.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_response.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_request_response.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_response.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_request_response.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_response_10_year_cap.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_request_response_10_year_cap.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_response_10_year_cap.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_request_response_10_year_cap.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_response_15_minutes.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_request_response_15_minutes.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_response_15_minutes.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_request_response_15_minutes.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_response_autorenew_grace_at_request_only.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_request_response_autorenew_grace_at_request_only.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_response_autorenew_grace_at_request_only.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_request_response_autorenew_grace_at_request_only.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_response_autorenew_grace_at_transfer_only.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_request_response_autorenew_grace_at_transfer_only.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_response_autorenew_grace_at_transfer_only.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_request_response_autorenew_grace_at_transfer_only.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_response_autorenew_grace_throughout_transfer_window.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_request_response_autorenew_grace_throughout_transfer_window.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_response_autorenew_grace_throughout_transfer_window.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_request_response_autorenew_grace_throughout_transfer_window.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_response_fee.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_request_response_fee.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_response_fee.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_request_response_fee.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_response_fees.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_request_response_fees.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_response_fees.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_request_response_fees.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_response_su_ext_one_year_period_nonzero_transfer_length.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_request_response_su_ext_one_year_period_nonzero_transfer_length.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_response_su_ext_one_year_period_nonzero_transfer_length.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_request_response_su_ext_one_year_period_nonzero_transfer_length.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_response_su_ext_zero_period_autorenew_grace.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_request_response_su_ext_zero_period_autorenew_grace.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_response_su_ext_zero_period_autorenew_grace.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_request_response_su_ext_zero_period_autorenew_grace.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_response_su_ext_zero_period_nonzero_transfer_length.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_request_response_su_ext_zero_period_nonzero_transfer_length.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_response_su_ext_zero_period_nonzero_transfer_length.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_request_response_su_ext_zero_period_nonzero_transfer_length.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_response_su_ext_zero_period_zero_transfer_length.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_request_response_su_ext_zero_period_zero_transfer_length.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_response_su_ext_zero_period_zero_transfer_length.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_request_response_su_ext_zero_period_zero_transfer_length.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_separate_fees.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_request_separate_fees.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_separate_fees.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_request_separate_fees.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_superuser_extension.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_request_superuser_extension.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_superuser_extension.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_request_superuser_extension.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_wildcard.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_request_wildcard.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_wildcard.xml rename to core/src/test/resources/google/registry/flows/domain/domain_transfer_request_wildcard.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update.xml b/core/src/test/resources/google/registry/flows/domain/domain_update.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_add_nameserver.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_add_nameserver.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_add_nameserver.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_add_nameserver.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_add_non_server_status.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_add_non_server_status.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_add_non_server_status.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_add_non_server_status.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_add_registry_lock.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_add_registry_lock.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_add_registry_lock.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_add_registry_lock.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_add_remove_same_contact.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_add_remove_same_contact.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_add_remove_same_contact.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_add_remove_same_contact.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_add_remove_same_host.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_add_remove_same_host.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_add_remove_same_host.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_add_remove_same_host.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_add_server_hold_status.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_add_server_hold_status.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_add_server_hold_status.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_add_server_hold_status.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_add_server_status.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_add_server_status.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_add_server_status.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_add_server_status.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_add_server_status_non_registrar.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_add_server_status_non_registrar.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_add_server_status_non_registrar.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_add_server_status_non_registrar.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_authinfo.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_authinfo.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_authinfo.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_authinfo.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_change_server_status.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_change_server_status.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_change_server_status.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_change_server_status.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_contacts_and_registrant.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_contacts_and_registrant.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_contacts_and_registrant.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_contacts_and_registrant.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_dsdata_add.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_dsdata_add.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_dsdata_add.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_dsdata_add.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_dsdata_add_rem.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_dsdata_add_rem.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_dsdata_add_rem.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_dsdata_add_rem.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_dsdata_add_rem_same.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_dsdata_add_rem_same.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_dsdata_add_rem_same.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_dsdata_add_rem_same.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_dsdata_empty.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_dsdata_empty.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_dsdata_empty.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_dsdata_empty.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_dsdata_rem.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_dsdata_rem.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_dsdata_rem.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_dsdata_rem.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_dsdata_rem_all.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_dsdata_rem_all.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_dsdata_rem_all.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_dsdata_rem_all.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_dsdata_rem_all_false.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_dsdata_rem_all_false.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_dsdata_rem_all_false.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_dsdata_rem_all_false.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_dsdata_urgent.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_dsdata_urgent.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_dsdata_urgent.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_dsdata_urgent.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_duplicate_contact.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_duplicate_contact.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_duplicate_contact.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_duplicate_contact.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_empty_registrant.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_empty_registrant.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_empty_registrant.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_empty_registrant.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_fee.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_fee.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_fee.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_fee.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_max_everything.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_max_everything.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_max_everything.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_max_everything.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_maxsiglife.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_maxsiglife.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_maxsiglife.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_maxsiglife.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_metadata.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_metadata.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_metadata.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_metadata.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_missing_contact_type.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_missing_contact_type.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_missing_contact_type.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_missing_contact_type.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_multiple_duplicate_contacts.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_multiple_duplicate_contacts.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_multiple_duplicate_contacts.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_multiple_duplicate_contacts.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_no_cltrid.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_no_cltrid.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_no_cltrid.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_no_cltrid.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_prohibited_status.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_prohibited_status.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_prohibited_status.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_prohibited_status.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_registrant.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_registrant.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_registrant.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_registrant.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_registrant_to_tech.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_registrant_to_tech.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_registrant_to_tech.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_registrant_to_tech.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_remove_admin.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_remove_admin.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_remove_admin.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_remove_admin.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_remove_client_hold.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_remove_client_hold.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_remove_client_hold.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_remove_client_hold.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_remove_contact.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_remove_contact.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_remove_contact.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_remove_contact.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_remove_multiple_contacts.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_remove_multiple_contacts.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_remove_multiple_contacts.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_remove_multiple_contacts.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_remove_nameserver.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_remove_nameserver.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_remove_nameserver.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_remove_nameserver.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_remove_server_hold.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_remove_server_hold.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_remove_server_hold.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_remove_server_hold.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_remove_server_status.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_remove_server_status.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_remove_server_status.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_remove_server_status.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_remove_tech.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_remove_tech.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_remove_tech.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_remove_tech.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_report.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_restore_report.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_report.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_restore_report.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_restore_request.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_restore_request.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_fee.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_restore_request_fee.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_fee.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_restore_request_fee.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_fee_applied.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_restore_request_fee_applied.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_fee_applied.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_restore_request_fee_applied.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_fee_bad_scale.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_restore_request_fee_bad_scale.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_fee_bad_scale.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_restore_request_fee_bad_scale.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_fee_defaults.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_restore_request_fee_defaults.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_fee_defaults.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_restore_request_fee_defaults.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_fee_grace_period.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_restore_request_fee_grace_period.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_fee_grace_period.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_restore_request_fee_grace_period.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_fee_refundable.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_restore_request_fee_refundable.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_fee_refundable.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_restore_request_fee_refundable.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_flags.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_restore_request_flags.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_flags.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_restore_request_flags.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_premium.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_restore_request_premium.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_premium.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_restore_request_premium.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_response_fee.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_restore_request_response_fee.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_response_fee.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_restore_request_response_fee.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_response_premium.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_restore_request_response_premium.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_response_premium.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_restore_request_response_premium.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_with_add.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_restore_request_with_add.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_with_add.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_restore_request_with_add.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_with_change.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_restore_request_with_change.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_with_change.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_restore_request_with_change.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_with_remove.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_restore_request_with_remove.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_with_remove.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_restore_request_with_remove.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_with_secdns.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_restore_request_with_secdns.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_with_secdns.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_restore_request_with_secdns.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_subordinate_hosts.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_subordinate_hosts.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_subordinate_hosts.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_subordinate_hosts.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_wildcard.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_wildcard.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_wildcard.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_wildcard.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/domain_update_wrong_extension.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_wrong_extension.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/domain_update_wrong_extension.xml rename to core/src/test/resources/google/registry/flows/domain/domain_update_wrong_extension.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/generic_success_response.xml b/core/src/test/resources/google/registry/flows/domain/generic_success_response.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/generic_success_response.xml rename to core/src/test/resources/google/registry/flows/domain/generic_success_response.xml diff --git a/core/src/test/java/google/registry/flows/domain/testdata/generic_success_response_no_cltrid.xml b/core/src/test/resources/google/registry/flows/domain/generic_success_response_no_cltrid.xml similarity index 100% rename from core/src/test/java/google/registry/flows/domain/testdata/generic_success_response_no_cltrid.xml rename to core/src/test/resources/google/registry/flows/domain/generic_success_response_no_cltrid.xml diff --git a/core/src/test/java/google/registry/flows/testdata/domain_check_fee_premium.xml b/core/src/test/resources/google/registry/flows/domain_check_fee_premium.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/domain_check_fee_premium.xml rename to core/src/test/resources/google/registry/flows/domain_check_fee_premium.xml diff --git a/core/src/test/java/google/registry/flows/testdata/domain_check_fee_premium_response.xml b/core/src/test/resources/google/registry/flows/domain_check_fee_premium_response.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/domain_check_fee_premium_response.xml rename to core/src/test/resources/google/registry/flows/domain_check_fee_premium_response.xml diff --git a/core/src/test/java/google/registry/flows/testdata/domain_create.xml b/core/src/test/resources/google/registry/flows/domain_create.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/domain_create.xml rename to core/src/test/resources/google/registry/flows/domain_create.xml diff --git a/core/src/test/java/google/registry/flows/testdata/domain_create_eap_fee.xml b/core/src/test/resources/google/registry/flows/domain_create_eap_fee.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/domain_create_eap_fee.xml rename to core/src/test/resources/google/registry/flows/domain_create_eap_fee.xml diff --git a/core/src/test/java/google/registry/flows/testdata/domain_create_fakesite.xml b/core/src/test/resources/google/registry/flows/domain_create_fakesite.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/domain_create_fakesite.xml rename to core/src/test/resources/google/registry/flows/domain_create_fakesite.xml diff --git a/core/src/test/java/google/registry/flows/testdata/domain_create_fakesite_no_nameservers.xml b/core/src/test/resources/google/registry/flows/domain_create_fakesite_no_nameservers.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/domain_create_fakesite_no_nameservers.xml rename to core/src/test/resources/google/registry/flows/domain_create_fakesite_no_nameservers.xml diff --git a/core/src/test/java/google/registry/flows/testdata/domain_create_no_hosts_or_dsdata.xml b/core/src/test/resources/google/registry/flows/domain_create_no_hosts_or_dsdata.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/domain_create_no_hosts_or_dsdata.xml rename to core/src/test/resources/google/registry/flows/domain_create_no_hosts_or_dsdata.xml diff --git a/core/src/test/java/google/registry/flows/testdata/domain_create_prettyprinted.xml b/core/src/test/resources/google/registry/flows/domain_create_prettyprinted.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/domain_create_prettyprinted.xml rename to core/src/test/resources/google/registry/flows/domain_create_prettyprinted.xml diff --git a/core/src/test/java/google/registry/flows/testdata/domain_create_response.xml b/core/src/test/resources/google/registry/flows/domain_create_response.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/domain_create_response.xml rename to core/src/test/resources/google/registry/flows/domain_create_response.xml diff --git a/core/src/test/java/google/registry/flows/testdata/domain_create_response_eap_fee.xml b/core/src/test/resources/google/registry/flows/domain_create_response_eap_fee.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/domain_create_response_eap_fee.xml rename to core/src/test/resources/google/registry/flows/domain_create_response_eap_fee.xml diff --git a/core/src/test/java/google/registry/flows/testdata/domain_create_secondsite.xml b/core/src/test/resources/google/registry/flows/domain_create_secondsite.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/domain_create_secondsite.xml rename to core/src/test/resources/google/registry/flows/domain_create_secondsite.xml diff --git a/core/src/test/java/google/registry/flows/testdata/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 similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/domain_create_start_date_sunrise_encoded_mark_no_type.xml rename to core/src/test/resources/google/registry/flows/domain_create_start_date_sunrise_encoded_mark_no_type.xml diff --git a/core/src/test/java/google/registry/flows/testdata/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 similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/domain_create_start_date_sunrise_encoded_mark_wrong_phase.xml rename to core/src/test/resources/google/registry/flows/domain_create_start_date_sunrise_encoded_mark_wrong_phase.xml diff --git a/core/src/test/java/google/registry/flows/testdata/domain_create_sunrise_encoded_mark.xml b/core/src/test/resources/google/registry/flows/domain_create_sunrise_encoded_mark.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/domain_create_sunrise_encoded_mark.xml rename to core/src/test/resources/google/registry/flows/domain_create_sunrise_encoded_mark.xml diff --git a/core/src/test/java/google/registry/flows/testdata/domain_delete.xml b/core/src/test/resources/google/registry/flows/domain_delete.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/domain_delete.xml rename to core/src/test/resources/google/registry/flows/domain_delete.xml diff --git a/core/src/test/java/google/registry/flows/testdata/domain_delete_response_fee.xml b/core/src/test/resources/google/registry/flows/domain_delete_response_fee.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/domain_delete_response_fee.xml rename to core/src/test/resources/google/registry/flows/domain_delete_response_fee.xml diff --git a/core/src/test/java/google/registry/flows/testdata/domain_info.xml b/core/src/test/resources/google/registry/flows/domain_info.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/domain_info.xml rename to core/src/test/resources/google/registry/flows/domain_info.xml diff --git a/core/src/test/java/google/registry/flows/testdata/domain_info_fakesite.xml b/core/src/test/resources/google/registry/flows/domain_info_fakesite.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/domain_info_fakesite.xml rename to core/src/test/resources/google/registry/flows/domain_info_fakesite.xml diff --git a/core/src/test/java/google/registry/flows/testdata/domain_info_response_fakesite_3_nameservers.xml b/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_3_nameservers.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/domain_info_response_fakesite_3_nameservers.xml rename to core/src/test/resources/google/registry/flows/domain_info_response_fakesite_3_nameservers.xml diff --git a/core/src/test/java/google/registry/flows/testdata/domain_info_response_fakesite_3_nameservers_pending_transfer.xml b/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_3_nameservers_pending_transfer.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/domain_info_response_fakesite_3_nameservers_pending_transfer.xml rename to core/src/test/resources/google/registry/flows/domain_info_response_fakesite_3_nameservers_pending_transfer.xml diff --git a/core/src/test/java/google/registry/flows/testdata/domain_info_response_fakesite_3_nameservers_transfer_successful.xml b/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_3_nameservers_transfer_successful.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/domain_info_response_fakesite_3_nameservers_transfer_successful.xml rename to core/src/test/resources/google/registry/flows/domain_info_response_fakesite_3_nameservers_transfer_successful.xml diff --git a/core/src/test/java/google/registry/flows/testdata/domain_info_response_fakesite_inactive.xml b/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_inactive.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/domain_info_response_fakesite_inactive.xml rename to core/src/test/resources/google/registry/flows/domain_info_response_fakesite_inactive.xml diff --git a/core/src/test/java/google/registry/flows/testdata/domain_info_response_fakesite_ok.xml b/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_ok.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/domain_info_response_fakesite_ok.xml rename to core/src/test/resources/google/registry/flows/domain_info_response_fakesite_ok.xml diff --git a/core/src/test/java/google/registry/flows/testdata/domain_info_response_fakesite_ok_post_host_update.xml b/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_ok_post_host_update.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/domain_info_response_fakesite_ok_post_host_update.xml rename to core/src/test/resources/google/registry/flows/domain_info_response_fakesite_ok_post_host_update.xml diff --git a/core/src/test/java/google/registry/flows/testdata/domain_info_response_fakesite_pending_delete.xml b/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_pending_delete.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/domain_info_response_fakesite_pending_delete.xml rename to core/src/test/resources/google/registry/flows/domain_info_response_fakesite_pending_delete.xml diff --git a/core/src/test/java/google/registry/flows/testdata/domain_info_response_fakesite_pending_transfer.xml b/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_pending_transfer.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/domain_info_response_fakesite_pending_transfer.xml rename to core/src/test/resources/google/registry/flows/domain_info_response_fakesite_pending_transfer.xml diff --git a/core/src/test/java/google/registry/flows/testdata/domain_info_response_fakesite_pending_transfer_autorenew.xml b/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_pending_transfer_autorenew.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/domain_info_response_fakesite_pending_transfer_autorenew.xml rename to core/src/test/resources/google/registry/flows/domain_info_response_fakesite_pending_transfer_autorenew.xml diff --git a/core/src/test/java/google/registry/flows/testdata/domain_info_response_fakesite_restored_ok.xml b/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_restored_ok.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/domain_info_response_fakesite_restored_ok.xml rename to core/src/test/resources/google/registry/flows/domain_info_response_fakesite_restored_ok.xml diff --git a/core/src/test/java/google/registry/flows/testdata/domain_info_response_fakesite_transfer_complete.xml b/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_transfer_complete.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/domain_info_response_fakesite_transfer_complete.xml rename to core/src/test/resources/google/registry/flows/domain_info_response_fakesite_transfer_complete.xml diff --git a/core/src/test/java/google/registry/flows/testdata/domain_info_response_fakesite_transfer_period.xml b/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_transfer_period.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/domain_info_response_fakesite_transfer_period.xml rename to core/src/test/resources/google/registry/flows/domain_info_response_fakesite_transfer_period.xml diff --git a/core/src/test/java/google/registry/flows/testdata/domain_info_response_inactive.xml b/core/src/test/resources/google/registry/flows/domain_info_response_inactive.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/domain_info_response_inactive.xml rename to core/src/test/resources/google/registry/flows/domain_info_response_inactive.xml diff --git a/core/src/test/java/google/registry/flows/testdata/domain_info_response_inactive_grace_period.xml b/core/src/test/resources/google/registry/flows/domain_info_response_inactive_grace_period.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/domain_info_response_inactive_grace_period.xml rename to core/src/test/resources/google/registry/flows/domain_info_response_inactive_grace_period.xml diff --git a/core/src/test/java/google/registry/flows/testdata/domain_info_response_ok_wildcard.xml b/core/src/test/resources/google/registry/flows/domain_info_response_ok_wildcard.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/domain_info_response_ok_wildcard.xml rename to core/src/test/resources/google/registry/flows/domain_info_response_ok_wildcard.xml diff --git a/core/src/test/java/google/registry/flows/testdata/domain_info_response_testvalidate_ok.xml b/core/src/test/resources/google/registry/flows/domain_info_response_testvalidate_ok.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/domain_info_response_testvalidate_ok.xml rename to core/src/test/resources/google/registry/flows/domain_info_response_testvalidate_ok.xml diff --git a/core/src/test/java/google/registry/flows/testdata/domain_info_response_wildcard.xml b/core/src/test/resources/google/registry/flows/domain_info_response_wildcard.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/domain_info_response_wildcard.xml rename to core/src/test/resources/google/registry/flows/domain_info_response_wildcard.xml diff --git a/core/src/test/java/google/registry/flows/testdata/domain_info_response_wildcard_after_redemption.xml b/core/src/test/resources/google/registry/flows/domain_info_response_wildcard_after_redemption.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/domain_info_response_wildcard_after_redemption.xml rename to core/src/test/resources/google/registry/flows/domain_info_response_wildcard_after_redemption.xml diff --git a/core/src/test/java/google/registry/flows/testdata/domain_info_testvalidate.xml b/core/src/test/resources/google/registry/flows/domain_info_testvalidate.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/domain_info_testvalidate.xml rename to core/src/test/resources/google/registry/flows/domain_info_testvalidate.xml diff --git a/core/src/test/java/google/registry/flows/testdata/domain_renew.xml b/core/src/test/resources/google/registry/flows/domain_renew.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/domain_renew.xml rename to core/src/test/resources/google/registry/flows/domain_renew.xml diff --git a/core/src/test/java/google/registry/flows/testdata/domain_renew_response.xml b/core/src/test/resources/google/registry/flows/domain_renew_response.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/domain_renew_response.xml rename to core/src/test/resources/google/registry/flows/domain_renew_response.xml diff --git a/core/src/test/java/google/registry/flows/testdata/domain_renew_response_exceeds_max_years.xml b/core/src/test/resources/google/registry/flows/domain_renew_response_exceeds_max_years.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/domain_renew_response_exceeds_max_years.xml rename to core/src/test/resources/google/registry/flows/domain_renew_response_exceeds_max_years.xml diff --git a/core/src/test/java/google/registry/flows/testdata/domain_transfer_query_fakesite.xml b/core/src/test/resources/google/registry/flows/domain_transfer_query_fakesite.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/domain_transfer_query_fakesite.xml rename to core/src/test/resources/google/registry/flows/domain_transfer_query_fakesite.xml diff --git a/core/src/test/java/google/registry/flows/testdata/domain_transfer_query_response_completed_fakesite.xml b/core/src/test/resources/google/registry/flows/domain_transfer_query_response_completed_fakesite.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/domain_transfer_query_response_completed_fakesite.xml rename to core/src/test/resources/google/registry/flows/domain_transfer_query_response_completed_fakesite.xml diff --git a/core/src/test/java/google/registry/flows/testdata/domain_transfer_query_response_fakesite.xml b/core/src/test/resources/google/registry/flows/domain_transfer_query_response_fakesite.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/domain_transfer_query_response_fakesite.xml rename to core/src/test/resources/google/registry/flows/domain_transfer_query_response_fakesite.xml diff --git a/core/src/test/java/google/registry/flows/testdata/domain_transfer_request.xml b/core/src/test/resources/google/registry/flows/domain_transfer_request.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/domain_transfer_request.xml rename to core/src/test/resources/google/registry/flows/domain_transfer_request.xml diff --git a/core/src/test/java/google/registry/flows/testdata/domain_transfer_request_1_year.xml b/core/src/test/resources/google/registry/flows/domain_transfer_request_1_year.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/domain_transfer_request_1_year.xml rename to core/src/test/resources/google/registry/flows/domain_transfer_request_1_year.xml diff --git a/core/src/test/java/google/registry/flows/testdata/domain_transfer_response.xml b/core/src/test/resources/google/registry/flows/domain_transfer_response.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/domain_transfer_response.xml rename to core/src/test/resources/google/registry/flows/domain_transfer_response.xml diff --git a/core/src/test/java/google/registry/flows/testdata/domain_transfer_response_1_year.xml b/core/src/test/resources/google/registry/flows/domain_transfer_response_1_year.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/domain_transfer_response_1_year.xml rename to core/src/test/resources/google/registry/flows/domain_transfer_response_1_year.xml diff --git a/core/src/test/java/google/registry/flows/testdata/domain_update_add_nameserver_fakesite.xml b/core/src/test/resources/google/registry/flows/domain_update_add_nameserver_fakesite.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/domain_update_add_nameserver_fakesite.xml rename to core/src/test/resources/google/registry/flows/domain_update_add_nameserver_fakesite.xml diff --git a/core/src/test/java/google/registry/flows/testdata/domain_update_dsdata_add.xml b/core/src/test/resources/google/registry/flows/domain_update_dsdata_add.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/domain_update_dsdata_add.xml rename to core/src/test/resources/google/registry/flows/domain_update_dsdata_add.xml diff --git a/core/src/test/java/google/registry/flows/testdata/domain_update_dsdata_rem.xml b/core/src/test/resources/google/registry/flows/domain_update_dsdata_rem.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/domain_update_dsdata_rem.xml rename to core/src/test/resources/google/registry/flows/domain_update_dsdata_rem.xml diff --git a/core/src/test/java/google/registry/flows/testdata/domain_update_restore_fakesite.xml b/core/src/test/resources/google/registry/flows/domain_update_restore_fakesite.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/domain_update_restore_fakesite.xml rename to core/src/test/resources/google/registry/flows/domain_update_restore_fakesite.xml diff --git a/core/src/test/java/google/registry/flows/testdata/domain_update_restore_request.xml b/core/src/test/resources/google/registry/flows/domain_update_restore_request.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/domain_update_restore_request.xml rename to core/src/test/resources/google/registry/flows/domain_update_restore_request.xml diff --git a/core/src/test/java/google/registry/flows/testdata/generic_success_action_pending_response.xml b/core/src/test/resources/google/registry/flows/generic_success_action_pending_response.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/generic_success_action_pending_response.xml rename to core/src/test/resources/google/registry/flows/generic_success_action_pending_response.xml diff --git a/core/src/test/java/google/registry/flows/host/testdata/generic_success_response.xml b/core/src/test/resources/google/registry/flows/generic_success_response.xml similarity index 100% rename from core/src/test/java/google/registry/flows/host/testdata/generic_success_response.xml rename to core/src/test/resources/google/registry/flows/generic_success_response.xml diff --git a/core/src/test/java/google/registry/flows/session/testdata/greeting.xml b/core/src/test/resources/google/registry/flows/greeting.xml similarity index 100% rename from core/src/test/java/google/registry/flows/session/testdata/greeting.xml rename to core/src/test/resources/google/registry/flows/greeting.xml diff --git a/core/src/test/java/google/registry/flows/session/testdata/hello.xml b/core/src/test/resources/google/registry/flows/hello.xml similarity index 100% rename from core/src/test/java/google/registry/flows/session/testdata/hello.xml rename to core/src/test/resources/google/registry/flows/hello.xml diff --git a/core/src/test/java/google/registry/flows/session/testdata/generic_success_response.xml b/core/src/test/resources/google/registry/flows/host/generic_success_response.xml similarity index 100% rename from core/src/test/java/google/registry/flows/session/testdata/generic_success_response.xml rename to core/src/test/resources/google/registry/flows/host/generic_success_response.xml diff --git a/core/src/test/java/google/registry/flows/host/testdata/host_check.xml b/core/src/test/resources/google/registry/flows/host/host_check.xml similarity index 100% rename from core/src/test/java/google/registry/flows/host/testdata/host_check.xml rename to core/src/test/resources/google/registry/flows/host/host_check.xml diff --git a/core/src/test/java/google/registry/flows/host/testdata/host_check_50.xml b/core/src/test/resources/google/registry/flows/host/host_check_50.xml similarity index 100% rename from core/src/test/java/google/registry/flows/host/testdata/host_check_50.xml rename to core/src/test/resources/google/registry/flows/host/host_check_50.xml diff --git a/core/src/test/java/google/registry/flows/host/testdata/host_check_51.xml b/core/src/test/resources/google/registry/flows/host/host_check_51.xml similarity index 100% rename from core/src/test/java/google/registry/flows/host/testdata/host_check_51.xml rename to core/src/test/resources/google/registry/flows/host/host_check_51.xml diff --git a/core/src/test/java/google/registry/flows/host/testdata/host_check_response.xml b/core/src/test/resources/google/registry/flows/host/host_check_response.xml similarity index 100% rename from core/src/test/java/google/registry/flows/host/testdata/host_check_response.xml rename to core/src/test/resources/google/registry/flows/host/host_check_response.xml diff --git a/core/src/test/java/google/registry/flows/host/testdata/host_create.xml b/core/src/test/resources/google/registry/flows/host/host_create.xml similarity index 100% rename from core/src/test/java/google/registry/flows/host/testdata/host_create.xml rename to core/src/test/resources/google/registry/flows/host/host_create.xml diff --git a/core/src/test/java/google/registry/flows/host/testdata/host_create_response.xml b/core/src/test/resources/google/registry/flows/host/host_create_response.xml similarity index 100% rename from core/src/test/java/google/registry/flows/host/testdata/host_create_response.xml rename to core/src/test/resources/google/registry/flows/host/host_create_response.xml diff --git a/core/src/test/java/google/registry/flows/host/testdata/host_delete.xml b/core/src/test/resources/google/registry/flows/host/host_delete.xml similarity index 100% rename from core/src/test/java/google/registry/flows/host/testdata/host_delete.xml rename to core/src/test/resources/google/registry/flows/host/host_delete.xml diff --git a/core/src/test/java/google/registry/flows/host/testdata/host_delete_no_cltrid.xml b/core/src/test/resources/google/registry/flows/host/host_delete_no_cltrid.xml similarity index 100% rename from core/src/test/java/google/registry/flows/host/testdata/host_delete_no_cltrid.xml rename to core/src/test/resources/google/registry/flows/host/host_delete_no_cltrid.xml diff --git a/core/src/test/java/google/registry/flows/host/testdata/host_delete_response.xml b/core/src/test/resources/google/registry/flows/host/host_delete_response.xml similarity index 100% rename from core/src/test/java/google/registry/flows/host/testdata/host_delete_response.xml rename to core/src/test/resources/google/registry/flows/host/host_delete_response.xml diff --git a/core/src/test/java/google/registry/flows/host/testdata/host_delete_response_no_cltrid.xml b/core/src/test/resources/google/registry/flows/host/host_delete_response_no_cltrid.xml similarity index 100% rename from core/src/test/java/google/registry/flows/host/testdata/host_delete_response_no_cltrid.xml rename to core/src/test/resources/google/registry/flows/host/host_delete_response_no_cltrid.xml diff --git a/core/src/test/java/google/registry/flows/host/testdata/host_info.xml b/core/src/test/resources/google/registry/flows/host/host_info.xml similarity index 100% rename from core/src/test/java/google/registry/flows/host/testdata/host_info.xml rename to core/src/test/resources/google/registry/flows/host/host_info.xml diff --git a/core/src/test/java/google/registry/flows/host/testdata/host_info_response.xml b/core/src/test/resources/google/registry/flows/host/host_info_response.xml similarity index 100% rename from core/src/test/java/google/registry/flows/host/testdata/host_info_response.xml rename to core/src/test/resources/google/registry/flows/host/host_info_response.xml diff --git a/core/src/test/java/google/registry/flows/host/testdata/host_info_response_linked.xml b/core/src/test/resources/google/registry/flows/host/host_info_response_linked.xml similarity index 100% rename from core/src/test/java/google/registry/flows/host/testdata/host_info_response_linked.xml rename to core/src/test/resources/google/registry/flows/host/host_info_response_linked.xml diff --git a/core/src/test/java/google/registry/flows/host/testdata/host_info_response_superordinate_clientid.xml b/core/src/test/resources/google/registry/flows/host/host_info_response_superordinate_clientid.xml similarity index 100% rename from core/src/test/java/google/registry/flows/host/testdata/host_info_response_superordinate_clientid.xml rename to core/src/test/resources/google/registry/flows/host/host_info_response_superordinate_clientid.xml diff --git a/core/src/test/java/google/registry/flows/host/testdata/host_update.xml b/core/src/test/resources/google/registry/flows/host/host_update.xml similarity index 100% rename from core/src/test/java/google/registry/flows/host/testdata/host_update.xml rename to core/src/test/resources/google/registry/flows/host/host_update.xml diff --git a/core/src/test/java/google/registry/flows/host/testdata/host_update_add_status.xml b/core/src/test/resources/google/registry/flows/host/host_update_add_status.xml similarity index 100% rename from core/src/test/java/google/registry/flows/host/testdata/host_update_add_status.xml rename to core/src/test/resources/google/registry/flows/host/host_update_add_status.xml diff --git a/core/src/test/java/google/registry/flows/host/testdata/host_update_metadata.xml b/core/src/test/resources/google/registry/flows/host/host_update_metadata.xml similarity index 100% rename from core/src/test/java/google/registry/flows/host/testdata/host_update_metadata.xml rename to core/src/test/resources/google/registry/flows/host/host_update_metadata.xml diff --git a/core/src/test/java/google/registry/flows/host/testdata/host_update_name_unchanged.xml b/core/src/test/resources/google/registry/flows/host/host_update_name_unchanged.xml similarity index 100% rename from core/src/test/java/google/registry/flows/host/testdata/host_update_name_unchanged.xml rename to core/src/test/resources/google/registry/flows/host/host_update_name_unchanged.xml diff --git a/core/src/test/java/google/registry/flows/host/testdata/host_update_prohibited_status.xml b/core/src/test/resources/google/registry/flows/host/host_update_prohibited_status.xml similarity index 100% rename from core/src/test/java/google/registry/flows/host/testdata/host_update_prohibited_status.xml rename to core/src/test/resources/google/registry/flows/host/host_update_prohibited_status.xml diff --git a/core/src/test/java/google/registry/flows/host/testdata/host_update_remove_client_update_prohibited.xml b/core/src/test/resources/google/registry/flows/host/host_update_remove_client_update_prohibited.xml similarity index 100% rename from core/src/test/java/google/registry/flows/host/testdata/host_update_remove_client_update_prohibited.xml rename to core/src/test/resources/google/registry/flows/host/host_update_remove_client_update_prohibited.xml diff --git a/core/src/test/java/google/registry/flows/testdata/host_create.xml b/core/src/test/resources/google/registry/flows/host_create.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/host_create.xml rename to core/src/test/resources/google/registry/flows/host_create.xml diff --git a/core/src/test/java/google/registry/flows/testdata/host_create_example.xml b/core/src/test/resources/google/registry/flows/host_create_example.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/host_create_example.xml rename to core/src/test/resources/google/registry/flows/host_create_example.xml diff --git a/core/src/test/java/google/registry/flows/testdata/host_create_fakesite.xml b/core/src/test/resources/google/registry/flows/host_create_fakesite.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/host_create_fakesite.xml rename to core/src/test/resources/google/registry/flows/host_create_fakesite.xml diff --git a/core/src/test/java/google/registry/flows/testdata/host_create_fakesite2.xml b/core/src/test/resources/google/registry/flows/host_create_fakesite2.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/host_create_fakesite2.xml rename to core/src/test/resources/google/registry/flows/host_create_fakesite2.xml diff --git a/core/src/test/java/google/registry/flows/testdata/host_create_response.xml b/core/src/test/resources/google/registry/flows/host_create_response.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/host_create_response.xml rename to core/src/test/resources/google/registry/flows/host_create_response.xml diff --git a/core/src/test/java/google/registry/flows/testdata/host_create_response_example.xml b/core/src/test/resources/google/registry/flows/host_create_response_example.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/host_create_response_example.xml rename to core/src/test/resources/google/registry/flows/host_create_response_example.xml diff --git a/core/src/test/java/google/registry/flows/testdata/host_create_response_fakesite.xml b/core/src/test/resources/google/registry/flows/host_create_response_fakesite.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/host_create_response_fakesite.xml rename to core/src/test/resources/google/registry/flows/host_create_response_fakesite.xml diff --git a/core/src/test/java/google/registry/flows/testdata/host_create_response_fakesite2.xml b/core/src/test/resources/google/registry/flows/host_create_response_fakesite2.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/host_create_response_fakesite2.xml rename to core/src/test/resources/google/registry/flows/host_create_response_fakesite2.xml diff --git a/core/src/test/java/google/registry/flows/testdata/host_create_with_ips.xml b/core/src/test/resources/google/registry/flows/host_create_with_ips.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/host_create_with_ips.xml rename to core/src/test/resources/google/registry/flows/host_create_with_ips.xml diff --git a/core/src/test/java/google/registry/flows/testdata/host_delete.xml b/core/src/test/resources/google/registry/flows/host_delete.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/host_delete.xml rename to core/src/test/resources/google/registry/flows/host_delete.xml diff --git a/core/src/test/java/google/registry/flows/testdata/host_info.xml b/core/src/test/resources/google/registry/flows/host_info.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/host_info.xml rename to core/src/test/resources/google/registry/flows/host_info.xml diff --git a/core/src/test/java/google/registry/flows/testdata/host_info_fakesite.xml b/core/src/test/resources/google/registry/flows/host_info_fakesite.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/host_info_fakesite.xml rename to core/src/test/resources/google/registry/flows/host_info_fakesite.xml diff --git a/core/src/test/java/google/registry/flows/testdata/host_info_fakesite2.xml b/core/src/test/resources/google/registry/flows/host_info_fakesite2.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/host_info_fakesite2.xml rename to core/src/test/resources/google/registry/flows/host_info_fakesite2.xml diff --git a/core/src/test/java/google/registry/flows/testdata/host_info_ns9000_example.xml b/core/src/test/resources/google/registry/flows/host_info_ns9000_example.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/host_info_ns9000_example.xml rename to core/src/test/resources/google/registry/flows/host_info_ns9000_example.xml diff --git a/core/src/test/java/google/registry/flows/testdata/host_info_response.xml b/core/src/test/resources/google/registry/flows/host_info_response.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/host_info_response.xml rename to core/src/test/resources/google/registry/flows/host_info_response.xml diff --git a/core/src/test/java/google/registry/flows/testdata/host_info_response_fakesite2.xml b/core/src/test/resources/google/registry/flows/host_info_response_fakesite2.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/host_info_response_fakesite2.xml rename to core/src/test/resources/google/registry/flows/host_info_response_fakesite2.xml diff --git a/core/src/test/java/google/registry/flows/testdata/host_info_response_fakesite_linked.xml b/core/src/test/resources/google/registry/flows/host_info_response_fakesite_linked.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/host_info_response_fakesite_linked.xml rename to core/src/test/resources/google/registry/flows/host_info_response_fakesite_linked.xml diff --git a/core/src/test/java/google/registry/flows/testdata/host_info_response_fakesite_ok.xml b/core/src/test/resources/google/registry/flows/host_info_response_fakesite_ok.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/host_info_response_fakesite_ok.xml rename to core/src/test/resources/google/registry/flows/host_info_response_fakesite_ok.xml diff --git a/core/src/test/java/google/registry/flows/testdata/host_info_response_fakesite_post_transfer.xml b/core/src/test/resources/google/registry/flows/host_info_response_fakesite_post_transfer.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/host_info_response_fakesite_post_transfer.xml rename to core/src/test/resources/google/registry/flows/host_info_response_fakesite_post_transfer.xml diff --git a/core/src/test/java/google/registry/flows/testdata/host_info_response_fakesite_post_transfer_and_update.xml b/core/src/test/resources/google/registry/flows/host_info_response_fakesite_post_transfer_and_update.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/host_info_response_fakesite_post_transfer_and_update.xml rename to core/src/test/resources/google/registry/flows/host_info_response_fakesite_post_transfer_and_update.xml diff --git a/core/src/test/java/google/registry/flows/testdata/host_info_response_fakesite_post_transfer_and_update_no_addresses.xml b/core/src/test/resources/google/registry/flows/host_info_response_fakesite_post_transfer_and_update_no_addresses.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/host_info_response_fakesite_post_transfer_and_update_no_addresses.xml rename to core/src/test/resources/google/registry/flows/host_info_response_fakesite_post_transfer_and_update_no_addresses.xml diff --git a/core/src/test/java/google/registry/flows/testdata/host_info_response_fakesite_post_update.xml b/core/src/test/resources/google/registry/flows/host_info_response_fakesite_post_update.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/host_info_response_fakesite_post_update.xml rename to core/src/test/resources/google/registry/flows/host_info_response_fakesite_post_update.xml diff --git a/core/src/test/java/google/registry/flows/testdata/host_info_response_ns1.xml b/core/src/test/resources/google/registry/flows/host_info_response_ns1.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/host_info_response_ns1.xml rename to core/src/test/resources/google/registry/flows/host_info_response_ns1.xml diff --git a/core/src/test/java/google/registry/flows/testdata/host_info_response_ns2.xml b/core/src/test/resources/google/registry/flows/host_info_response_ns2.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/host_info_response_ns2.xml rename to core/src/test/resources/google/registry/flows/host_info_response_ns2.xml diff --git a/core/src/test/java/google/registry/flows/testdata/host_info_response_ns9000_example.xml b/core/src/test/resources/google/registry/flows/host_info_response_ns9000_example.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/host_info_response_ns9000_example.xml rename to core/src/test/resources/google/registry/flows/host_info_response_ns9000_example.xml diff --git a/core/src/test/java/google/registry/flows/testdata/host_update_fakesite.xml b/core/src/test/resources/google/registry/flows/host_update_fakesite.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/host_update_fakesite.xml rename to core/src/test/resources/google/registry/flows/host_update_fakesite.xml diff --git a/core/src/test/java/google/registry/flows/testdata/host_update_fakesite1_to_fakesite2.xml b/core/src/test/resources/google/registry/flows/host_update_fakesite1_to_fakesite2.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/host_update_fakesite1_to_fakesite2.xml rename to core/src/test/resources/google/registry/flows/host_update_fakesite1_to_fakesite2.xml diff --git a/core/src/test/java/google/registry/flows/testdata/host_update_ns1_to_fakesite.xml b/core/src/test/resources/google/registry/flows/host_update_ns1_to_fakesite.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/host_update_ns1_to_fakesite.xml rename to core/src/test/resources/google/registry/flows/host_update_ns1_to_fakesite.xml diff --git a/core/src/test/java/google/registry/flows/testdata/host_update_ns1_to_ns2.xml b/core/src/test/resources/google/registry/flows/host_update_ns1_to_ns2.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/host_update_ns1_to_ns2.xml rename to core/src/test/resources/google/registry/flows/host_update_ns1_to_ns2.xml diff --git a/core/src/test/java/google/registry/flows/testdata/host_update_rename_and_remove_addresses.xml b/core/src/test/resources/google/registry/flows/host_update_rename_and_remove_addresses.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/host_update_rename_and_remove_addresses.xml rename to core/src/test/resources/google/registry/flows/host_update_rename_and_remove_addresses.xml diff --git a/core/src/test/java/google/registry/flows/testdata/host_update_rename_only.xml b/core/src/test/resources/google/registry/flows/host_update_rename_only.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/host_update_rename_only.xml rename to core/src/test/resources/google/registry/flows/host_update_rename_only.xml diff --git a/core/src/test/java/google/registry/flows/testdata/login.xml b/core/src/test/resources/google/registry/flows/login.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/login.xml rename to core/src/test/resources/google/registry/flows/login.xml diff --git a/core/src/test/java/google/registry/flows/testdata/login_update_password.xml b/core/src/test/resources/google/registry/flows/login_update_password.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/login_update_password.xml rename to core/src/test/resources/google/registry/flows/login_update_password.xml diff --git a/core/src/test/java/google/registry/flows/testdata/login_valid_fee_extension.xml b/core/src/test/resources/google/registry/flows/login_valid_fee_extension.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/login_valid_fee_extension.xml rename to core/src/test/resources/google/registry/flows/login_valid_fee_extension.xml diff --git a/core/src/test/java/google/registry/flows/testdata/login_wrong_case.xml b/core/src/test/resources/google/registry/flows/login_wrong_case.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/login_wrong_case.xml rename to core/src/test/resources/google/registry/flows/login_wrong_case.xml diff --git a/core/src/test/java/google/registry/flows/session/testdata/logout.xml b/core/src/test/resources/google/registry/flows/logout.xml similarity index 100% rename from core/src/test/java/google/registry/flows/session/testdata/logout.xml rename to core/src/test/resources/google/registry/flows/logout.xml diff --git a/core/src/test/java/google/registry/flows/session/testdata/logout_response.xml b/core/src/test/resources/google/registry/flows/logout_response.xml similarity index 100% rename from core/src/test/java/google/registry/flows/session/testdata/logout_response.xml rename to core/src/test/resources/google/registry/flows/logout_response.xml diff --git a/core/src/test/java/google/registry/flows/poll/testdata/poll.xml b/core/src/test/resources/google/registry/flows/poll.xml similarity index 100% rename from core/src/test/java/google/registry/flows/poll/testdata/poll.xml rename to core/src/test/resources/google/registry/flows/poll.xml diff --git a/core/src/test/java/google/registry/flows/testdata/poll.xml b/core/src/test/resources/google/registry/flows/poll/poll.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/poll.xml rename to core/src/test/resources/google/registry/flows/poll/poll.xml diff --git a/core/src/test/java/google/registry/flows/poll/testdata/poll_ack.xml b/core/src/test/resources/google/registry/flows/poll/poll_ack.xml similarity index 100% rename from core/src/test/java/google/registry/flows/poll/testdata/poll_ack.xml rename to core/src/test/resources/google/registry/flows/poll/poll_ack.xml diff --git a/core/src/test/java/google/registry/flows/poll/testdata/poll_ack_missing_id.xml b/core/src/test/resources/google/registry/flows/poll/poll_ack_missing_id.xml similarity index 100% rename from core/src/test/java/google/registry/flows/poll/testdata/poll_ack_missing_id.xml rename to core/src/test/resources/google/registry/flows/poll/poll_ack_missing_id.xml diff --git a/core/src/test/java/google/registry/flows/poll/testdata/poll_ack_response.xml b/core/src/test/resources/google/registry/flows/poll/poll_ack_response.xml similarity index 100% rename from core/src/test/java/google/registry/flows/poll/testdata/poll_ack_response.xml rename to core/src/test/resources/google/registry/flows/poll/poll_ack_response.xml diff --git a/core/src/test/java/google/registry/flows/poll/testdata/poll_ack_response_empty.xml b/core/src/test/resources/google/registry/flows/poll/poll_ack_response_empty.xml similarity index 100% rename from core/src/test/java/google/registry/flows/poll/testdata/poll_ack_response_empty.xml rename to core/src/test/resources/google/registry/flows/poll/poll_ack_response_empty.xml diff --git a/core/src/test/java/google/registry/flows/poll/testdata/poll_no_cltrid.xml b/core/src/test/resources/google/registry/flows/poll/poll_no_cltrid.xml similarity index 100% rename from core/src/test/java/google/registry/flows/poll/testdata/poll_no_cltrid.xml rename to core/src/test/resources/google/registry/flows/poll/poll_no_cltrid.xml diff --git a/core/src/test/java/google/registry/flows/poll/testdata/poll_response_autorenew.xml b/core/src/test/resources/google/registry/flows/poll/poll_response_autorenew.xml similarity index 100% rename from core/src/test/java/google/registry/flows/poll/testdata/poll_response_autorenew.xml rename to core/src/test/resources/google/registry/flows/poll/poll_response_autorenew.xml diff --git a/core/src/test/java/google/registry/flows/poll/testdata/poll_response_contact_delete.xml b/core/src/test/resources/google/registry/flows/poll/poll_response_contact_delete.xml similarity index 100% rename from core/src/test/java/google/registry/flows/poll/testdata/poll_response_contact_delete.xml rename to core/src/test/resources/google/registry/flows/poll/poll_response_contact_delete.xml diff --git a/core/src/test/java/google/registry/flows/poll/testdata/poll_response_contact_transfer.xml b/core/src/test/resources/google/registry/flows/poll/poll_response_contact_transfer.xml similarity index 100% rename from core/src/test/java/google/registry/flows/poll/testdata/poll_response_contact_transfer.xml rename to core/src/test/resources/google/registry/flows/poll/poll_response_contact_transfer.xml diff --git a/core/src/test/java/google/registry/flows/poll/testdata/poll_response_domain_pending_notification.xml b/core/src/test/resources/google/registry/flows/poll/poll_response_domain_pending_notification.xml similarity index 100% rename from core/src/test/java/google/registry/flows/poll/testdata/poll_response_domain_pending_notification.xml rename to core/src/test/resources/google/registry/flows/poll/poll_response_domain_pending_notification.xml diff --git a/core/src/test/java/google/registry/flows/poll/testdata/poll_response_domain_transfer.xml b/core/src/test/resources/google/registry/flows/poll/poll_response_domain_transfer.xml similarity index 100% rename from core/src/test/java/google/registry/flows/poll/testdata/poll_response_domain_transfer.xml rename to core/src/test/resources/google/registry/flows/poll/poll_response_domain_transfer.xml diff --git a/core/src/test/java/google/registry/flows/poll/testdata/poll_response_domain_transfer_no_cltrid.xml b/core/src/test/resources/google/registry/flows/poll/poll_response_domain_transfer_no_cltrid.xml similarity index 100% rename from core/src/test/java/google/registry/flows/poll/testdata/poll_response_domain_transfer_no_cltrid.xml rename to core/src/test/resources/google/registry/flows/poll/poll_response_domain_transfer_no_cltrid.xml diff --git a/core/src/test/java/google/registry/flows/poll/testdata/poll_response_empty.xml b/core/src/test/resources/google/registry/flows/poll/poll_response_empty.xml similarity index 100% rename from core/src/test/java/google/registry/flows/poll/testdata/poll_response_empty.xml rename to core/src/test/resources/google/registry/flows/poll/poll_response_empty.xml diff --git a/core/src/test/java/google/registry/flows/poll/testdata/poll_response_host_delete.xml b/core/src/test/resources/google/registry/flows/poll/poll_response_host_delete.xml similarity index 100% rename from core/src/test/java/google/registry/flows/poll/testdata/poll_response_host_delete.xml rename to core/src/test/resources/google/registry/flows/poll/poll_response_host_delete.xml diff --git a/core/src/test/java/google/registry/flows/poll/testdata/poll_with_id.xml b/core/src/test/resources/google/registry/flows/poll/poll_with_id.xml similarity index 100% rename from core/src/test/java/google/registry/flows/poll/testdata/poll_with_id.xml rename to core/src/test/resources/google/registry/flows/poll/poll_with_id.xml diff --git a/core/src/test/java/google/registry/flows/testdata/poll_ack.xml b/core/src/test/resources/google/registry/flows/poll_ack.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/poll_ack.xml rename to core/src/test/resources/google/registry/flows/poll_ack.xml diff --git a/core/src/test/java/google/registry/flows/testdata/poll_ack_response_empty.xml b/core/src/test/resources/google/registry/flows/poll_ack_response_empty.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/poll_ack_response_empty.xml rename to core/src/test/resources/google/registry/flows/poll_ack_response_empty.xml diff --git a/core/src/test/java/google/registry/flows/testdata/poll_response_autorenew.xml b/core/src/test/resources/google/registry/flows/poll_response_autorenew.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/poll_response_autorenew.xml rename to core/src/test/resources/google/registry/flows/poll_response_autorenew.xml diff --git a/core/src/test/java/google/registry/flows/testdata/poll_response_contact_transfer.xml b/core/src/test/resources/google/registry/flows/poll_response_contact_transfer.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/poll_response_contact_transfer.xml rename to core/src/test/resources/google/registry/flows/poll_response_contact_transfer.xml diff --git a/core/src/test/java/google/registry/flows/testdata/poll_response_domain_transfer_request.xml b/core/src/test/resources/google/registry/flows/poll_response_domain_transfer_request.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/poll_response_domain_transfer_request.xml rename to core/src/test/resources/google/registry/flows/poll_response_domain_transfer_request.xml diff --git a/core/src/test/java/google/registry/flows/testdata/poll_response_domain_transfer_server_approve_loser.xml b/core/src/test/resources/google/registry/flows/poll_response_domain_transfer_server_approve_loser.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/poll_response_domain_transfer_server_approve_loser.xml rename to core/src/test/resources/google/registry/flows/poll_response_domain_transfer_server_approve_loser.xml diff --git a/core/src/test/java/google/registry/flows/testdata/poll_response_domain_transfer_server_approve_winner.xml b/core/src/test/resources/google/registry/flows/poll_response_domain_transfer_server_approve_winner.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/poll_response_domain_transfer_server_approve_winner.xml rename to core/src/test/resources/google/registry/flows/poll_response_domain_transfer_server_approve_winner.xml diff --git a/core/src/test/java/google/registry/flows/testdata/poll_response_empty.xml b/core/src/test/resources/google/registry/flows/poll_response_empty.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/poll_response_empty.xml rename to core/src/test/resources/google/registry/flows/poll_response_empty.xml diff --git a/core/src/test/java/google/registry/flows/testdata/poll_response_unrenew.xml b/core/src/test/resources/google/registry/flows/poll_response_unrenew.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/poll_response_unrenew.xml rename to core/src/test/resources/google/registry/flows/poll_response_unrenew.xml diff --git a/core/src/test/java/google/registry/flows/testdata/response_error.xml b/core/src/test/resources/google/registry/flows/response_error.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/response_error.xml rename to core/src/test/resources/google/registry/flows/response_error.xml diff --git a/core/src/test/java/google/registry/flows/testdata/response_error_no_cltrid.xml b/core/src/test/resources/google/registry/flows/response_error_no_cltrid.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/response_error_no_cltrid.xml rename to core/src/test/resources/google/registry/flows/response_error_no_cltrid.xml diff --git a/core/src/test/java/google/registry/flows/testdata/generic_success_response.xml b/core/src/test/resources/google/registry/flows/session/generic_success_response.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/generic_success_response.xml rename to core/src/test/resources/google/registry/flows/session/generic_success_response.xml diff --git a/core/src/test/java/google/registry/flows/session/testdata/generic_syntax_exception.xml b/core/src/test/resources/google/registry/flows/session/generic_syntax_exception.xml similarity index 100% rename from core/src/test/java/google/registry/flows/session/testdata/generic_syntax_exception.xml rename to core/src/test/resources/google/registry/flows/session/generic_syntax_exception.xml diff --git a/core/src/test/java/google/registry/flows/testdata/greeting.xml b/core/src/test/resources/google/registry/flows/session/greeting.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/greeting.xml rename to core/src/test/resources/google/registry/flows/session/greeting.xml diff --git a/core/src/test/java/google/registry/flows/testdata/hello.xml b/core/src/test/resources/google/registry/flows/session/hello.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/hello.xml rename to core/src/test/resources/google/registry/flows/session/hello.xml diff --git a/core/src/test/java/google/registry/flows/session/testdata/login_invalid_extension.xml b/core/src/test/resources/google/registry/flows/session/login_invalid_extension.xml similarity index 100% rename from core/src/test/java/google/registry/flows/session/testdata/login_invalid_extension.xml rename to core/src/test/resources/google/registry/flows/session/login_invalid_extension.xml diff --git a/core/src/test/java/google/registry/flows/session/testdata/login_invalid_language.xml b/core/src/test/resources/google/registry/flows/session/login_invalid_language.xml similarity index 100% rename from core/src/test/java/google/registry/flows/session/testdata/login_invalid_language.xml rename to core/src/test/resources/google/registry/flows/session/login_invalid_language.xml diff --git a/core/src/test/java/google/registry/flows/session/testdata/login_invalid_newpw.xml b/core/src/test/resources/google/registry/flows/session/login_invalid_newpw.xml similarity index 100% rename from core/src/test/java/google/registry/flows/session/testdata/login_invalid_newpw.xml rename to core/src/test/resources/google/registry/flows/session/login_invalid_newpw.xml diff --git a/core/src/test/java/google/registry/flows/session/testdata/login_invalid_types.xml b/core/src/test/resources/google/registry/flows/session/login_invalid_types.xml similarity index 100% rename from core/src/test/java/google/registry/flows/session/testdata/login_invalid_types.xml rename to core/src/test/resources/google/registry/flows/session/login_invalid_types.xml diff --git a/core/src/test/java/google/registry/flows/session/testdata/login_invalid_version.xml b/core/src/test/resources/google/registry/flows/session/login_invalid_version.xml similarity index 100% rename from core/src/test/java/google/registry/flows/session/testdata/login_invalid_version.xml rename to core/src/test/resources/google/registry/flows/session/login_invalid_version.xml diff --git a/core/src/test/java/google/registry/flows/session/testdata/login_valid.xml b/core/src/test/resources/google/registry/flows/session/login_valid.xml similarity index 100% rename from core/src/test/java/google/registry/flows/session/testdata/login_valid.xml rename to core/src/test/resources/google/registry/flows/session/login_valid.xml diff --git a/core/src/test/java/google/registry/flows/session/testdata/login_valid_missing_types.xml b/core/src/test/resources/google/registry/flows/session/login_valid_missing_types.xml similarity index 100% rename from core/src/test/java/google/registry/flows/session/testdata/login_valid_missing_types.xml rename to core/src/test/resources/google/registry/flows/session/login_valid_missing_types.xml diff --git a/core/src/test/java/google/registry/flows/testdata/logout.xml b/core/src/test/resources/google/registry/flows/session/logout.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/logout.xml rename to core/src/test/resources/google/registry/flows/session/logout.xml diff --git a/core/src/test/java/google/registry/flows/testdata/logout_response.xml b/core/src/test/resources/google/registry/flows/session/logout_response.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/logout_response.xml rename to core/src/test/resources/google/registry/flows/session/logout_response.xml diff --git a/core/src/test/java/google/registry/flows/testdata/syntax_error.xml b/core/src/test/resources/google/registry/flows/syntax_error.xml similarity index 100% rename from core/src/test/java/google/registry/flows/testdata/syntax_error.xml rename to core/src/test/resources/google/registry/flows/syntax_error.xml diff --git a/core/src/test/java/google/registry/model/contact/testdata/contact_check.xml b/core/src/test/resources/google/registry/model/contact/contact_check.xml similarity index 100% rename from core/src/test/java/google/registry/model/contact/testdata/contact_check.xml rename to core/src/test/resources/google/registry/model/contact/contact_check.xml diff --git a/core/src/test/java/google/registry/model/contact/testdata/contact_create.xml b/core/src/test/resources/google/registry/model/contact/contact_create.xml similarity index 100% rename from core/src/test/java/google/registry/model/contact/testdata/contact_create.xml rename to core/src/test/resources/google/registry/model/contact/contact_create.xml diff --git a/core/src/test/java/google/registry/model/contact/testdata/contact_delete.xml b/core/src/test/resources/google/registry/model/contact/contact_delete.xml similarity index 100% rename from core/src/test/java/google/registry/model/contact/testdata/contact_delete.xml rename to core/src/test/resources/google/registry/model/contact/contact_delete.xml diff --git a/core/src/test/java/google/registry/model/contact/testdata/contact_info.xml b/core/src/test/resources/google/registry/model/contact/contact_info.xml similarity index 100% rename from core/src/test/java/google/registry/model/contact/testdata/contact_info.xml rename to core/src/test/resources/google/registry/model/contact/contact_info.xml diff --git a/core/src/test/java/google/registry/model/contact/testdata/contact_transfer_approve.xml b/core/src/test/resources/google/registry/model/contact/contact_transfer_approve.xml similarity index 100% rename from core/src/test/java/google/registry/model/contact/testdata/contact_transfer_approve.xml rename to core/src/test/resources/google/registry/model/contact/contact_transfer_approve.xml diff --git a/core/src/test/java/google/registry/model/contact/testdata/contact_transfer_cancel.xml b/core/src/test/resources/google/registry/model/contact/contact_transfer_cancel.xml similarity index 100% rename from core/src/test/java/google/registry/model/contact/testdata/contact_transfer_cancel.xml rename to core/src/test/resources/google/registry/model/contact/contact_transfer_cancel.xml diff --git a/core/src/test/java/google/registry/model/contact/testdata/contact_transfer_query.xml b/core/src/test/resources/google/registry/model/contact/contact_transfer_query.xml similarity index 100% rename from core/src/test/java/google/registry/model/contact/testdata/contact_transfer_query.xml rename to core/src/test/resources/google/registry/model/contact/contact_transfer_query.xml diff --git a/core/src/test/java/google/registry/model/contact/testdata/contact_transfer_reject.xml b/core/src/test/resources/google/registry/model/contact/contact_transfer_reject.xml similarity index 100% rename from core/src/test/java/google/registry/model/contact/testdata/contact_transfer_reject.xml rename to core/src/test/resources/google/registry/model/contact/contact_transfer_reject.xml diff --git a/core/src/test/java/google/registry/model/contact/testdata/contact_transfer_request.xml b/core/src/test/resources/google/registry/model/contact/contact_transfer_request.xml similarity index 100% rename from core/src/test/java/google/registry/model/contact/testdata/contact_transfer_request.xml rename to core/src/test/resources/google/registry/model/contact/contact_transfer_request.xml diff --git a/core/src/test/java/google/registry/model/contact/testdata/contact_update.xml b/core/src/test/resources/google/registry/model/contact/contact_update.xml similarity index 100% rename from core/src/test/java/google/registry/model/contact/testdata/contact_update.xml rename to core/src/test/resources/google/registry/model/contact/contact_update.xml diff --git a/core/src/test/java/google/registry/model/domain/testdata/domain_check.xml b/core/src/test/resources/google/registry/model/domain/domain_check.xml similarity index 100% rename from core/src/test/java/google/registry/model/domain/testdata/domain_check.xml rename to core/src/test/resources/google/registry/model/domain/domain_check.xml diff --git a/core/src/test/java/google/registry/model/domain/testdata/domain_check_avail.xml b/core/src/test/resources/google/registry/model/domain/domain_check_avail.xml similarity index 100% rename from core/src/test/java/google/registry/model/domain/testdata/domain_check_avail.xml rename to core/src/test/resources/google/registry/model/domain/domain_check_avail.xml diff --git a/core/src/test/java/google/registry/model/domain/testdata/domain_check_claims.xml b/core/src/test/resources/google/registry/model/domain/domain_check_claims.xml similarity index 100% rename from core/src/test/java/google/registry/model/domain/testdata/domain_check_claims.xml rename to core/src/test/resources/google/registry/model/domain/domain_check_claims.xml diff --git a/core/src/test/java/google/registry/model/domain/testdata/domain_check_fee.xml b/core/src/test/resources/google/registry/model/domain/domain_check_fee.xml similarity index 100% rename from core/src/test/java/google/registry/model/domain/testdata/domain_check_fee.xml rename to core/src/test/resources/google/registry/model/domain/domain_check_fee.xml diff --git a/core/src/test/java/google/registry/model/domain/testdata/domain_create.xml b/core/src/test/resources/google/registry/model/domain/domain_create.xml similarity index 100% rename from core/src/test/java/google/registry/model/domain/testdata/domain_create.xml rename to core/src/test/resources/google/registry/model/domain/domain_create.xml diff --git a/core/src/test/java/google/registry/model/domain/testdata/domain_create_empty.xml b/core/src/test/resources/google/registry/model/domain/domain_create_empty.xml similarity index 100% rename from core/src/test/java/google/registry/model/domain/testdata/domain_create_empty.xml rename to core/src/test/resources/google/registry/model/domain/domain_create_empty.xml diff --git a/core/src/test/java/google/registry/model/domain/testdata/domain_create_fee.xml b/core/src/test/resources/google/registry/model/domain/domain_create_fee.xml similarity index 100% rename from core/src/test/java/google/registry/model/domain/testdata/domain_create_fee.xml rename to core/src/test/resources/google/registry/model/domain/domain_create_fee.xml diff --git a/core/src/test/java/google/registry/model/domain/testdata/domain_create_missing_non_registrant_contacts.xml b/core/src/test/resources/google/registry/model/domain/domain_create_missing_non_registrant_contacts.xml similarity index 100% rename from core/src/test/java/google/registry/model/domain/testdata/domain_create_missing_non_registrant_contacts.xml rename to core/src/test/resources/google/registry/model/domain/domain_create_missing_non_registrant_contacts.xml diff --git a/core/src/test/java/google/registry/model/domain/testdata/domain_create_sunrise_code.xml b/core/src/test/resources/google/registry/model/domain/domain_create_sunrise_code.xml similarity index 100% rename from core/src/test/java/google/registry/model/domain/testdata/domain_create_sunrise_code.xml rename to core/src/test/resources/google/registry/model/domain/domain_create_sunrise_code.xml diff --git a/core/src/test/java/google/registry/model/domain/testdata/domain_create_sunrise_code_with_mark.xml b/core/src/test/resources/google/registry/model/domain/domain_create_sunrise_code_with_mark.xml similarity index 100% rename from core/src/test/java/google/registry/model/domain/testdata/domain_create_sunrise_code_with_mark.xml rename to core/src/test/resources/google/registry/model/domain/domain_create_sunrise_code_with_mark.xml diff --git a/core/src/test/java/google/registry/model/domain/testdata/domain_create_sunrise_encoded_signed_mark.xml b/core/src/test/resources/google/registry/model/domain/domain_create_sunrise_encoded_signed_mark.xml similarity index 100% rename from core/src/test/java/google/registry/model/domain/testdata/domain_create_sunrise_encoded_signed_mark.xml rename to core/src/test/resources/google/registry/model/domain/domain_create_sunrise_encoded_signed_mark.xml diff --git a/core/src/test/java/google/registry/model/domain/testdata/domain_create_sunrise_mark.xml b/core/src/test/resources/google/registry/model/domain/domain_create_sunrise_mark.xml similarity index 100% rename from core/src/test/java/google/registry/model/domain/testdata/domain_create_sunrise_mark.xml rename to core/src/test/resources/google/registry/model/domain/domain_create_sunrise_mark.xml diff --git a/core/src/test/java/google/registry/model/domain/testdata/domain_create_sunrise_signed_mark.xml b/core/src/test/resources/google/registry/model/domain/domain_create_sunrise_signed_mark.xml similarity index 100% rename from core/src/test/java/google/registry/model/domain/testdata/domain_create_sunrise_signed_mark.xml rename to core/src/test/resources/google/registry/model/domain/domain_create_sunrise_signed_mark.xml diff --git a/core/src/test/java/google/registry/model/domain/testdata/domain_delete.xml b/core/src/test/resources/google/registry/model/domain/domain_delete.xml similarity index 100% rename from core/src/test/java/google/registry/model/domain/testdata/domain_delete.xml rename to core/src/test/resources/google/registry/model/domain/domain_delete.xml diff --git a/core/src/test/java/google/registry/model/domain/testdata/domain_info.xml b/core/src/test/resources/google/registry/model/domain/domain_info.xml similarity index 100% rename from core/src/test/java/google/registry/model/domain/testdata/domain_info.xml rename to core/src/test/resources/google/registry/model/domain/domain_info.xml diff --git a/core/src/test/java/google/registry/model/domain/testdata/domain_info_fee.xml b/core/src/test/resources/google/registry/model/domain/domain_info_fee.xml similarity index 100% rename from core/src/test/java/google/registry/model/domain/testdata/domain_info_fee.xml rename to core/src/test/resources/google/registry/model/domain/domain_info_fee.xml diff --git a/core/src/test/java/google/registry/model/domain/testdata/domain_info_sunrise.xml b/core/src/test/resources/google/registry/model/domain/domain_info_sunrise.xml similarity index 100% rename from core/src/test/java/google/registry/model/domain/testdata/domain_info_sunrise.xml rename to core/src/test/resources/google/registry/model/domain/domain_info_sunrise.xml diff --git a/core/src/test/java/google/registry/model/domain/testdata/domain_renew.xml b/core/src/test/resources/google/registry/model/domain/domain_renew.xml similarity index 100% rename from core/src/test/java/google/registry/model/domain/testdata/domain_renew.xml rename to core/src/test/resources/google/registry/model/domain/domain_renew.xml diff --git a/core/src/test/java/google/registry/model/domain/testdata/domain_renew_fee.xml b/core/src/test/resources/google/registry/model/domain/domain_renew_fee.xml similarity index 100% rename from core/src/test/java/google/registry/model/domain/testdata/domain_renew_fee.xml rename to core/src/test/resources/google/registry/model/domain/domain_renew_fee.xml diff --git a/core/src/test/java/google/registry/model/domain/testdata/domain_transfer_approve.xml b/core/src/test/resources/google/registry/model/domain/domain_transfer_approve.xml similarity index 100% rename from core/src/test/java/google/registry/model/domain/testdata/domain_transfer_approve.xml rename to core/src/test/resources/google/registry/model/domain/domain_transfer_approve.xml diff --git a/core/src/test/java/google/registry/model/domain/testdata/domain_transfer_cancel.xml b/core/src/test/resources/google/registry/model/domain/domain_transfer_cancel.xml similarity index 100% rename from core/src/test/java/google/registry/model/domain/testdata/domain_transfer_cancel.xml rename to core/src/test/resources/google/registry/model/domain/domain_transfer_cancel.xml diff --git a/core/src/test/java/google/registry/model/domain/testdata/domain_transfer_query.xml b/core/src/test/resources/google/registry/model/domain/domain_transfer_query.xml similarity index 100% rename from core/src/test/java/google/registry/model/domain/testdata/domain_transfer_query.xml rename to core/src/test/resources/google/registry/model/domain/domain_transfer_query.xml diff --git a/core/src/test/java/google/registry/model/domain/testdata/domain_transfer_reject.xml b/core/src/test/resources/google/registry/model/domain/domain_transfer_reject.xml similarity index 100% rename from core/src/test/java/google/registry/model/domain/testdata/domain_transfer_reject.xml rename to core/src/test/resources/google/registry/model/domain/domain_transfer_reject.xml diff --git a/core/src/test/java/google/registry/model/domain/testdata/domain_transfer_request.xml b/core/src/test/resources/google/registry/model/domain/domain_transfer_request.xml similarity index 100% rename from core/src/test/java/google/registry/model/domain/testdata/domain_transfer_request.xml rename to core/src/test/resources/google/registry/model/domain/domain_transfer_request.xml diff --git a/core/src/test/java/google/registry/model/domain/testdata/domain_transfer_request_fee.xml b/core/src/test/resources/google/registry/model/domain/domain_transfer_request_fee.xml similarity index 100% rename from core/src/test/java/google/registry/model/domain/testdata/domain_transfer_request_fee.xml rename to core/src/test/resources/google/registry/model/domain/domain_transfer_request_fee.xml diff --git a/core/src/test/java/google/registry/model/domain/testdata/domain_update.xml b/core/src/test/resources/google/registry/model/domain/domain_update.xml similarity index 100% rename from core/src/test/java/google/registry/model/domain/testdata/domain_update.xml rename to core/src/test/resources/google/registry/model/domain/domain_update.xml diff --git a/core/src/test/java/google/registry/model/domain/testdata/domain_update_empty.xml b/core/src/test/resources/google/registry/model/domain/domain_update_empty.xml similarity index 100% rename from core/src/test/java/google/registry/model/domain/testdata/domain_update_empty.xml rename to core/src/test/resources/google/registry/model/domain/domain_update_empty.xml diff --git a/core/src/test/java/google/registry/model/domain/testdata/domain_update_fee.xml b/core/src/test/resources/google/registry/model/domain/domain_update_fee.xml similarity index 100% rename from core/src/test/java/google/registry/model/domain/testdata/domain_update_fee.xml rename to core/src/test/resources/google/registry/model/domain/domain_update_fee.xml diff --git a/core/src/test/java/google/registry/model/testdata/domain_create_anchor_tenant_fee_standard.xml b/core/src/test/resources/google/registry/model/domain_create_anchor_tenant_fee_standard.xml similarity index 100% rename from core/src/test/java/google/registry/model/testdata/domain_create_anchor_tenant_fee_standard.xml rename to core/src/test/resources/google/registry/model/domain_create_anchor_tenant_fee_standard.xml diff --git a/core/src/test/java/google/registry/model/testdata/domain_create_claim_notice.xml b/core/src/test/resources/google/registry/model/domain_create_claim_notice.xml similarity index 100% rename from core/src/test/java/google/registry/model/testdata/domain_create_claim_notice.xml rename to core/src/test/resources/google/registry/model/domain_create_claim_notice.xml diff --git a/core/src/test/java/google/registry/model/testdata/domain_create_dsdata.xml b/core/src/test/resources/google/registry/model/domain_create_dsdata.xml similarity index 100% rename from core/src/test/java/google/registry/model/testdata/domain_create_dsdata.xml rename to core/src/test/resources/google/registry/model/domain_create_dsdata.xml diff --git a/core/src/test/java/google/registry/model/testdata/domain_create_idn.xml b/core/src/test/resources/google/registry/model/domain_create_idn.xml similarity index 100% rename from core/src/test/java/google/registry/model/testdata/domain_create_idn.xml rename to core/src/test/resources/google/registry/model/domain_create_idn.xml diff --git a/core/src/test/java/google/registry/model/testdata/domain_create_sunrise.xml b/core/src/test/resources/google/registry/model/domain_create_sunrise.xml similarity index 100% rename from core/src/test/java/google/registry/model/testdata/domain_create_sunrise.xml rename to core/src/test/resources/google/registry/model/domain_create_sunrise.xml diff --git a/core/src/test/java/google/registry/model/testdata/domain_delete.xml b/core/src/test/resources/google/registry/model/domain_delete.xml similarity index 100% rename from core/src/test/java/google/registry/model/testdata/domain_delete.xml rename to core/src/test/resources/google/registry/model/domain_delete.xml diff --git a/core/src/test/java/google/registry/model/testdata/domain_restore.xml b/core/src/test/resources/google/registry/model/domain_restore.xml similarity index 100% rename from core/src/test/java/google/registry/model/testdata/domain_restore.xml rename to core/src/test/resources/google/registry/model/domain_restore.xml diff --git a/core/src/test/java/google/registry/model/testdata/domain_transfer_approve.xml b/core/src/test/resources/google/registry/model/domain_transfer_approve.xml similarity index 100% rename from core/src/test/java/google/registry/model/testdata/domain_transfer_approve.xml rename to core/src/test/resources/google/registry/model/domain_transfer_approve.xml diff --git a/core/src/test/java/google/registry/model/testdata/domain_transfer_cancel.xml b/core/src/test/resources/google/registry/model/domain_transfer_cancel.xml similarity index 100% rename from core/src/test/java/google/registry/model/testdata/domain_transfer_cancel.xml rename to core/src/test/resources/google/registry/model/domain_transfer_cancel.xml diff --git a/core/src/test/java/google/registry/model/testdata/domain_transfer_reject.xml b/core/src/test/resources/google/registry/model/domain_transfer_reject.xml similarity index 100% rename from core/src/test/java/google/registry/model/testdata/domain_transfer_reject.xml rename to core/src/test/resources/google/registry/model/domain_transfer_reject.xml diff --git a/core/src/test/java/google/registry/model/testdata/domain_transfer_request.xml b/core/src/test/resources/google/registry/model/domain_transfer_request.xml similarity index 100% rename from core/src/test/java/google/registry/model/testdata/domain_transfer_request.xml rename to core/src/test/resources/google/registry/model/domain_transfer_request.xml diff --git a/core/src/test/java/google/registry/model/testdata/domain_update_with_secdns.xml b/core/src/test/resources/google/registry/model/domain_update_with_secdns.xml similarity index 100% rename from core/src/test/java/google/registry/model/testdata/domain_update_with_secdns.xml rename to core/src/test/resources/google/registry/model/domain_update_with_secdns.xml diff --git a/core/src/test/java/google/registry/model/eppcommon/testdata/contact_info.xml b/core/src/test/resources/google/registry/model/eppcommon/contact_info.xml similarity index 100% rename from core/src/test/java/google/registry/model/eppcommon/testdata/contact_info.xml rename to core/src/test/resources/google/registry/model/eppcommon/contact_info.xml diff --git a/core/src/test/java/google/registry/model/eppinput/testdata/login_valid.xml b/core/src/test/resources/google/registry/model/eppinput/login_valid.xml similarity index 100% rename from core/src/test/java/google/registry/model/eppinput/testdata/login_valid.xml rename to core/src/test/resources/google/registry/model/eppinput/login_valid.xml diff --git a/core/src/test/java/google/registry/model/eppinput/testdata/login_wrong_case.xml b/core/src/test/resources/google/registry/model/eppinput/login_wrong_case.xml similarity index 100% rename from core/src/test/java/google/registry/model/eppinput/testdata/login_wrong_case.xml rename to core/src/test/resources/google/registry/model/eppinput/login_wrong_case.xml diff --git a/core/src/test/java/google/registry/model/host/testdata/host_check.xml b/core/src/test/resources/google/registry/model/host/host_check.xml similarity index 100% rename from core/src/test/java/google/registry/model/host/testdata/host_check.xml rename to core/src/test/resources/google/registry/model/host/host_check.xml diff --git a/core/src/test/java/google/registry/model/host/testdata/host_create.xml b/core/src/test/resources/google/registry/model/host/host_create.xml similarity index 100% rename from core/src/test/java/google/registry/model/host/testdata/host_create.xml rename to core/src/test/resources/google/registry/model/host/host_create.xml diff --git a/core/src/test/java/google/registry/model/host/testdata/host_delete.xml b/core/src/test/resources/google/registry/model/host/host_delete.xml similarity index 100% rename from core/src/test/java/google/registry/model/host/testdata/host_delete.xml rename to core/src/test/resources/google/registry/model/host/host_delete.xml diff --git a/core/src/test/java/google/registry/model/host/testdata/host_info.xml b/core/src/test/resources/google/registry/model/host/host_info.xml similarity index 100% rename from core/src/test/java/google/registry/model/host/testdata/host_info.xml rename to core/src/test/resources/google/registry/model/host/host_info.xml diff --git a/core/src/test/java/google/registry/model/host/testdata/host_update.xml b/core/src/test/resources/google/registry/model/host/host_update.xml similarity index 100% rename from core/src/test/java/google/registry/model/host/testdata/host_update.xml rename to core/src/test/resources/google/registry/model/host/host_update.xml diff --git a/core/src/test/java/google/registry/model/testdata/host_create_complete.xml b/core/src/test/resources/google/registry/model/host_create_complete.xml similarity index 100% rename from core/src/test/java/google/registry/model/testdata/host_create_complete.xml rename to core/src/test/resources/google/registry/model/host_create_complete.xml diff --git a/core/src/test/java/google/registry/model/testdata/host_delete.xml b/core/src/test/resources/google/registry/model/host_delete.xml similarity index 100% rename from core/src/test/java/google/registry/model/testdata/host_delete.xml rename to core/src/test/resources/google/registry/model/host_delete.xml diff --git a/core/src/test/java/google/registry/model/testdata/host_update.xml b/core/src/test/resources/google/registry/model/host_update.xml similarity index 100% rename from core/src/test/java/google/registry/model/testdata/host_update.xml rename to core/src/test/resources/google/registry/model/host_update.xml diff --git a/core/src/test/java/google/registry/model/testdata/schema.txt b/core/src/test/resources/google/registry/model/schema.txt similarity index 100% rename from core/src/test/java/google/registry/model/testdata/schema.txt rename to core/src/test/resources/google/registry/model/schema.txt diff --git a/core/src/test/java/google/registry/model/translators/testdata/host_update.xml b/core/src/test/resources/google/registry/model/translators/host_update.xml similarity index 100% rename from core/src/test/java/google/registry/model/translators/testdata/host_update.xml rename to core/src/test/resources/google/registry/model/translators/host_update.xml diff --git a/core/src/test/java/google/registry/module/backend/testdata/backend_routing.txt b/core/src/test/resources/google/registry/module/backend/backend_routing.txt similarity index 100% rename from core/src/test/java/google/registry/module/backend/testdata/backend_routing.txt rename to core/src/test/resources/google/registry/module/backend/backend_routing.txt diff --git a/core/src/test/java/google/registry/module/frontend/testdata/frontend_routing.txt b/core/src/test/resources/google/registry/module/frontend/frontend_routing.txt similarity index 100% rename from core/src/test/java/google/registry/module/frontend/testdata/frontend_routing.txt rename to core/src/test/resources/google/registry/module/frontend/frontend_routing.txt diff --git a/core/src/test/java/google/registry/module/pubapi/testdata/pubapi_routing.txt b/core/src/test/resources/google/registry/module/pubapi/pubapi_routing.txt similarity index 100% rename from core/src/test/java/google/registry/module/pubapi/testdata/pubapi_routing.txt rename to core/src/test/resources/google/registry/module/pubapi/pubapi_routing.txt diff --git a/core/src/test/java/google/registry/module/tools/testdata/tools_routing.txt b/core/src/test/resources/google/registry/module/tools/tools_routing.txt similarity index 100% rename from core/src/test/java/google/registry/module/tools/testdata/tools_routing.txt rename to core/src/test/resources/google/registry/module/tools/tools_routing.txt diff --git a/core/src/test/java/google/registry/rdap/testdata/rdap_associated_contact.json b/core/src/test/resources/google/registry/rdap/rdap_associated_contact.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdap_associated_contact.json rename to core/src/test/resources/google/registry/rdap/rdap_associated_contact.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdap_associated_contact_no_personal_data.json b/core/src/test/resources/google/registry/rdap/rdap_associated_contact_no_personal_data.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdap_associated_contact_no_personal_data.json rename to core/src/test/resources/google/registry/rdap/rdap_associated_contact_no_personal_data.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdap_contact.json b/core/src/test/resources/google/registry/rdap/rdap_contact.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdap_contact.json rename to core/src/test/resources/google/registry/rdap/rdap_contact.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdap_contact_deleted.json b/core/src/test/resources/google/registry/rdap/rdap_contact_deleted.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdap_contact_deleted.json rename to core/src/test/resources/google/registry/rdap/rdap_contact_deleted.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdap_contact_no_personal_data_with_remark.json b/core/src/test/resources/google/registry/rdap/rdap_contact_no_personal_data_with_remark.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdap_contact_no_personal_data_with_remark.json rename to core/src/test/resources/google/registry/rdap/rdap_contact_no_personal_data_with_remark.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdap_domain.json b/core/src/test/resources/google/registry/rdap/rdap_domain.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdap_domain.json rename to core/src/test/resources/google/registry/rdap/rdap_domain.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdap_domain_cat2.json b/core/src/test/resources/google/registry/rdap/rdap_domain_cat2.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdap_domain_cat2.json rename to core/src/test/resources/google/registry/rdap/rdap_domain_cat2.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdap_domain_deleted.json b/core/src/test/resources/google/registry/rdap/rdap_domain_deleted.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdap_domain_deleted.json rename to core/src/test/resources/google/registry/rdap/rdap_domain_deleted.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdap_domain_no_contacts_with_remark.json b/core/src/test/resources/google/registry/rdap/rdap_domain_no_contacts_with_remark.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdap_domain_no_contacts_with_remark.json rename to core/src/test/resources/google/registry/rdap/rdap_domain_no_contacts_with_remark.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdap_domain_unicode.json b/core/src/test/resources/google/registry/rdap/rdap_domain_unicode.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdap_domain_unicode.json rename to core/src/test/resources/google/registry/rdap/rdap_domain_unicode.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdap_domain_unicode_no_contacts_with_remark.json b/core/src/test/resources/google/registry/rdap/rdap_domain_unicode_no_contacts_with_remark.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdap_domain_unicode_no_contacts_with_remark.json rename to core/src/test/resources/google/registry/rdap/rdap_domain_unicode_no_contacts_with_remark.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdap_domains_four_truncated.json b/core/src/test/resources/google/registry/rdap/rdap_domains_four_truncated.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdap_domains_four_truncated.json rename to core/src/test/resources/google/registry/rdap/rdap_domains_four_truncated.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdap_domains_four_with_one_unicode.json b/core/src/test/resources/google/registry/rdap/rdap_domains_four_with_one_unicode.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdap_domains_four_with_one_unicode.json rename to core/src/test/resources/google/registry/rdap/rdap_domains_four_with_one_unicode.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdap_domains_four_with_one_unicode_truncated.json b/core/src/test/resources/google/registry/rdap/rdap_domains_four_with_one_unicode_truncated.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdap_domains_four_with_one_unicode_truncated.json rename to core/src/test/resources/google/registry/rdap/rdap_domains_four_with_one_unicode_truncated.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdap_domains_two.json b/core/src/test/resources/google/registry/rdap/rdap_domains_two.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdap_domains_two.json rename to core/src/test/resources/google/registry/rdap/rdap_domains_two.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdap_error.json b/core/src/test/resources/google/registry/rdap/rdap_error.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdap_error.json rename to core/src/test/resources/google/registry/rdap/rdap_error.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdap_help_index.json b/core/src/test/resources/google/registry/rdap/rdap_help_index.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdap_help_index.json rename to core/src/test/resources/google/registry/rdap/rdap_help_index.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdap_help_tos.json b/core/src/test/resources/google/registry/rdap/rdap_help_tos.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdap_help_tos.json rename to core/src/test/resources/google/registry/rdap/rdap_help_tos.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdap_host.json b/core/src/test/resources/google/registry/rdap/rdap_host.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdap_host.json rename to core/src/test/resources/google/registry/rdap/rdap_host.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdap_host_external.json b/core/src/test/resources/google/registry/rdap/rdap_host_external.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdap_host_external.json rename to core/src/test/resources/google/registry/rdap/rdap_host_external.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdap_host_linked.json b/core/src/test/resources/google/registry/rdap/rdap_host_linked.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdap_host_linked.json rename to core/src/test/resources/google/registry/rdap/rdap_host_linked.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdap_host_unicode.json b/core/src/test/resources/google/registry/rdap/rdap_host_unicode.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdap_host_unicode.json rename to core/src/test/resources/google/registry/rdap/rdap_host_unicode.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdap_incomplete_domain_result_set.json b/core/src/test/resources/google/registry/rdap/rdap_incomplete_domain_result_set.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdap_incomplete_domain_result_set.json rename to core/src/test/resources/google/registry/rdap/rdap_incomplete_domain_result_set.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdap_incomplete_domains.json b/core/src/test/resources/google/registry/rdap/rdap_incomplete_domains.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdap_incomplete_domains.json rename to core/src/test/resources/google/registry/rdap/rdap_incomplete_domains.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdap_multiple_contacts.json b/core/src/test/resources/google/registry/rdap/rdap_multiple_contacts.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdap_multiple_contacts.json rename to core/src/test/resources/google/registry/rdap/rdap_multiple_contacts.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdap_multiple_contacts2.json b/core/src/test/resources/google/registry/rdap/rdap_multiple_contacts2.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdap_multiple_contacts2.json rename to core/src/test/resources/google/registry/rdap/rdap_multiple_contacts2.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdap_multiple_hosts.json b/core/src/test/resources/google/registry/rdap/rdap_multiple_hosts.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdap_multiple_hosts.json rename to core/src/test/resources/google/registry/rdap/rdap_multiple_hosts.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdap_nontruncated_contacts.json b/core/src/test/resources/google/registry/rdap/rdap_nontruncated_contacts.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdap_nontruncated_contacts.json rename to core/src/test/resources/google/registry/rdap/rdap_nontruncated_contacts.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdap_nontruncated_domains.json b/core/src/test/resources/google/registry/rdap/rdap_nontruncated_domains.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdap_nontruncated_domains.json rename to core/src/test/resources/google/registry/rdap/rdap_nontruncated_domains.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdap_nontruncated_hosts.json b/core/src/test/resources/google/registry/rdap/rdap_nontruncated_hosts.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdap_nontruncated_hosts.json rename to core/src/test/resources/google/registry/rdap/rdap_nontruncated_hosts.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdap_nontruncated_registrars.json b/core/src/test/resources/google/registry/rdap/rdap_nontruncated_registrars.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdap_nontruncated_registrars.json rename to core/src/test/resources/google/registry/rdap/rdap_nontruncated_registrars.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdap_registrar.json b/core/src/test/resources/google/registry/rdap/rdap_registrar.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdap_registrar.json rename to core/src/test/resources/google/registry/rdap/rdap_registrar.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdap_registrar_test.json b/core/src/test/resources/google/registry/rdap/rdap_registrar_test.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdap_registrar_test.json rename to core/src/test/resources/google/registry/rdap/rdap_registrar_test.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdap_truncated_contacts.json b/core/src/test/resources/google/registry/rdap/rdap_truncated_contacts.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdap_truncated_contacts.json rename to core/src/test/resources/google/registry/rdap/rdap_truncated_contacts.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdap_truncated_hosts.json b/core/src/test/resources/google/registry/rdap/rdap_truncated_hosts.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdap_truncated_hosts.json rename to core/src/test/resources/google/registry/rdap/rdap_truncated_hosts.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdap_truncated_mixed_entities.json b/core/src/test/resources/google/registry/rdap/rdap_truncated_mixed_entities.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdap_truncated_mixed_entities.json rename to core/src/test/resources/google/registry/rdap/rdap_truncated_mixed_entities.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdap_truncated_registrars.json b/core/src/test/resources/google/registry/rdap/rdap_truncated_registrars.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdap_truncated_registrars.json rename to core/src/test/resources/google/registry/rdap/rdap_truncated_registrars.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdap_unformatted_output.json b/core/src/test/resources/google/registry/rdap/rdap_unformatted_output.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdap_unformatted_output.json rename to core/src/test/resources/google/registry/rdap/rdap_unformatted_output.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdapjson_admincontact.json b/core/src/test/resources/google/registry/rdap/rdapjson_admincontact.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdapjson_admincontact.json rename to core/src/test/resources/google/registry/rdap/rdapjson_admincontact.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdapjson_domain_full.json b/core/src/test/resources/google/registry/rdap/rdapjson_domain_full.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdapjson_domain_full.json rename to core/src/test/resources/google/registry/rdap/rdapjson_domain_full.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdapjson_domain_logged_out.json b/core/src/test/resources/google/registry/rdap/rdapjson_domain_logged_out.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdapjson_domain_logged_out.json rename to core/src/test/resources/google/registry/rdap/rdapjson_domain_logged_out.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdapjson_domain_no_nameservers.json b/core/src/test/resources/google/registry/rdap/rdapjson_domain_no_nameservers.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdapjson_domain_no_nameservers.json rename to core/src/test/resources/google/registry/rdap/rdapjson_domain_no_nameservers.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdapjson_domain_summary.json b/core/src/test/resources/google/registry/rdap/rdapjson_domain_summary.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdapjson_domain_summary.json rename to core/src/test/resources/google/registry/rdap/rdapjson_domain_summary.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdapjson_error.json b/core/src/test/resources/google/registry/rdap/rdapjson_error.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdapjson_error.json rename to core/src/test/resources/google/registry/rdap/rdapjson_error.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdapjson_host_both.json b/core/src/test/resources/google/registry/rdap/rdapjson_host_both.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdapjson_host_both.json rename to core/src/test/resources/google/registry/rdap/rdapjson_host_both.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdapjson_host_both_summary.json b/core/src/test/resources/google/registry/rdap/rdapjson_host_both_summary.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdapjson_host_both_summary.json rename to core/src/test/resources/google/registry/rdap/rdapjson_host_both_summary.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdapjson_host_ipv4.json b/core/src/test/resources/google/registry/rdap/rdapjson_host_ipv4.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdapjson_host_ipv4.json rename to core/src/test/resources/google/registry/rdap/rdapjson_host_ipv4.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdapjson_host_ipv6.json b/core/src/test/resources/google/registry/rdap/rdapjson_host_ipv6.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdapjson_host_ipv6.json rename to core/src/test/resources/google/registry/rdap/rdapjson_host_ipv6.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdapjson_host_no_addresses.json b/core/src/test/resources/google/registry/rdap/rdapjson_host_no_addresses.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdapjson_host_no_addresses.json rename to core/src/test/resources/google/registry/rdap/rdapjson_host_no_addresses.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdapjson_host_not_linked.json b/core/src/test/resources/google/registry/rdap/rdapjson_host_not_linked.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdapjson_host_not_linked.json rename to core/src/test/resources/google/registry/rdap/rdapjson_host_not_linked.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdapjson_host_pending_transfer.json b/core/src/test/resources/google/registry/rdap/rdapjson_host_pending_transfer.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdapjson_host_pending_transfer.json rename to core/src/test/resources/google/registry/rdap/rdapjson_host_pending_transfer.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdapjson_notice_alternate_link.json b/core/src/test/resources/google/registry/rdap/rdapjson_notice_alternate_link.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdapjson_notice_alternate_link.json rename to core/src/test/resources/google/registry/rdap/rdapjson_notice_alternate_link.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdapjson_notice_self_link.json b/core/src/test/resources/google/registry/rdap/rdapjson_notice_self_link.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdapjson_notice_self_link.json rename to core/src/test/resources/google/registry/rdap/rdapjson_notice_self_link.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdapjson_registrant.json b/core/src/test/resources/google/registry/rdap/rdapjson_registrant.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdapjson_registrant.json rename to core/src/test/resources/google/registry/rdap/rdapjson_registrant.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdapjson_registrant_logged_out.json b/core/src/test/resources/google/registry/rdap/rdapjson_registrant_logged_out.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdapjson_registrant_logged_out.json rename to core/src/test/resources/google/registry/rdap/rdapjson_registrant_logged_out.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdapjson_registrant_nobase.json b/core/src/test/resources/google/registry/rdap/rdapjson_registrant_nobase.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdapjson_registrant_nobase.json rename to core/src/test/resources/google/registry/rdap/rdapjson_registrant_nobase.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdapjson_registrant_summary.json b/core/src/test/resources/google/registry/rdap/rdapjson_registrant_summary.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdapjson_registrant_summary.json rename to core/src/test/resources/google/registry/rdap/rdapjson_registrant_summary.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdapjson_registrant_summary_logged_out.json b/core/src/test/resources/google/registry/rdap/rdapjson_registrant_summary_logged_out.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdapjson_registrant_summary_logged_out.json rename to core/src/test/resources/google/registry/rdap/rdapjson_registrant_summary_logged_out.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdapjson_registrar.json b/core/src/test/resources/google/registry/rdap/rdapjson_registrar.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdapjson_registrar.json rename to core/src/test/resources/google/registry/rdap/rdapjson_registrar.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdapjson_registrar_summary.json b/core/src/test/resources/google/registry/rdap/rdapjson_registrar_summary.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdapjson_registrar_summary.json rename to core/src/test/resources/google/registry/rdap/rdapjson_registrar_summary.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdapjson_rolelesscontact.json b/core/src/test/resources/google/registry/rdap/rdapjson_rolelesscontact.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdapjson_rolelesscontact.json rename to core/src/test/resources/google/registry/rdap/rdapjson_rolelesscontact.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdapjson_techcontact.json b/core/src/test/resources/google/registry/rdap/rdapjson_techcontact.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdapjson_techcontact.json rename to core/src/test/resources/google/registry/rdap/rdapjson_techcontact.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdapjson_toplevel.json b/core/src/test/resources/google/registry/rdap/rdapjson_toplevel.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdapjson_toplevel.json rename to core/src/test/resources/google/registry/rdap/rdapjson_toplevel.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdapjson_toplevel_domain.json b/core/src/test/resources/google/registry/rdap/rdapjson_toplevel_domain.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdapjson_toplevel_domain.json rename to core/src/test/resources/google/registry/rdap/rdapjson_toplevel_domain.json diff --git a/core/src/test/java/google/registry/rdap/testdata/rdapjson_unlinkedcontact.json b/core/src/test/resources/google/registry/rdap/rdapjson_unlinkedcontact.json similarity index 100% rename from core/src/test/java/google/registry/rdap/testdata/rdapjson_unlinkedcontact.json rename to core/src/test/resources/google/registry/rdap/rdapjson_unlinkedcontact.json diff --git a/core/src/test/java/google/registry/rde/testdata/deposit_full.xml b/core/src/test/resources/google/registry/rde/deposit_full.xml similarity index 100% rename from core/src/test/java/google/registry/rde/testdata/deposit_full.xml rename to core/src/test/resources/google/registry/rde/deposit_full.xml diff --git a/core/src/test/java/google/registry/rde/testdata/deposit_full_badref.xml b/core/src/test/resources/google/registry/rde/deposit_full_badref.xml similarity index 100% rename from core/src/test/java/google/registry/rde/testdata/deposit_full_badref.xml rename to core/src/test/resources/google/registry/rde/deposit_full_badref.xml diff --git a/core/src/test/java/google/registry/rde/testdata/iirdea_bad.xml b/core/src/test/resources/google/registry/rde/iirdea_bad.xml similarity index 100% rename from core/src/test/java/google/registry/rde/testdata/iirdea_bad.xml rename to core/src/test/resources/google/registry/rde/iirdea_bad.xml diff --git a/core/src/test/java/google/registry/rde/testdata/iirdea_good.xml b/core/src/test/resources/google/registry/rde/iirdea_good.xml similarity index 100% rename from core/src/test/java/google/registry/rde/testdata/iirdea_good.xml rename to core/src/test/resources/google/registry/rde/iirdea_good.xml diff --git a/core/src/test/java/google/registry/rde/testdata/pgp-private-keyring-escrow.asc b/core/src/test/resources/google/registry/rde/pgp-private-keyring-escrow.asc similarity index 100% rename from core/src/test/java/google/registry/rde/testdata/pgp-private-keyring-escrow.asc rename to core/src/test/resources/google/registry/rde/pgp-private-keyring-escrow.asc diff --git a/core/src/test/java/google/registry/rde/testdata/pgp-private-keyring-registry.asc b/core/src/test/resources/google/registry/rde/pgp-private-keyring-registry.asc similarity index 100% rename from core/src/test/java/google/registry/rde/testdata/pgp-private-keyring-registry.asc rename to core/src/test/resources/google/registry/rde/pgp-private-keyring-registry.asc diff --git a/core/src/test/java/google/registry/rde/testdata/pgp-public-keyring.asc b/core/src/test/resources/google/registry/rde/pgp-public-keyring.asc similarity index 100% rename from core/src/test/java/google/registry/rde/testdata/pgp-public-keyring.asc rename to core/src/test/resources/google/registry/rde/pgp-public-keyring.asc diff --git a/core/src/test/java/google/registry/rde/testdata/registry-unittest.id_rsa b/core/src/test/resources/google/registry/rde/registry-unittest.id_rsa similarity index 100% rename from core/src/test/java/google/registry/rde/testdata/registry-unittest.id_rsa rename to core/src/test/resources/google/registry/rde/registry-unittest.id_rsa diff --git a/core/src/test/java/google/registry/rde/testdata/registry-unittest.id_rsa.pub b/core/src/test/resources/google/registry/rde/registry-unittest.id_rsa.pub similarity index 100% rename from core/src/test/java/google/registry/rde/testdata/registry-unittest.id_rsa.pub rename to core/src/test/resources/google/registry/rde/registry-unittest.id_rsa.pub diff --git a/core/src/test/java/google/registry/rde/testdata/report.xml b/core/src/test/resources/google/registry/rde/report.xml similarity index 100% rename from core/src/test/java/google/registry/rde/testdata/report.xml rename to core/src/test/resources/google/registry/rde/report.xml diff --git a/core/src/test/java/google/registry/rde/testdata/testMapReduce_withDomain_producesExpectedXml.xml b/core/src/test/resources/google/registry/rde/testMapReduce_withDomain_producesExpectedXml.xml similarity index 100% rename from core/src/test/java/google/registry/rde/testdata/testMapReduce_withDomain_producesExpectedXml.xml rename to core/src/test/resources/google/registry/rde/testMapReduce_withDomain_producesExpectedXml.xml diff --git a/core/src/test/java/google/registry/rde/testdata/testMapReduce_withDomain_producesReportXml.xml b/core/src/test/resources/google/registry/rde/testMapReduce_withDomain_producesReportXml.xml similarity index 100% rename from core/src/test/java/google/registry/rde/testdata/testMapReduce_withDomain_producesReportXml.xml rename to core/src/test/resources/google/registry/rde/testMapReduce_withDomain_producesReportXml.xml diff --git a/core/src/test/java/google/registry/reporting/icann/testdata/activity_report_aggregation_test.sql b/core/src/test/resources/google/registry/reporting/icann/activity_report_aggregation_test.sql similarity index 100% rename from core/src/test/java/google/registry/reporting/icann/testdata/activity_report_aggregation_test.sql rename to core/src/test/resources/google/registry/reporting/icann/activity_report_aggregation_test.sql diff --git a/core/src/test/java/google/registry/reporting/icann/testdata/attempted_adds_test.sql b/core/src/test/resources/google/registry/reporting/icann/attempted_adds_test.sql similarity index 100% rename from core/src/test/java/google/registry/reporting/icann/testdata/attempted_adds_test.sql rename to core/src/test/resources/google/registry/reporting/icann/attempted_adds_test.sql diff --git a/core/src/test/java/google/registry/reporting/icann/testdata/dns_counts_internal_test.sql b/core/src/test/resources/google/registry/reporting/icann/dns_counts_internal_test.sql similarity index 100% rename from core/src/test/java/google/registry/reporting/icann/testdata/dns_counts_internal_test.sql rename to core/src/test/resources/google/registry/reporting/icann/dns_counts_internal_test.sql diff --git a/core/src/test/java/google/registry/reporting/icann/testdata/dns_counts_test.sql b/core/src/test/resources/google/registry/reporting/icann/dns_counts_test.sql similarity index 100% rename from core/src/test/java/google/registry/reporting/icann/testdata/dns_counts_test.sql rename to core/src/test/resources/google/registry/reporting/icann/dns_counts_test.sql diff --git a/core/src/test/java/google/registry/reporting/icann/testdata/epp_metrics_test.sql b/core/src/test/resources/google/registry/reporting/icann/epp_metrics_test.sql similarity index 100% rename from core/src/test/java/google/registry/reporting/icann/testdata/epp_metrics_test.sql rename to core/src/test/resources/google/registry/reporting/icann/epp_metrics_test.sql diff --git a/core/src/test/java/google/registry/reporting/icann/testdata/iirdea_bad.xml b/core/src/test/resources/google/registry/reporting/icann/iirdea_bad.xml similarity index 100% rename from core/src/test/java/google/registry/reporting/icann/testdata/iirdea_bad.xml rename to core/src/test/resources/google/registry/reporting/icann/iirdea_bad.xml diff --git a/core/src/test/java/google/registry/reporting/icann/testdata/iirdea_good.xml b/core/src/test/resources/google/registry/reporting/icann/iirdea_good.xml similarity index 100% rename from core/src/test/java/google/registry/reporting/icann/testdata/iirdea_good.xml rename to core/src/test/resources/google/registry/reporting/icann/iirdea_good.xml diff --git a/core/src/test/java/google/registry/reporting/icann/testdata/monthly_logs_test.sql b/core/src/test/resources/google/registry/reporting/icann/monthly_logs_test.sql similarity index 100% rename from core/src/test/java/google/registry/reporting/icann/testdata/monthly_logs_test.sql rename to core/src/test/resources/google/registry/reporting/icann/monthly_logs_test.sql diff --git a/core/src/test/java/google/registry/reporting/icann/testdata/registrar_iana_id_test.sql b/core/src/test/resources/google/registry/reporting/icann/registrar_iana_id_test.sql similarity index 100% rename from core/src/test/java/google/registry/reporting/icann/testdata/registrar_iana_id_test.sql rename to core/src/test/resources/google/registry/reporting/icann/registrar_iana_id_test.sql diff --git a/core/src/test/java/google/registry/reporting/icann/testdata/registrar_operating_status_test.sql b/core/src/test/resources/google/registry/reporting/icann/registrar_operating_status_test.sql similarity index 100% rename from core/src/test/java/google/registry/reporting/icann/testdata/registrar_operating_status_test.sql rename to core/src/test/resources/google/registry/reporting/icann/registrar_operating_status_test.sql diff --git a/core/src/test/java/google/registry/reporting/icann/testdata/total_domains_test.sql b/core/src/test/resources/google/registry/reporting/icann/total_domains_test.sql similarity index 100% rename from core/src/test/java/google/registry/reporting/icann/testdata/total_domains_test.sql rename to core/src/test/resources/google/registry/reporting/icann/total_domains_test.sql diff --git a/core/src/test/java/google/registry/reporting/icann/testdata/total_nameservers_test.sql b/core/src/test/resources/google/registry/reporting/icann/total_nameservers_test.sql similarity index 100% rename from core/src/test/java/google/registry/reporting/icann/testdata/total_nameservers_test.sql rename to core/src/test/resources/google/registry/reporting/icann/total_nameservers_test.sql diff --git a/core/src/test/java/google/registry/reporting/icann/testdata/transaction_counts_test.sql b/core/src/test/resources/google/registry/reporting/icann/transaction_counts_test.sql similarity index 100% rename from core/src/test/java/google/registry/reporting/icann/testdata/transaction_counts_test.sql rename to core/src/test/resources/google/registry/reporting/icann/transaction_counts_test.sql diff --git a/core/src/test/java/google/registry/reporting/icann/testdata/transaction_transfer_losing_test.sql b/core/src/test/resources/google/registry/reporting/icann/transaction_transfer_losing_test.sql similarity index 100% rename from core/src/test/java/google/registry/reporting/icann/testdata/transaction_transfer_losing_test.sql rename to core/src/test/resources/google/registry/reporting/icann/transaction_transfer_losing_test.sql diff --git a/core/src/test/java/google/registry/reporting/icann/testdata/transactions_report_aggregation_test.sql b/core/src/test/resources/google/registry/reporting/icann/transactions_report_aggregation_test.sql similarity index 100% rename from core/src/test/java/google/registry/reporting/icann/testdata/transactions_report_aggregation_test.sql rename to core/src/test/resources/google/registry/reporting/icann/transactions_report_aggregation_test.sql diff --git a/core/src/test/java/google/registry/reporting/icann/testdata/whois_counts_test.sql b/core/src/test/resources/google/registry/reporting/icann/whois_counts_test.sql similarity index 100% rename from core/src/test/java/google/registry/reporting/icann/testdata/whois_counts_test.sql rename to core/src/test/resources/google/registry/reporting/icann/whois_counts_test.sql diff --git a/core/src/test/java/google/registry/reporting/spec11/testdata/spec11_fake_report b/core/src/test/resources/google/registry/reporting/spec11/spec11_fake_report similarity index 100% rename from core/src/test/java/google/registry/reporting/spec11/testdata/spec11_fake_report rename to core/src/test/resources/google/registry/reporting/spec11/spec11_fake_report diff --git a/core/src/test/java/google/registry/reporting/spec11/testdata/spec11_fake_report_previous_day b/core/src/test/resources/google/registry/reporting/spec11/spec11_fake_report_previous_day similarity index 100% rename from core/src/test/java/google/registry/reporting/spec11/testdata/spec11_fake_report_previous_day rename to core/src/test/resources/google/registry/reporting/spec11/spec11_fake_report_previous_day diff --git a/core/src/test/java/google/registry/testing/testdata/pgp-private-keyring-registry.asc b/core/src/test/resources/google/registry/testing/pgp-private-keyring-registry.asc similarity index 100% rename from core/src/test/java/google/registry/testing/testdata/pgp-private-keyring-registry.asc rename to core/src/test/resources/google/registry/testing/pgp-private-keyring-registry.asc diff --git a/core/src/test/java/google/registry/testing/testdata/pgp-public-keyring.asc b/core/src/test/resources/google/registry/testing/pgp-public-keyring.asc similarity index 100% rename from core/src/test/java/google/registry/testing/testdata/pgp-public-keyring.asc rename to core/src/test/resources/google/registry/testing/pgp-public-keyring.asc diff --git a/core/src/test/java/google/registry/testing/testdata/registry-unittest.id_rsa b/core/src/test/resources/google/registry/testing/registry-unittest.id_rsa similarity index 100% rename from core/src/test/java/google/registry/testing/testdata/registry-unittest.id_rsa rename to core/src/test/resources/google/registry/testing/registry-unittest.id_rsa diff --git a/core/src/test/java/google/registry/testing/testdata/registry-unittest.id_rsa.pub b/core/src/test/resources/google/registry/testing/registry-unittest.id_rsa.pub similarity index 100% rename from core/src/test/java/google/registry/testing/testdata/registry-unittest.id_rsa.pub rename to core/src/test/resources/google/registry/testing/registry-unittest.id_rsa.pub diff --git a/core/src/test/java/google/registry/tmch/testdata/active/Court-Agent-Arab-Active.smd b/core/src/test/resources/google/registry/tmch/active/Court-Agent-Arab-Active.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/active/Court-Agent-Arab-Active.smd rename to core/src/test/resources/google/registry/tmch/active/Court-Agent-Arab-Active.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/active/Court-Agent-Chinese-Active.smd b/core/src/test/resources/google/registry/tmch/active/Court-Agent-Chinese-Active.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/active/Court-Agent-Chinese-Active.smd rename to core/src/test/resources/google/registry/tmch/active/Court-Agent-Chinese-Active.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/active/Court-Agent-English-Active.smd b/core/src/test/resources/google/registry/tmch/active/Court-Agent-English-Active.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/active/Court-Agent-English-Active.smd rename to core/src/test/resources/google/registry/tmch/active/Court-Agent-English-Active.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/active/Court-Agent-French-Active.smd b/core/src/test/resources/google/registry/tmch/active/Court-Agent-French-Active.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/active/Court-Agent-French-Active.smd rename to core/src/test/resources/google/registry/tmch/active/Court-Agent-French-Active.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/active/Court-Agent-Russian-Active.smd b/core/src/test/resources/google/registry/tmch/active/Court-Agent-Russian-Active.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/active/Court-Agent-Russian-Active.smd rename to core/src/test/resources/google/registry/tmch/active/Court-Agent-Russian-Active.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/active/Court-Holder-Arab-Active.smd b/core/src/test/resources/google/registry/tmch/active/Court-Holder-Arab-Active.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/active/Court-Holder-Arab-Active.smd rename to core/src/test/resources/google/registry/tmch/active/Court-Holder-Arab-Active.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/active/Court-Holder-Chinese-Active.smd b/core/src/test/resources/google/registry/tmch/active/Court-Holder-Chinese-Active.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/active/Court-Holder-Chinese-Active.smd rename to core/src/test/resources/google/registry/tmch/active/Court-Holder-Chinese-Active.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/active/Court-Holder-English-Active.smd b/core/src/test/resources/google/registry/tmch/active/Court-Holder-English-Active.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/active/Court-Holder-English-Active.smd rename to core/src/test/resources/google/registry/tmch/active/Court-Holder-English-Active.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/active/Court-Holder-French-Active.smd b/core/src/test/resources/google/registry/tmch/active/Court-Holder-French-Active.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/active/Court-Holder-French-Active.smd rename to core/src/test/resources/google/registry/tmch/active/Court-Holder-French-Active.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/active/Court-Holder-Russian-Active.smd b/core/src/test/resources/google/registry/tmch/active/Court-Holder-Russian-Active.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/active/Court-Holder-Russian-Active.smd rename to core/src/test/resources/google/registry/tmch/active/Court-Holder-Russian-Active.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/active/Trademark-Agent-Arab-Active.smd b/core/src/test/resources/google/registry/tmch/active/Trademark-Agent-Arab-Active.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/active/Trademark-Agent-Arab-Active.smd rename to core/src/test/resources/google/registry/tmch/active/Trademark-Agent-Arab-Active.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/active/Trademark-Agent-Chinese-Active.smd b/core/src/test/resources/google/registry/tmch/active/Trademark-Agent-Chinese-Active.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/active/Trademark-Agent-Chinese-Active.smd rename to core/src/test/resources/google/registry/tmch/active/Trademark-Agent-Chinese-Active.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/active/Trademark-Agent-English-Active.smd b/core/src/test/resources/google/registry/tmch/active/Trademark-Agent-English-Active.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/active/Trademark-Agent-English-Active.smd rename to core/src/test/resources/google/registry/tmch/active/Trademark-Agent-English-Active.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/active/Trademark-Agent-French-Active.smd b/core/src/test/resources/google/registry/tmch/active/Trademark-Agent-French-Active.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/active/Trademark-Agent-French-Active.smd rename to core/src/test/resources/google/registry/tmch/active/Trademark-Agent-French-Active.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/active/Trademark-Agent-Russian-Active.smd b/core/src/test/resources/google/registry/tmch/active/Trademark-Agent-Russian-Active.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/active/Trademark-Agent-Russian-Active.smd rename to core/src/test/resources/google/registry/tmch/active/Trademark-Agent-Russian-Active.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/active/Trademark-Holder-Arab-Active.smd b/core/src/test/resources/google/registry/tmch/active/Trademark-Holder-Arab-Active.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/active/Trademark-Holder-Arab-Active.smd rename to core/src/test/resources/google/registry/tmch/active/Trademark-Holder-Arab-Active.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/active/Trademark-Holder-Chinese-Active.smd b/core/src/test/resources/google/registry/tmch/active/Trademark-Holder-Chinese-Active.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/active/Trademark-Holder-Chinese-Active.smd rename to core/src/test/resources/google/registry/tmch/active/Trademark-Holder-Chinese-Active.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/active/Trademark-Holder-English-Active.smd b/core/src/test/resources/google/registry/tmch/active/Trademark-Holder-English-Active.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/active/Trademark-Holder-English-Active.smd rename to core/src/test/resources/google/registry/tmch/active/Trademark-Holder-English-Active.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/active/Trademark-Holder-French-Active.smd b/core/src/test/resources/google/registry/tmch/active/Trademark-Holder-French-Active.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/active/Trademark-Holder-French-Active.smd rename to core/src/test/resources/google/registry/tmch/active/Trademark-Holder-French-Active.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/active/Trademark-Holder-Russian-Active.smd b/core/src/test/resources/google/registry/tmch/active/Trademark-Holder-Russian-Active.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/active/Trademark-Holder-Russian-Active.smd rename to core/src/test/resources/google/registry/tmch/active/Trademark-Holder-Russian-Active.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/active/TreatyStatute-Agent-Arab-Active.smd b/core/src/test/resources/google/registry/tmch/active/TreatyStatute-Agent-Arab-Active.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/active/TreatyStatute-Agent-Arab-Active.smd rename to core/src/test/resources/google/registry/tmch/active/TreatyStatute-Agent-Arab-Active.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/active/TreatyStatute-Agent-Chinese-Active.smd b/core/src/test/resources/google/registry/tmch/active/TreatyStatute-Agent-Chinese-Active.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/active/TreatyStatute-Agent-Chinese-Active.smd rename to core/src/test/resources/google/registry/tmch/active/TreatyStatute-Agent-Chinese-Active.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/active/TreatyStatute-Agent-English-Active.smd b/core/src/test/resources/google/registry/tmch/active/TreatyStatute-Agent-English-Active.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/active/TreatyStatute-Agent-English-Active.smd rename to core/src/test/resources/google/registry/tmch/active/TreatyStatute-Agent-English-Active.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/active/TreatyStatute-Agent-French-Active.smd b/core/src/test/resources/google/registry/tmch/active/TreatyStatute-Agent-French-Active.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/active/TreatyStatute-Agent-French-Active.smd rename to core/src/test/resources/google/registry/tmch/active/TreatyStatute-Agent-French-Active.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/active/TreatyStatute-Agent-Russian-Active.smd b/core/src/test/resources/google/registry/tmch/active/TreatyStatute-Agent-Russian-Active.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/active/TreatyStatute-Agent-Russian-Active.smd rename to core/src/test/resources/google/registry/tmch/active/TreatyStatute-Agent-Russian-Active.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/active/TreatyStatute-Holder-Arab-Active.smd b/core/src/test/resources/google/registry/tmch/active/TreatyStatute-Holder-Arab-Active.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/active/TreatyStatute-Holder-Arab-Active.smd rename to core/src/test/resources/google/registry/tmch/active/TreatyStatute-Holder-Arab-Active.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/active/TreatyStatute-Holder-Chinese-Active.smd b/core/src/test/resources/google/registry/tmch/active/TreatyStatute-Holder-Chinese-Active.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/active/TreatyStatute-Holder-Chinese-Active.smd rename to core/src/test/resources/google/registry/tmch/active/TreatyStatute-Holder-Chinese-Active.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/active/TreatyStatute-Holder-English-Active.smd b/core/src/test/resources/google/registry/tmch/active/TreatyStatute-Holder-English-Active.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/active/TreatyStatute-Holder-English-Active.smd rename to core/src/test/resources/google/registry/tmch/active/TreatyStatute-Holder-English-Active.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/active/TreatyStatute-Holder-French-Active.smd b/core/src/test/resources/google/registry/tmch/active/TreatyStatute-Holder-French-Active.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/active/TreatyStatute-Holder-French-Active.smd rename to core/src/test/resources/google/registry/tmch/active/TreatyStatute-Holder-French-Active.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/active/TreatyStatute-Holder-Russian-Active.smd b/core/src/test/resources/google/registry/tmch/active/TreatyStatute-Holder-Russian-Active.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/active/TreatyStatute-Holder-Russian-Active.smd rename to core/src/test/resources/google/registry/tmch/active/TreatyStatute-Holder-Russian-Active.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/dnl-latest.csv b/core/src/test/resources/google/registry/tmch/dnl-latest.csv similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/dnl-latest.csv rename to core/src/test/resources/google/registry/tmch/dnl-latest.csv diff --git a/core/src/test/java/google/registry/tmch/testdata/dnl-latest.sig b/core/src/test/resources/google/registry/tmch/dnl-latest.sig similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/dnl-latest.sig rename to core/src/test/resources/google/registry/tmch/dnl-latest.sig diff --git a/core/src/test/java/google/registry/tmch/testdata/icann-tmch-pilot-old.crl b/core/src/test/resources/google/registry/tmch/icann-tmch-pilot-old.crl similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/icann-tmch-pilot-old.crl rename to core/src/test/resources/google/registry/tmch/icann-tmch-pilot-old.crl diff --git a/core/src/test/java/google/registry/tmch/testdata/icann-tmch-test-good.crt b/core/src/test/resources/google/registry/tmch/icann-tmch-test-good.crt similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/icann-tmch-test-good.crt rename to core/src/test/resources/google/registry/tmch/icann-tmch-test-good.crt diff --git a/core/src/test/java/google/registry/tmch/testdata/icann-tmch-test-revoked.crt b/core/src/test/resources/google/registry/tmch/icann-tmch-test-revoked.crt similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/icann-tmch-test-revoked.crt rename to core/src/test/resources/google/registry/tmch/icann-tmch-test-revoked.crt diff --git a/core/src/test/java/google/registry/tmch/testdata/invalid/InvalidSignature-Court-Agent-French-Active.smd b/core/src/test/resources/google/registry/tmch/invalid/InvalidSignature-Court-Agent-French-Active.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/invalid/InvalidSignature-Court-Agent-French-Active.smd rename to core/src/test/resources/google/registry/tmch/invalid/InvalidSignature-Court-Agent-French-Active.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/invalid/InvalidSignature-Trademark-Agent-English-Active.smd b/core/src/test/resources/google/registry/tmch/invalid/InvalidSignature-Trademark-Agent-English-Active.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/invalid/InvalidSignature-Trademark-Agent-English-Active.smd rename to core/src/test/resources/google/registry/tmch/invalid/InvalidSignature-Trademark-Agent-English-Active.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/invalid/InvalidSignature-Trademark-Agent-Russian-Active.smd b/core/src/test/resources/google/registry/tmch/invalid/InvalidSignature-Trademark-Agent-Russian-Active.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/invalid/InvalidSignature-Trademark-Agent-Russian-Active.smd rename to core/src/test/resources/google/registry/tmch/invalid/InvalidSignature-Trademark-Agent-Russian-Active.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/invalid/InvalidSignature-TreatyStatute-Agent-Chinese-Active.smd b/core/src/test/resources/google/registry/tmch/invalid/InvalidSignature-TreatyStatute-Agent-Chinese-Active.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/invalid/InvalidSignature-TreatyStatute-Agent-Chinese-Active.smd rename to core/src/test/resources/google/registry/tmch/invalid/InvalidSignature-TreatyStatute-Agent-Chinese-Active.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/invalid/InvalidSignature-TreatyStatute-Agent-English-Active.smd b/core/src/test/resources/google/registry/tmch/invalid/InvalidSignature-TreatyStatute-Agent-English-Active.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/invalid/InvalidSignature-TreatyStatute-Agent-English-Active.smd rename to core/src/test/resources/google/registry/tmch/invalid/InvalidSignature-TreatyStatute-Agent-English-Active.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/pubkey b/core/src/test/resources/google/registry/tmch/pubkey similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/pubkey rename to core/src/test/resources/google/registry/tmch/pubkey diff --git a/core/src/test/java/google/registry/tmch/testdata/revoked/smd/Court-Agent-Arab-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/Court-Agent-Arab-Revoked.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/revoked/smd/Court-Agent-Arab-Revoked.smd rename to core/src/test/resources/google/registry/tmch/revoked/smd/Court-Agent-Arab-Revoked.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/revoked/smd/Court-Agent-Chinese-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/Court-Agent-Chinese-Revoked.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/revoked/smd/Court-Agent-Chinese-Revoked.smd rename to core/src/test/resources/google/registry/tmch/revoked/smd/Court-Agent-Chinese-Revoked.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/revoked/smd/Court-Agent-English-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/Court-Agent-English-Revoked.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/revoked/smd/Court-Agent-English-Revoked.smd rename to core/src/test/resources/google/registry/tmch/revoked/smd/Court-Agent-English-Revoked.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/revoked/smd/Court-Agent-French-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/Court-Agent-French-Revoked.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/revoked/smd/Court-Agent-French-Revoked.smd rename to core/src/test/resources/google/registry/tmch/revoked/smd/Court-Agent-French-Revoked.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/revoked/smd/Court-Agent-Russian-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/Court-Agent-Russian-Revoked.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/revoked/smd/Court-Agent-Russian-Revoked.smd rename to core/src/test/resources/google/registry/tmch/revoked/smd/Court-Agent-Russian-Revoked.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/revoked/smd/Court-Holder-Arab-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/Court-Holder-Arab-Revoked.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/revoked/smd/Court-Holder-Arab-Revoked.smd rename to core/src/test/resources/google/registry/tmch/revoked/smd/Court-Holder-Arab-Revoked.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/revoked/smd/Court-Holder-Chinese-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/Court-Holder-Chinese-Revoked.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/revoked/smd/Court-Holder-Chinese-Revoked.smd rename to core/src/test/resources/google/registry/tmch/revoked/smd/Court-Holder-Chinese-Revoked.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/revoked/smd/Court-Holder-English-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/Court-Holder-English-Revoked.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/revoked/smd/Court-Holder-English-Revoked.smd rename to core/src/test/resources/google/registry/tmch/revoked/smd/Court-Holder-English-Revoked.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/revoked/smd/Court-Holder-French-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/Court-Holder-French-Revoked.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/revoked/smd/Court-Holder-French-Revoked.smd rename to core/src/test/resources/google/registry/tmch/revoked/smd/Court-Holder-French-Revoked.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/revoked/smd/Court-Holder-Russian-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/Court-Holder-Russian-Revoked.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/revoked/smd/Court-Holder-Russian-Revoked.smd rename to core/src/test/resources/google/registry/tmch/revoked/smd/Court-Holder-Russian-Revoked.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/revoked/smd/Trademark-Agent-Arab-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/Trademark-Agent-Arab-Revoked.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/revoked/smd/Trademark-Agent-Arab-Revoked.smd rename to core/src/test/resources/google/registry/tmch/revoked/smd/Trademark-Agent-Arab-Revoked.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/revoked/smd/Trademark-Agent-Chinese-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/Trademark-Agent-Chinese-Revoked.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/revoked/smd/Trademark-Agent-Chinese-Revoked.smd rename to core/src/test/resources/google/registry/tmch/revoked/smd/Trademark-Agent-Chinese-Revoked.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/revoked/smd/Trademark-Agent-English-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/Trademark-Agent-English-Revoked.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/revoked/smd/Trademark-Agent-English-Revoked.smd rename to core/src/test/resources/google/registry/tmch/revoked/smd/Trademark-Agent-English-Revoked.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/revoked/smd/Trademark-Agent-French-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/Trademark-Agent-French-Revoked.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/revoked/smd/Trademark-Agent-French-Revoked.smd rename to core/src/test/resources/google/registry/tmch/revoked/smd/Trademark-Agent-French-Revoked.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/revoked/smd/Trademark-Agent-Russian-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/Trademark-Agent-Russian-Revoked.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/revoked/smd/Trademark-Agent-Russian-Revoked.smd rename to core/src/test/resources/google/registry/tmch/revoked/smd/Trademark-Agent-Russian-Revoked.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/revoked/smd/Trademark-Holder-Arab-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/Trademark-Holder-Arab-Revoked.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/revoked/smd/Trademark-Holder-Arab-Revoked.smd rename to core/src/test/resources/google/registry/tmch/revoked/smd/Trademark-Holder-Arab-Revoked.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/revoked/smd/Trademark-Holder-Chinese-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/Trademark-Holder-Chinese-Revoked.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/revoked/smd/Trademark-Holder-Chinese-Revoked.smd rename to core/src/test/resources/google/registry/tmch/revoked/smd/Trademark-Holder-Chinese-Revoked.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/revoked/smd/Trademark-Holder-English-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/Trademark-Holder-English-Revoked.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/revoked/smd/Trademark-Holder-English-Revoked.smd rename to core/src/test/resources/google/registry/tmch/revoked/smd/Trademark-Holder-English-Revoked.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/revoked/smd/Trademark-Holder-French-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/Trademark-Holder-French-Revoked.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/revoked/smd/Trademark-Holder-French-Revoked.smd rename to core/src/test/resources/google/registry/tmch/revoked/smd/Trademark-Holder-French-Revoked.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/revoked/smd/Trademark-Holder-Russian-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/Trademark-Holder-Russian-Revoked.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/revoked/smd/Trademark-Holder-Russian-Revoked.smd rename to core/src/test/resources/google/registry/tmch/revoked/smd/Trademark-Holder-Russian-Revoked.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Agent-Arab-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/TreatyStatute-Agent-Arab-Revoked.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Agent-Arab-Revoked.smd rename to core/src/test/resources/google/registry/tmch/revoked/smd/TreatyStatute-Agent-Arab-Revoked.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Agent-Chinese-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/TreatyStatute-Agent-Chinese-Revoked.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Agent-Chinese-Revoked.smd rename to core/src/test/resources/google/registry/tmch/revoked/smd/TreatyStatute-Agent-Chinese-Revoked.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Agent-English-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/TreatyStatute-Agent-English-Revoked.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Agent-English-Revoked.smd rename to core/src/test/resources/google/registry/tmch/revoked/smd/TreatyStatute-Agent-English-Revoked.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Agent-French-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/TreatyStatute-Agent-French-Revoked.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Agent-French-Revoked.smd rename to core/src/test/resources/google/registry/tmch/revoked/smd/TreatyStatute-Agent-French-Revoked.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Agent-Russian-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/TreatyStatute-Agent-Russian-Revoked.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Agent-Russian-Revoked.smd rename to core/src/test/resources/google/registry/tmch/revoked/smd/TreatyStatute-Agent-Russian-Revoked.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Holder-Arab-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/TreatyStatute-Holder-Arab-Revoked.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Holder-Arab-Revoked.smd rename to core/src/test/resources/google/registry/tmch/revoked/smd/TreatyStatute-Holder-Arab-Revoked.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Holder-Chinese-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/TreatyStatute-Holder-Chinese-Revoked.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Holder-Chinese-Revoked.smd rename to core/src/test/resources/google/registry/tmch/revoked/smd/TreatyStatute-Holder-Chinese-Revoked.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Holder-English-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/TreatyStatute-Holder-English-Revoked.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Holder-English-Revoked.smd rename to core/src/test/resources/google/registry/tmch/revoked/smd/TreatyStatute-Holder-English-Revoked.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Holder-French-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/TreatyStatute-Holder-French-Revoked.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Holder-French-Revoked.smd rename to core/src/test/resources/google/registry/tmch/revoked/smd/TreatyStatute-Holder-French-Revoked.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Holder-Russian-Revoked.smd b/core/src/test/resources/google/registry/tmch/revoked/smd/TreatyStatute-Holder-Russian-Revoked.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Holder-Russian-Revoked.smd rename to core/src/test/resources/google/registry/tmch/revoked/smd/TreatyStatute-Holder-Russian-Revoked.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-Court-Agent-French-Active.smd b/core/src/test/resources/google/registry/tmch/revoked/tmv/TMVRevoked-Court-Agent-French-Active.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-Court-Agent-French-Active.smd rename to core/src/test/resources/google/registry/tmch/revoked/tmv/TMVRevoked-Court-Agent-French-Active.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-Trademark-Agent-Arab-Active.smd b/core/src/test/resources/google/registry/tmch/revoked/tmv/TMVRevoked-Trademark-Agent-Arab-Active.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-Trademark-Agent-Arab-Active.smd rename to core/src/test/resources/google/registry/tmch/revoked/tmv/TMVRevoked-Trademark-Agent-Arab-Active.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-Trademark-Agent-Chinese-Active.smd b/core/src/test/resources/google/registry/tmch/revoked/tmv/TMVRevoked-Trademark-Agent-Chinese-Active.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-Trademark-Agent-Chinese-Active.smd rename to core/src/test/resources/google/registry/tmch/revoked/tmv/TMVRevoked-Trademark-Agent-Chinese-Active.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-Trademark-Agent-English-Active.smd b/core/src/test/resources/google/registry/tmch/revoked/tmv/TMVRevoked-Trademark-Agent-English-Active.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-Trademark-Agent-English-Active.smd rename to core/src/test/resources/google/registry/tmch/revoked/tmv/TMVRevoked-Trademark-Agent-English-Active.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-Trademark-Agent-French-Active.smd b/core/src/test/resources/google/registry/tmch/revoked/tmv/TMVRevoked-Trademark-Agent-French-Active.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-Trademark-Agent-French-Active.smd rename to core/src/test/resources/google/registry/tmch/revoked/tmv/TMVRevoked-Trademark-Agent-French-Active.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-Trademark-Agent-Russian-Active.smd b/core/src/test/resources/google/registry/tmch/revoked/tmv/TMVRevoked-Trademark-Agent-Russian-Active.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-Trademark-Agent-Russian-Active.smd rename to core/src/test/resources/google/registry/tmch/revoked/tmv/TMVRevoked-Trademark-Agent-Russian-Active.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-TreatyStatute-Agent-Chinese-Active.smd b/core/src/test/resources/google/registry/tmch/revoked/tmv/TMVRevoked-TreatyStatute-Agent-Chinese-Active.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-TreatyStatute-Agent-Chinese-Active.smd rename to core/src/test/resources/google/registry/tmch/revoked/tmv/TMVRevoked-TreatyStatute-Agent-Chinese-Active.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-TreatyStatute-Agent-English-Active.smd b/core/src/test/resources/google/registry/tmch/revoked/tmv/TMVRevoked-TreatyStatute-Agent-English-Active.smd similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-TreatyStatute-Agent-English-Active.smd rename to core/src/test/resources/google/registry/tmch/revoked/tmv/TMVRevoked-TreatyStatute-Agent-English-Active.smd diff --git a/core/src/test/java/google/registry/tmch/testdata/smdrl-latest.csv b/core/src/test/resources/google/registry/tmch/smdrl-latest.csv similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/smdrl-latest.csv rename to core/src/test/resources/google/registry/tmch/smdrl-latest.csv diff --git a/core/src/test/java/google/registry/tmch/testdata/smdrl-latest.sig b/core/src/test/resources/google/registry/tmch/smdrl-latest.sig similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/smdrl-latest.sig rename to core/src/test/resources/google/registry/tmch/smdrl-latest.sig diff --git a/core/src/test/java/google/registry/tmch/testdata/tmch_test_smd_revocation_list.csv b/core/src/test/resources/google/registry/tmch/tmch_test_smd_revocation_list.csv similarity index 100% rename from core/src/test/java/google/registry/tmch/testdata/tmch_test_smd_revocation_list.csv rename to core/src/test/resources/google/registry/tmch/tmch_test_smd_revocation_list.csv diff --git a/core/src/test/java/google/registry/tools/testdata/example_invalid_premium_terms.csv b/core/src/test/resources/google/registry/tools/example_invalid_premium_terms.csv similarity index 100% rename from core/src/test/java/google/registry/tools/testdata/example_invalid_premium_terms.csv rename to core/src/test/resources/google/registry/tools/example_invalid_premium_terms.csv diff --git a/core/src/test/java/google/registry/tools/testdata/example_premium_terms.csv b/core/src/test/resources/google/registry/tools/example_premium_terms.csv similarity index 100% rename from core/src/test/java/google/registry/tools/testdata/example_premium_terms.csv rename to core/src/test/resources/google/registry/tools/example_premium_terms.csv diff --git a/core/src/test/java/google/registry/tools/testdata/example_reserved_terms.csv b/core/src/test/resources/google/registry/tools/example_reserved_terms.csv similarity index 100% rename from core/src/test/java/google/registry/tools/testdata/example_reserved_terms.csv rename to core/src/test/resources/google/registry/tools/example_reserved_terms.csv diff --git a/core/src/test/java/google/registry/tools/server/testdata/contact_create.xml b/core/src/test/resources/google/registry/tools/server/contact_create.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/contact_create.xml rename to core/src/test/resources/google/registry/tools/server/contact_create.xml diff --git a/core/src/test/java/google/registry/tools/server/testdata/contact_create_complete.xml b/core/src/test/resources/google/registry/tools/server/contact_create_complete.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/contact_create_complete.xml rename to core/src/test/resources/google/registry/tools/server/contact_create_complete.xml diff --git a/core/src/test/java/google/registry/tools/server/testdata/contact_create_minimal.xml b/core/src/test/resources/google/registry/tools/server/contact_create_minimal.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/contact_create_minimal.xml rename to core/src/test/resources/google/registry/tools/server/contact_create_minimal.xml diff --git a/core/src/test/java/google/registry/tools/server/testdata/domain_check.xml b/core/src/test/resources/google/registry/tools/server/domain_check.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/domain_check.xml rename to core/src/test/resources/google/registry/tools/server/domain_check.xml diff --git a/core/src/test/java/google/registry/tools/server/testdata/domain_check_claims.xml b/core/src/test/resources/google/registry/tools/server/domain_check_claims.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/domain_check_claims.xml rename to core/src/test/resources/google/registry/tools/server/domain_check_claims.xml diff --git a/core/src/test/java/google/registry/tools/server/testdata/domain_check_claims_multiple.xml b/core/src/test/resources/google/registry/tools/server/domain_check_claims_multiple.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/domain_check_claims_multiple.xml rename to core/src/test/resources/google/registry/tools/server/domain_check_claims_multiple.xml diff --git a/core/src/test/java/google/registry/tools/server/testdata/domain_check_claims_second_tld.xml b/core/src/test/resources/google/registry/tools/server/domain_check_claims_second_tld.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/domain_check_claims_second_tld.xml rename to core/src/test/resources/google/registry/tools/server/domain_check_claims_second_tld.xml diff --git a/core/src/test/java/google/registry/tools/server/testdata/domain_check_fee.xml b/core/src/test/resources/google/registry/tools/server/domain_check_fee.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/domain_check_fee.xml rename to core/src/test/resources/google/registry/tools/server/domain_check_fee.xml diff --git a/core/src/test/java/google/registry/tools/server/testdata/domain_check_fee_multiple.xml b/core/src/test/resources/google/registry/tools/server/domain_check_fee_multiple.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/domain_check_fee_multiple.xml rename to core/src/test/resources/google/registry/tools/server/domain_check_fee_multiple.xml diff --git a/core/src/test/java/google/registry/tools/server/testdata/domain_check_fee_second_tld.xml b/core/src/test/resources/google/registry/tools/server/domain_check_fee_second_tld.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/domain_check_fee_second_tld.xml rename to core/src/test/resources/google/registry/tools/server/domain_check_fee_second_tld.xml diff --git a/core/src/test/java/google/registry/tools/server/testdata/domain_create_anchor_tenant.xml b/core/src/test/resources/google/registry/tools/server/domain_create_anchor_tenant.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/domain_create_anchor_tenant.xml rename to core/src/test/resources/google/registry/tools/server/domain_create_anchor_tenant.xml diff --git a/core/src/test/java/google/registry/tools/server/testdata/domain_create_anchor_tenant_fee_premium.xml b/core/src/test/resources/google/registry/tools/server/domain_create_anchor_tenant_fee_premium.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/domain_create_anchor_tenant_fee_premium.xml rename to core/src/test/resources/google/registry/tools/server/domain_create_anchor_tenant_fee_premium.xml diff --git a/core/src/test/java/google/registry/tools/server/testdata/domain_create_anchor_tenant_fee_standard.xml b/core/src/test/resources/google/registry/tools/server/domain_create_anchor_tenant_fee_standard.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/domain_create_anchor_tenant_fee_standard.xml rename to core/src/test/resources/google/registry/tools/server/domain_create_anchor_tenant_fee_standard.xml diff --git a/core/src/test/java/google/registry/tools/server/testdata/domain_create_anchor_tenant_multiple_word_reason.xml b/core/src/test/resources/google/registry/tools/server/domain_create_anchor_tenant_multiple_word_reason.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/domain_create_anchor_tenant_multiple_word_reason.xml rename to core/src/test/resources/google/registry/tools/server/domain_create_anchor_tenant_multiple_word_reason.xml diff --git a/core/src/test/java/google/registry/tools/server/testdata/domain_create_anchor_tenant_no_reason.xml b/core/src/test/resources/google/registry/tools/server/domain_create_anchor_tenant_no_reason.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/domain_create_anchor_tenant_no_reason.xml rename to core/src/test/resources/google/registry/tools/server/domain_create_anchor_tenant_no_reason.xml diff --git a/core/src/test/java/google/registry/tools/server/testdata/domain_create_anchor_tenant_password.xml b/core/src/test/resources/google/registry/tools/server/domain_create_anchor_tenant_password.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/domain_create_anchor_tenant_password.xml rename to core/src/test/resources/google/registry/tools/server/domain_create_anchor_tenant_password.xml diff --git a/core/src/test/java/google/registry/tools/server/testdata/domain_create_complete.xml b/core/src/test/resources/google/registry/tools/server/domain_create_complete.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/domain_create_complete.xml rename to core/src/test/resources/google/registry/tools/server/domain_create_complete.xml diff --git a/core/src/test/java/google/registry/tools/server/testdata/domain_create_minimal.xml b/core/src/test/resources/google/registry/tools/server/domain_create_minimal.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/domain_create_minimal.xml rename to core/src/test/resources/google/registry/tools/server/domain_create_minimal.xml diff --git a/core/src/test/java/google/registry/tools/server/testdata/domain_create_minimal_abc.xml b/core/src/test/resources/google/registry/tools/server/domain_create_minimal_abc.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/domain_create_minimal_abc.xml rename to core/src/test/resources/google/registry/tools/server/domain_create_minimal_abc.xml diff --git a/core/src/test/java/google/registry/tools/server/testdata/domain_create_palladium.xml b/core/src/test/resources/google/registry/tools/server/domain_create_palladium.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/domain_create_palladium.xml rename to core/src/test/resources/google/registry/tools/server/domain_create_palladium.xml diff --git a/core/src/test/java/google/registry/tools/server/testdata/domain_create_parajiumu_3yrs.xml b/core/src/test/resources/google/registry/tools/server/domain_create_parajiumu_3yrs.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/domain_create_parajiumu_3yrs.xml rename to core/src/test/resources/google/registry/tools/server/domain_create_parajiumu_3yrs.xml diff --git a/core/src/test/java/google/registry/tools/server/testdata/domain_delete.xml b/core/src/test/resources/google/registry/tools/server/domain_delete.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/domain_delete.xml rename to core/src/test/resources/google/registry/tools/server/domain_delete.xml diff --git a/core/src/test/java/google/registry/tools/server/testdata/domain_delete_by_registrar.xml b/core/src/test/resources/google/registry/tools/server/domain_delete_by_registrar.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/domain_delete_by_registrar.xml rename to core/src/test/resources/google/registry/tools/server/domain_delete_by_registrar.xml diff --git a/core/src/test/java/google/registry/tools/server/testdata/domain_delete_immediately.xml b/core/src/test/resources/google/registry/tools/server/domain_delete_immediately.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/domain_delete_immediately.xml rename to core/src/test/resources/google/registry/tools/server/domain_delete_immediately.xml diff --git a/core/src/test/java/google/registry/tools/server/testdata/domain_delete_multiple_word_reason.xml b/core/src/test/resources/google/registry/tools/server/domain_delete_multiple_word_reason.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/domain_delete_multiple_word_reason.xml rename to core/src/test/resources/google/registry/tools/server/domain_delete_multiple_word_reason.xml diff --git a/core/src/test/java/google/registry/tools/server/testdata/domain_lock.xml b/core/src/test/resources/google/registry/tools/server/domain_lock.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/domain_lock.xml rename to core/src/test/resources/google/registry/tools/server/domain_lock.xml diff --git a/core/src/test/java/google/registry/tools/server/testdata/domain_lock_partial_statuses.xml b/core/src/test/resources/google/registry/tools/server/domain_lock_partial_statuses.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/domain_lock_partial_statuses.xml rename to core/src/test/resources/google/registry/tools/server/domain_lock_partial_statuses.xml diff --git a/core/src/test/java/google/registry/tools/server/testdata/domain_renew.xml b/core/src/test/resources/google/registry/tools/server/domain_renew.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/domain_renew.xml rename to core/src/test/resources/google/registry/tools/server/domain_renew.xml diff --git a/core/src/test/java/google/registry/tools/server/testdata/domain_unlock.xml b/core/src/test/resources/google/registry/tools/server/domain_unlock.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/domain_unlock.xml rename to core/src/test/resources/google/registry/tools/server/domain_unlock.xml diff --git a/core/src/test/java/google/registry/tools/server/testdata/domain_unlock_partial_statuses.xml b/core/src/test/resources/google/registry/tools/server/domain_unlock_partial_statuses.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/domain_unlock_partial_statuses.xml rename to core/src/test/resources/google/registry/tools/server/domain_unlock_partial_statuses.xml diff --git a/core/src/test/java/google/registry/tools/server/testdata/domain_update_add.xml b/core/src/test/resources/google/registry/tools/server/domain_update_add.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/domain_update_add.xml rename to core/src/test/resources/google/registry/tools/server/domain_update_add.xml diff --git a/core/src/test/java/google/registry/tools/server/testdata/domain_update_add_two_hosts_remove_one.xml b/core/src/test/resources/google/registry/tools/server/domain_update_add_two_hosts_remove_one.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/domain_update_add_two_hosts_remove_one.xml rename to core/src/test/resources/google/registry/tools/server/domain_update_add_two_hosts_remove_one.xml diff --git a/core/src/test/java/google/registry/tools/server/testdata/domain_update_change.xml b/core/src/test/resources/google/registry/tools/server/domain_update_change.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/domain_update_change.xml rename to core/src/test/resources/google/registry/tools/server/domain_update_change.xml diff --git a/core/src/test/java/google/registry/tools/server/testdata/domain_update_clear_ds_records.xml b/core/src/test/resources/google/registry/tools/server/domain_update_clear_ds_records.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/domain_update_clear_ds_records.xml rename to core/src/test/resources/google/registry/tools/server/domain_update_clear_ds_records.xml diff --git a/core/src/test/java/google/registry/tools/server/testdata/domain_update_complete.xml b/core/src/test/resources/google/registry/tools/server/domain_update_complete.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/domain_update_complete.xml rename to core/src/test/resources/google/registry/tools/server/domain_update_complete.xml diff --git a/core/src/test/java/google/registry/tools/server/testdata/domain_update_complete_abc.xml b/core/src/test/resources/google/registry/tools/server/domain_update_complete_abc.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/domain_update_complete_abc.xml rename to core/src/test/resources/google/registry/tools/server/domain_update_complete_abc.xml diff --git a/core/src/test/java/google/registry/tools/server/testdata/domain_update_remove.xml b/core/src/test/resources/google/registry/tools/server/domain_update_remove.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/domain_update_remove.xml rename to core/src/test/resources/google/registry/tools/server/domain_update_remove.xml diff --git a/core/src/test/java/google/registry/tools/server/testdata/domain_update_set_contacts.xml b/core/src/test/resources/google/registry/tools/server/domain_update_set_contacts.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/domain_update_set_contacts.xml rename to core/src/test/resources/google/registry/tools/server/domain_update_set_contacts.xml diff --git a/core/src/test/java/google/registry/tools/server/testdata/domain_update_set_ds_records.xml b/core/src/test/resources/google/registry/tools/server/domain_update_set_ds_records.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/domain_update_set_ds_records.xml rename to core/src/test/resources/google/registry/tools/server/domain_update_set_ds_records.xml diff --git a/core/src/test/java/google/registry/tools/server/testdata/domain_update_set_nameservers.xml b/core/src/test/resources/google/registry/tools/server/domain_update_set_nameservers.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/domain_update_set_nameservers.xml rename to core/src/test/resources/google/registry/tools/server/domain_update_set_nameservers.xml diff --git a/core/src/test/java/google/registry/tools/server/testdata/domain_update_set_statuses.xml b/core/src/test/resources/google/registry/tools/server/domain_update_set_statuses.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/domain_update_set_statuses.xml rename to core/src/test/resources/google/registry/tools/server/domain_update_set_statuses.xml diff --git a/core/src/test/java/google/registry/tools/server/testdata/host_create_complete.xml b/core/src/test/resources/google/registry/tools/server/host_create_complete.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/host_create_complete.xml rename to core/src/test/resources/google/registry/tools/server/host_create_complete.xml diff --git a/core/src/test/java/google/registry/tools/server/testdata/host_create_minimal.xml b/core/src/test/resources/google/registry/tools/server/host_create_minimal.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/host_create_minimal.xml rename to core/src/test/resources/google/registry/tools/server/host_create_minimal.xml diff --git a/core/src/test/java/google/registry/tools/server/testdata/host_delete.xml b/core/src/test/resources/google/registry/tools/server/host_delete.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/host_delete.xml rename to core/src/test/resources/google/registry/tools/server/host_delete.xml diff --git a/core/src/test/java/google/registry/tools/server/testdata/host_delete_by_registrar.xml b/core/src/test/resources/google/registry/tools/server/host_delete_by_registrar.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/host_delete_by_registrar.xml rename to core/src/test/resources/google/registry/tools/server/host_delete_by_registrar.xml diff --git a/core/src/test/java/google/registry/tools/server/testdata/host_delete_multiple_word_reason.xml b/core/src/test/resources/google/registry/tools/server/host_delete_multiple_word_reason.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/host_delete_multiple_word_reason.xml rename to core/src/test/resources/google/registry/tools/server/host_delete_multiple_word_reason.xml diff --git a/core/src/test/java/google/registry/tools/server/testdata/tld.zone b/core/src/test/resources/google/registry/tools/server/tld.zone similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/tld.zone rename to core/src/test/resources/google/registry/tools/server/tld.zone diff --git a/core/src/test/java/google/registry/tools/server/testdata/uniform_rapid_suspension.xml b/core/src/test/resources/google/registry/tools/server/uniform_rapid_suspension.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/uniform_rapid_suspension.xml rename to core/src/test/resources/google/registry/tools/server/uniform_rapid_suspension.xml diff --git a/core/src/test/java/google/registry/tools/server/testdata/uniform_rapid_suspension_existing_host.xml b/core/src/test/resources/google/registry/tools/server/uniform_rapid_suspension_existing_host.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/uniform_rapid_suspension_existing_host.xml rename to core/src/test/resources/google/registry/tools/server/uniform_rapid_suspension_existing_host.xml diff --git a/core/src/test/java/google/registry/tools/server/testdata/uniform_rapid_suspension_undo.xml b/core/src/test/resources/google/registry/tools/server/uniform_rapid_suspension_undo.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/uniform_rapid_suspension_undo.xml rename to core/src/test/resources/google/registry/tools/server/uniform_rapid_suspension_undo.xml diff --git a/core/src/test/java/google/registry/tools/server/testdata/uniform_rapid_suspension_undo_preserve.xml b/core/src/test/resources/google/registry/tools/server/uniform_rapid_suspension_undo_preserve.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/uniform_rapid_suspension_undo_preserve.xml rename to core/src/test/resources/google/registry/tools/server/uniform_rapid_suspension_undo_preserve.xml diff --git a/core/src/test/java/google/registry/tools/server/testdata/update_server_locks_apply_all.xml b/core/src/test/resources/google/registry/tools/server/update_server_locks_apply_all.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/update_server_locks_apply_all.xml rename to core/src/test/resources/google/registry/tools/server/update_server_locks_apply_all.xml diff --git a/core/src/test/java/google/registry/tools/server/testdata/update_server_locks_apply_one.xml b/core/src/test/resources/google/registry/tools/server/update_server_locks_apply_one.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/update_server_locks_apply_one.xml rename to core/src/test/resources/google/registry/tools/server/update_server_locks_apply_one.xml diff --git a/core/src/test/java/google/registry/tools/server/testdata/update_server_locks_multiple_word_reason.xml b/core/src/test/resources/google/registry/tools/server/update_server_locks_multiple_word_reason.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/update_server_locks_multiple_word_reason.xml rename to core/src/test/resources/google/registry/tools/server/update_server_locks_multiple_word_reason.xml diff --git a/core/src/test/java/google/registry/tools/server/testdata/update_server_locks_remove_all.xml b/core/src/test/resources/google/registry/tools/server/update_server_locks_remove_all.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/update_server_locks_remove_all.xml rename to core/src/test/resources/google/registry/tools/server/update_server_locks_remove_all.xml diff --git a/core/src/test/java/google/registry/tools/server/testdata/update_server_locks_remove_one.xml b/core/src/test/resources/google/registry/tools/server/update_server_locks_remove_one.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/update_server_locks_remove_one.xml rename to core/src/test/resources/google/registry/tools/server/update_server_locks_remove_one.xml diff --git a/core/src/test/java/google/registry/tools/server/testdata/xn--q9jyb4c_2010-10-17_full_S1_R0.xml b/core/src/test/resources/google/registry/tools/server/xn--q9jyb4c_2010-10-17_full_S1_R0.xml similarity index 100% rename from core/src/test/java/google/registry/tools/server/testdata/xn--q9jyb4c_2010-10-17_full_S1_R0.xml rename to core/src/test/resources/google/registry/tools/server/xn--q9jyb4c_2010-10-17_full_S1_R0.xml diff --git a/core/src/test/java/google/registry/ui/server/registrar/testdata/update_registrar.json b/core/src/test/resources/google/registry/ui/server/registrar/update_registrar.json similarity index 100% rename from core/src/test/java/google/registry/ui/server/registrar/testdata/update_registrar.json rename to core/src/test/resources/google/registry/ui/server/registrar/update_registrar.json diff --git a/core/src/test/java/google/registry/ui/server/registrar/testdata/update_registrar_duplicate_contacts.json b/core/src/test/resources/google/registry/ui/server/registrar/update_registrar_duplicate_contacts.json similarity index 100% rename from core/src/test/java/google/registry/ui/server/registrar/testdata/update_registrar_duplicate_contacts.json rename to core/src/test/resources/google/registry/ui/server/registrar/update_registrar_duplicate_contacts.json diff --git a/core/src/test/java/google/registry/ui/server/registrar/testdata/update_registrar_email.txt b/core/src/test/resources/google/registry/ui/server/registrar/update_registrar_email.txt similarity index 100% rename from core/src/test/java/google/registry/ui/server/registrar/testdata/update_registrar_email.txt rename to core/src/test/resources/google/registry/ui/server/registrar/update_registrar_email.txt diff --git a/core/src/test/java/google/registry/whois/testdata/whois_action_domain.txt b/core/src/test/resources/google/registry/whois/whois_action_domain.txt similarity index 100% rename from core/src/test/java/google/registry/whois/testdata/whois_action_domain.txt rename to core/src/test/resources/google/registry/whois/whois_action_domain.txt diff --git a/core/src/test/java/google/registry/whois/testdata/whois_action_domain_not_found.txt b/core/src/test/resources/google/registry/whois/whois_action_domain_not_found.txt similarity index 100% rename from core/src/test/java/google/registry/whois/testdata/whois_action_domain_not_found.txt rename to core/src/test/resources/google/registry/whois/whois_action_domain_not_found.txt diff --git a/core/src/test/java/google/registry/whois/testdata/whois_action_idn_punycode.txt b/core/src/test/resources/google/registry/whois/whois_action_idn_punycode.txt similarity index 100% rename from core/src/test/java/google/registry/whois/testdata/whois_action_idn_punycode.txt rename to core/src/test/resources/google/registry/whois/whois_action_idn_punycode.txt diff --git a/core/src/test/java/google/registry/whois/testdata/whois_action_idn_utf8.txt b/core/src/test/resources/google/registry/whois/whois_action_idn_utf8.txt similarity index 100% rename from core/src/test/java/google/registry/whois/testdata/whois_action_idn_utf8.txt rename to core/src/test/resources/google/registry/whois/whois_action_idn_utf8.txt diff --git a/core/src/test/java/google/registry/whois/testdata/whois_action_ip_not_found.txt b/core/src/test/resources/google/registry/whois/whois_action_ip_not_found.txt similarity index 100% rename from core/src/test/java/google/registry/whois/testdata/whois_action_ip_not_found.txt rename to core/src/test/resources/google/registry/whois/whois_action_ip_not_found.txt diff --git a/core/src/test/java/google/registry/whois/testdata/whois_action_malformed_path.txt b/core/src/test/resources/google/registry/whois/whois_action_malformed_path.txt similarity index 100% rename from core/src/test/java/google/registry/whois/testdata/whois_action_malformed_path.txt rename to core/src/test/resources/google/registry/whois/whois_action_malformed_path.txt diff --git a/core/src/test/java/google/registry/whois/testdata/whois_action_nameserver.txt b/core/src/test/resources/google/registry/whois/whois_action_nameserver.txt similarity index 100% rename from core/src/test/java/google/registry/whois/testdata/whois_action_nameserver.txt rename to core/src/test/resources/google/registry/whois/whois_action_nameserver.txt diff --git a/core/src/test/java/google/registry/whois/testdata/whois_action_nameserver_not_found.txt b/core/src/test/resources/google/registry/whois/whois_action_nameserver_not_found.txt similarity index 100% rename from core/src/test/java/google/registry/whois/testdata/whois_action_nameserver_not_found.txt rename to core/src/test/resources/google/registry/whois/whois_action_nameserver_not_found.txt diff --git a/core/src/test/java/google/registry/whois/testdata/whois_action_no_command.txt b/core/src/test/resources/google/registry/whois/whois_action_no_command.txt similarity index 100% rename from core/src/test/java/google/registry/whois/testdata/whois_action_no_command.txt rename to core/src/test/resources/google/registry/whois/whois_action_no_command.txt diff --git a/core/src/test/java/google/registry/whois/testdata/whois_action_registrar.txt b/core/src/test/resources/google/registry/whois/whois_action_registrar.txt similarity index 100% rename from core/src/test/java/google/registry/whois/testdata/whois_action_registrar.txt rename to core/src/test/resources/google/registry/whois/whois_action_registrar.txt diff --git a/core/src/test/java/google/registry/whois/testdata/whois_action_registrar_not_found.txt b/core/src/test/resources/google/registry/whois/whois_action_registrar_not_found.txt similarity index 100% rename from core/src/test/java/google/registry/whois/testdata/whois_action_registrar_not_found.txt rename to core/src/test/resources/google/registry/whois/whois_action_registrar_not_found.txt diff --git a/core/src/test/java/google/registry/whois/testdata/whois_action_transferred_domain.txt b/core/src/test/resources/google/registry/whois/whois_action_transferred_domain.txt similarity index 100% rename from core/src/test/java/google/registry/whois/testdata/whois_action_transferred_domain.txt rename to core/src/test/resources/google/registry/whois/whois_action_transferred_domain.txt diff --git a/core/src/test/java/google/registry/whois/testdata/whois_domain.txt b/core/src/test/resources/google/registry/whois/whois_domain.txt similarity index 100% rename from core/src/test/java/google/registry/whois/testdata/whois_domain.txt rename to core/src/test/resources/google/registry/whois/whois_domain.txt diff --git a/core/src/test/java/google/registry/whois/testdata/whois_domain_full_output.txt b/core/src/test/resources/google/registry/whois/whois_domain_full_output.txt similarity index 100% rename from core/src/test/java/google/registry/whois/testdata/whois_domain_full_output.txt rename to core/src/test/resources/google/registry/whois/whois_domain_full_output.txt diff --git a/core/src/test/java/google/registry/whois/testdata/whois_domain_registrar_abuse_info_missing.txt b/core/src/test/resources/google/registry/whois/whois_domain_registrar_abuse_info_missing.txt similarity index 100% rename from core/src/test/java/google/registry/whois/testdata/whois_domain_registrar_abuse_info_missing.txt rename to core/src/test/resources/google/registry/whois/whois_domain_registrar_abuse_info_missing.txt diff --git a/core/src/test/java/google/registry/whois/testdata/whois_multiple_nameservers.txt b/core/src/test/resources/google/registry/whois/whois_multiple_nameservers.txt similarity index 100% rename from core/src/test/java/google/registry/whois/testdata/whois_multiple_nameservers.txt rename to core/src/test/resources/google/registry/whois/whois_multiple_nameservers.txt diff --git a/core/src/test/java/google/registry/whois/testdata/whois_nameserver.txt b/core/src/test/resources/google/registry/whois/whois_nameserver.txt similarity index 100% rename from core/src/test/java/google/registry/whois/testdata/whois_nameserver.txt rename to core/src/test/resources/google/registry/whois/whois_nameserver.txt diff --git a/core/src/test/java/google/registry/whois/testdata/whois_registrar.txt b/core/src/test/resources/google/registry/whois/whois_registrar.txt similarity index 100% rename from core/src/test/java/google/registry/whois/testdata/whois_registrar.txt rename to core/src/test/resources/google/registry/whois/whois_registrar.txt diff --git a/core/src/test/java/google/registry/xjc/testdata/contact_check.xml b/core/src/test/resources/google/registry/xjc/contact_check.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/contact_check.xml rename to core/src/test/resources/google/registry/xjc/contact_check.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/contact_check_response.xml b/core/src/test/resources/google/registry/xjc/contact_check_response.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/contact_check_response.xml rename to core/src/test/resources/google/registry/xjc/contact_check_response.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/contact_create.xml b/core/src/test/resources/google/registry/xjc/contact_create.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/contact_create.xml rename to core/src/test/resources/google/registry/xjc/contact_create.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/contact_create_response.xml b/core/src/test/resources/google/registry/xjc/contact_create_response.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/contact_create_response.xml rename to core/src/test/resources/google/registry/xjc/contact_create_response.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/contact_create_response_offline_review.xml b/core/src/test/resources/google/registry/xjc/contact_create_response_offline_review.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/contact_create_response_offline_review.xml rename to core/src/test/resources/google/registry/xjc/contact_create_response_offline_review.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/contact_create_response_offline_review_completed.xml b/core/src/test/resources/google/registry/xjc/contact_create_response_offline_review_completed.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/contact_create_response_offline_review_completed.xml rename to core/src/test/resources/google/registry/xjc/contact_create_response_offline_review_completed.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/contact_delete.xml b/core/src/test/resources/google/registry/xjc/contact_delete.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/contact_delete.xml rename to core/src/test/resources/google/registry/xjc/contact_delete.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/contact_delete_response.xml b/core/src/test/resources/google/registry/xjc/contact_delete_response.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/contact_delete_response.xml rename to core/src/test/resources/google/registry/xjc/contact_delete_response.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/contact_info.xml b/core/src/test/resources/google/registry/xjc/contact_info.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/contact_info.xml rename to core/src/test/resources/google/registry/xjc/contact_info.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/contact_info_response.xml b/core/src/test/resources/google/registry/xjc/contact_info_response.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/contact_info_response.xml rename to core/src/test/resources/google/registry/xjc/contact_info_response.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/contact_transfer_query.xml b/core/src/test/resources/google/registry/xjc/contact_transfer_query.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/contact_transfer_query.xml rename to core/src/test/resources/google/registry/xjc/contact_transfer_query.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/contact_transfer_query_response.xml b/core/src/test/resources/google/registry/xjc/contact_transfer_query_response.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/contact_transfer_query_response.xml rename to core/src/test/resources/google/registry/xjc/contact_transfer_query_response.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/contact_transfer_request.xml b/core/src/test/resources/google/registry/xjc/contact_transfer_request.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/contact_transfer_request.xml rename to core/src/test/resources/google/registry/xjc/contact_transfer_request.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/contact_transfer_request_response.xml b/core/src/test/resources/google/registry/xjc/contact_transfer_request_response.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/contact_transfer_request_response.xml rename to core/src/test/resources/google/registry/xjc/contact_transfer_request_response.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/contact_update.xml b/core/src/test/resources/google/registry/xjc/contact_update.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/contact_update.xml rename to core/src/test/resources/google/registry/xjc/contact_update.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/domain_check.xml b/core/src/test/resources/google/registry/xjc/domain_check.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/domain_check.xml rename to core/src/test/resources/google/registry/xjc/domain_check.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/domain_check_response.xml b/core/src/test/resources/google/registry/xjc/domain_check_response.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/domain_check_response.xml rename to core/src/test/resources/google/registry/xjc/domain_check_response.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/domain_create.xml b/core/src/test/resources/google/registry/xjc/domain_create.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/domain_create.xml rename to core/src/test/resources/google/registry/xjc/domain_create.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/domain_create_response.xml b/core/src/test/resources/google/registry/xjc/domain_create_response.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/domain_create_response.xml rename to core/src/test/resources/google/registry/xjc/domain_create_response.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/domain_create_response_offline_review.xml b/core/src/test/resources/google/registry/xjc/domain_create_response_offline_review.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/domain_create_response_offline_review.xml rename to core/src/test/resources/google/registry/xjc/domain_create_response_offline_review.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/domain_create_response_offline_review_completed.xml b/core/src/test/resources/google/registry/xjc/domain_create_response_offline_review_completed.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/domain_create_response_offline_review_completed.xml rename to core/src/test/resources/google/registry/xjc/domain_create_response_offline_review_completed.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/domain_delete.xml b/core/src/test/resources/google/registry/xjc/domain_delete.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/domain_delete.xml rename to core/src/test/resources/google/registry/xjc/domain_delete.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/domain_info.xml b/core/src/test/resources/google/registry/xjc/domain_info.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/domain_info.xml rename to core/src/test/resources/google/registry/xjc/domain_info.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/domain_info_response.xml b/core/src/test/resources/google/registry/xjc/domain_info_response.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/domain_info_response.xml rename to core/src/test/resources/google/registry/xjc/domain_info_response.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/domain_info_response_addperiod.xml b/core/src/test/resources/google/registry/xjc/domain_info_response_addperiod.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/domain_info_response_addperiod.xml rename to core/src/test/resources/google/registry/xjc/domain_info_response_addperiod.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/domain_info_response_pendingdelete.xml b/core/src/test/resources/google/registry/xjc/domain_info_response_pendingdelete.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/domain_info_response_pendingdelete.xml rename to core/src/test/resources/google/registry/xjc/domain_info_response_pendingdelete.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/domain_info_response_pendingrestore.xml b/core/src/test/resources/google/registry/xjc/domain_info_response_pendingrestore.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/domain_info_response_pendingrestore.xml rename to core/src/test/resources/google/registry/xjc/domain_info_response_pendingrestore.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/domain_info_response_redemptionperiod.xml b/core/src/test/resources/google/registry/xjc/domain_info_response_redemptionperiod.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/domain_info_response_redemptionperiod.xml rename to core/src/test/resources/google/registry/xjc/domain_info_response_redemptionperiod.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/domain_info_response_unauthorized.xml b/core/src/test/resources/google/registry/xjc/domain_info_response_unauthorized.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/domain_info_response_unauthorized.xml rename to core/src/test/resources/google/registry/xjc/domain_info_response_unauthorized.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/domain_info_with_auth.xml b/core/src/test/resources/google/registry/xjc/domain_info_with_auth.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/domain_info_with_auth.xml rename to core/src/test/resources/google/registry/xjc/domain_info_with_auth.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/domain_renew.xml b/core/src/test/resources/google/registry/xjc/domain_renew.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/domain_renew.xml rename to core/src/test/resources/google/registry/xjc/domain_renew.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/domain_renew_response.xml b/core/src/test/resources/google/registry/xjc/domain_renew_response.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/domain_renew_response.xml rename to core/src/test/resources/google/registry/xjc/domain_renew_response.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/domain_transfer_query.xml b/core/src/test/resources/google/registry/xjc/domain_transfer_query.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/domain_transfer_query.xml rename to core/src/test/resources/google/registry/xjc/domain_transfer_query.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/domain_transfer_query_response.xml b/core/src/test/resources/google/registry/xjc/domain_transfer_query_response.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/domain_transfer_query_response.xml rename to core/src/test/resources/google/registry/xjc/domain_transfer_query_response.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/domain_transfer_request.xml b/core/src/test/resources/google/registry/xjc/domain_transfer_request.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/domain_transfer_request.xml rename to core/src/test/resources/google/registry/xjc/domain_transfer_request.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/domain_transfer_request_response.xml b/core/src/test/resources/google/registry/xjc/domain_transfer_request_response.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/domain_transfer_request_response.xml rename to core/src/test/resources/google/registry/xjc/domain_transfer_request_response.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/domain_update.xml b/core/src/test/resources/google/registry/xjc/domain_update.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/domain_update.xml rename to core/src/test/resources/google/registry/xjc/domain_update.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/domain_update_restore_report.xml b/core/src/test/resources/google/registry/xjc/domain_update_restore_report.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/domain_update_restore_report.xml rename to core/src/test/resources/google/registry/xjc/domain_update_restore_report.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/domain_update_restore_request.xml b/core/src/test/resources/google/registry/xjc/domain_update_restore_request.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/domain_update_restore_request.xml rename to core/src/test/resources/google/registry/xjc/domain_update_restore_request.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/generic_success_response.xml b/core/src/test/resources/google/registry/xjc/generic_success_response.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/generic_success_response.xml rename to core/src/test/resources/google/registry/xjc/generic_success_response.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/greeting.xml b/core/src/test/resources/google/registry/xjc/greeting.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/greeting.xml rename to core/src/test/resources/google/registry/xjc/greeting.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/host_check.xml b/core/src/test/resources/google/registry/xjc/host_check.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/host_check.xml rename to core/src/test/resources/google/registry/xjc/host_check.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/host_check_response.xml b/core/src/test/resources/google/registry/xjc/host_check_response.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/host_check_response.xml rename to core/src/test/resources/google/registry/xjc/host_check_response.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/host_create.xml b/core/src/test/resources/google/registry/xjc/host_create.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/host_create.xml rename to core/src/test/resources/google/registry/xjc/host_create.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/host_create_response.xml b/core/src/test/resources/google/registry/xjc/host_create_response.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/host_create_response.xml rename to core/src/test/resources/google/registry/xjc/host_create_response.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/host_create_response_offline_review.xml b/core/src/test/resources/google/registry/xjc/host_create_response_offline_review.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/host_create_response_offline_review.xml rename to core/src/test/resources/google/registry/xjc/host_create_response_offline_review.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/host_create_response_offline_review_complete.xml b/core/src/test/resources/google/registry/xjc/host_create_response_offline_review_complete.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/host_create_response_offline_review_complete.xml rename to core/src/test/resources/google/registry/xjc/host_create_response_offline_review_complete.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/host_delete.xml b/core/src/test/resources/google/registry/xjc/host_delete.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/host_delete.xml rename to core/src/test/resources/google/registry/xjc/host_delete.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/host_delete_response.xml b/core/src/test/resources/google/registry/xjc/host_delete_response.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/host_delete_response.xml rename to core/src/test/resources/google/registry/xjc/host_delete_response.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/host_fragment.xml b/core/src/test/resources/google/registry/xjc/host_fragment.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/host_fragment.xml rename to core/src/test/resources/google/registry/xjc/host_fragment.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/host_info.xml b/core/src/test/resources/google/registry/xjc/host_info.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/host_info.xml rename to core/src/test/resources/google/registry/xjc/host_info.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/host_info_response.xml b/core/src/test/resources/google/registry/xjc/host_info_response.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/host_info_response.xml rename to core/src/test/resources/google/registry/xjc/host_info_response.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/host_update.xml b/core/src/test/resources/google/registry/xjc/host_update.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/host_update.xml rename to core/src/test/resources/google/registry/xjc/host_update.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/invalid_greeting.xml b/core/src/test/resources/google/registry/xjc/invalid_greeting.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/invalid_greeting.xml rename to core/src/test/resources/google/registry/xjc/invalid_greeting.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/login.xml b/core/src/test/resources/google/registry/xjc/login.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/login.xml rename to core/src/test/resources/google/registry/xjc/login.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/logout.xml b/core/src/test/resources/google/registry/xjc/logout.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/logout.xml rename to core/src/test/resources/google/registry/xjc/logout.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/logout_response.xml b/core/src/test/resources/google/registry/xjc/logout_response.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/logout_response.xml rename to core/src/test/resources/google/registry/xjc/logout_response.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/poll.xml b/core/src/test/resources/google/registry/xjc/poll.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/poll.xml rename to core/src/test/resources/google/registry/xjc/poll.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/poll_ack.xml b/core/src/test/resources/google/registry/xjc/poll_ack.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/poll_ack.xml rename to core/src/test/resources/google/registry/xjc/poll_ack.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/poll_ack_response.xml b/core/src/test/resources/google/registry/xjc/poll_ack_response.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/poll_ack_response.xml rename to core/src/test/resources/google/registry/xjc/poll_ack_response.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/poll_response_empty.xml b/core/src/test/resources/google/registry/xjc/poll_response_empty.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/poll_response_empty.xml rename to core/src/test/resources/google/registry/xjc/poll_response_empty.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/poll_response_mixed.xml b/core/src/test/resources/google/registry/xjc/poll_response_mixed.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/poll_response_mixed.xml rename to core/src/test/resources/google/registry/xjc/poll_response_mixed.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/rde_deposit_differential.xml b/core/src/test/resources/google/registry/xjc/rde_deposit_differential.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/rde_deposit_differential.xml rename to core/src/test/resources/google/registry/xjc/rde_deposit_differential.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/rde_deposit_full.xml b/core/src/test/resources/google/registry/xjc/rde_deposit_full.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/rde_deposit_full.xml rename to core/src/test/resources/google/registry/xjc/rde_deposit_full.xml diff --git a/core/src/test/java/google/registry/xjc/testdata/restore_request_response.xml b/core/src/test/resources/google/registry/xjc/restore_request_response.xml similarity index 100% rename from core/src/test/java/google/registry/xjc/testdata/restore_request_response.xml rename to core/src/test/resources/google/registry/xjc/restore_request_response.xml diff --git a/core/src/test/java/google/registry/xml/testdata/simple.xml b/core/src/test/resources/google/registry/xml/simple.xml similarity index 100% rename from core/src/test/java/google/registry/xml/testdata/simple.xml rename to core/src/test/resources/google/registry/xml/simple.xml diff --git a/core/src/test/java/google/registry/xml/testdata/twoextensions_feeThenLaunch.xml b/core/src/test/resources/google/registry/xml/twoextensions_feeThenLaunch.xml similarity index 100% rename from core/src/test/java/google/registry/xml/testdata/twoextensions_feeThenLaunch.xml rename to core/src/test/resources/google/registry/xml/twoextensions_feeThenLaunch.xml diff --git a/core/src/test/java/google/registry/xml/testdata/twoextensions_feeThenLaunch2.xml b/core/src/test/resources/google/registry/xml/twoextensions_feeThenLaunch2.xml similarity index 100% rename from core/src/test/java/google/registry/xml/testdata/twoextensions_feeThenLaunch2.xml rename to core/src/test/resources/google/registry/xml/twoextensions_feeThenLaunch2.xml diff --git a/core/src/test/java/google/registry/xml/testdata/twoextensions_launchThenFee.xml b/core/src/test/resources/google/registry/xml/twoextensions_launchThenFee.xml similarity index 100% rename from core/src/test/java/google/registry/xml/testdata/twoextensions_launchThenFee.xml rename to core/src/test/resources/google/registry/xml/twoextensions_launchThenFee.xml diff --git a/proxy/src/test/java/google/registry/proxy/EppProtocolModuleTest.java b/proxy/src/test/java/google/registry/proxy/EppProtocolModuleTest.java index 5cf5a1357..71cb81570 100644 --- a/proxy/src/test/java/google/registry/proxy/EppProtocolModuleTest.java +++ b/proxy/src/test/java/google/registry/proxy/EppProtocolModuleTest.java @@ -139,7 +139,7 @@ public class EppProtocolModuleTest extends ProtocolModuleTest { // First inbound message is hello. assertThat((FullHttpRequest) channel.readInbound()).isEqualTo(makeEppHttpRequest(HELLO_BYTES)); - byte[] inputBytes = readResourceBytes(getClass(), "testdata/login.xml").read(); + byte[] inputBytes = readResourceBytes(getClass(), "login.xml").read(); // Verify inbound message is as expected. assertThat(channel.writeInbound(getByteBufFromContent(inputBytes))).isTrue(); @@ -155,8 +155,8 @@ public class EppProtocolModuleTest extends ProtocolModuleTest { // First inbound message is hello. channel.readInbound(); - byte[] inputBytes1 = readResourceBytes(getClass(), "testdata/login.xml").read(); - byte[] inputBytes2 = readResourceBytes(getClass(), "testdata/logout.xml").read(); + byte[] inputBytes1 = readResourceBytes(getClass(), "login.xml").read(); + byte[] inputBytes2 = readResourceBytes(getClass(), "logout.xml").read(); // Verify inbound messages are as expected. assertThat( @@ -177,8 +177,8 @@ public class EppProtocolModuleTest extends ProtocolModuleTest { // First inbound message is hello. channel.readInbound(); - byte[] inputBytes1 = readResourceBytes(getClass(), "testdata/login.xml").read(); - byte[] inputBytes2 = readResourceBytes(getClass(), "testdata/logout.xml").read(); + byte[] inputBytes1 = readResourceBytes(getClass(), "login.xml").read(); + byte[] inputBytes2 = readResourceBytes(getClass(), "logout.xml").read(); ByteBuf inputBuffer = Unpooled.wrappedBuffer( getByteBufFromContent(inputBytes1), getByteBufFromContent(inputBytes2)); @@ -205,7 +205,7 @@ public class EppProtocolModuleTest extends ProtocolModuleTest { // First inbound message is hello. channel.readInbound(); - byte[] outputBytes = readResourceBytes(getClass(), "testdata/login_response.xml").read(); + byte[] outputBytes = readResourceBytes(getClass(), "login_response.xml").read(); // Verify outbound message is as expected. assertThat(channel.writeOutbound(makeEppHttpResponse(outputBytes))).isTrue(); @@ -221,7 +221,7 @@ public class EppProtocolModuleTest extends ProtocolModuleTest { // First inbound message is hello. channel.readInbound(); - byte[] outputBytes = readResourceBytes(getClass(), "testdata/login_response.xml").read(); + byte[] outputBytes = readResourceBytes(getClass(), "login_response.xml").read(); // Verify outbound message is not written to the peer as the response is not OK. EncoderException thrown = @@ -243,7 +243,7 @@ public class EppProtocolModuleTest extends ProtocolModuleTest { // First inbound message is hello. channel.readInbound(); - byte[] outputBytes1 = readResourceBytes(getClass(), "testdata/login_response.xml").read(); + byte[] outputBytes1 = readResourceBytes(getClass(), "login_response.xml").read(); Cookie cookie1 = new DefaultCookie("name1", "value1"); Cookie cookie2 = new DefaultCookie("name2", "value2"); @@ -252,13 +252,13 @@ public class EppProtocolModuleTest extends ProtocolModuleTest { assertBufferRepresentsContent(getAllOutboundFrames(channel), outputBytes1); // Verify inbound message contains cookies. - byte[] inputBytes1 = readResourceBytes(getClass(), "testdata/logout.xml").read(); + byte[] inputBytes1 = readResourceBytes(getClass(), "logout.xml").read(); assertThat(channel.writeInbound(getByteBufFromContent(inputBytes1))).isTrue(); assertThat((FullHttpRequest) channel.readInbound()) .isEqualTo(makeEppHttpRequest(inputBytes1, cookie1, cookie2)); // Second outbound message change cookies. - byte[] outputBytes2 = readResourceBytes(getClass(), "testdata/logout_response.xml").read(); + byte[] outputBytes2 = readResourceBytes(getClass(), "logout_response.xml").read(); Cookie cookie3 = new DefaultCookie("name3", "value3"); cookie2 = new DefaultCookie("name2", "newValue2"); @@ -267,7 +267,7 @@ public class EppProtocolModuleTest extends ProtocolModuleTest { assertBufferRepresentsContent(getAllOutboundFrames(channel), outputBytes2); // Verify inbound message contains updated cookies. - byte[] inputBytes2 = readResourceBytes(getClass(), "testdata/login.xml").read(); + byte[] inputBytes2 = readResourceBytes(getClass(), "login.xml").read(); assertThat(channel.writeInbound(getByteBufFromContent(inputBytes2))).isTrue(); assertThat((FullHttpRequest) channel.readInbound()) .isEqualTo(makeEppHttpRequest(inputBytes2, cookie1, cookie2, cookie3)); diff --git a/proxy/src/test/java/google/registry/proxy/quota/QuotaConfigTest.java b/proxy/src/test/java/google/registry/proxy/quota/QuotaConfigTest.java index 71eb0da37..28bab5924 100644 --- a/proxy/src/test/java/google/registry/proxy/quota/QuotaConfigTest.java +++ b/proxy/src/test/java/google/registry/proxy/quota/QuotaConfigTest.java @@ -34,7 +34,7 @@ public class QuotaConfigTest { private static QuotaConfig loadQuotaConfig(String filename) { return new QuotaConfig( new Yaml() - .loadAs(readResourceUtf8(QuotaConfigTest.class, "testdata/" + filename), Quota.class), + .loadAs(readResourceUtf8(QuotaConfigTest.class, filename), Quota.class), "theProtocol"); } diff --git a/proxy/src/test/java/google/registry/proxy/testdata/login.xml b/proxy/src/test/resources/google/registry/proxy/login.xml similarity index 100% rename from proxy/src/test/java/google/registry/proxy/testdata/login.xml rename to proxy/src/test/resources/google/registry/proxy/login.xml diff --git a/proxy/src/test/java/google/registry/proxy/testdata/login_response.xml b/proxy/src/test/resources/google/registry/proxy/login_response.xml similarity index 100% rename from proxy/src/test/java/google/registry/proxy/testdata/login_response.xml rename to proxy/src/test/resources/google/registry/proxy/login_response.xml diff --git a/proxy/src/test/java/google/registry/proxy/testdata/logout.xml b/proxy/src/test/resources/google/registry/proxy/logout.xml similarity index 100% rename from proxy/src/test/java/google/registry/proxy/testdata/logout.xml rename to proxy/src/test/resources/google/registry/proxy/logout.xml diff --git a/proxy/src/test/java/google/registry/proxy/testdata/logout_response.xml b/proxy/src/test/resources/google/registry/proxy/logout_response.xml similarity index 100% rename from proxy/src/test/java/google/registry/proxy/testdata/logout_response.xml rename to proxy/src/test/resources/google/registry/proxy/logout_response.xml diff --git a/proxy/src/test/java/google/registry/proxy/quota/testdata/quota_config_default.yaml b/proxy/src/test/resources/google/registry/proxy/quota/quota_config_default.yaml similarity index 100% rename from proxy/src/test/java/google/registry/proxy/quota/testdata/quota_config_default.yaml rename to proxy/src/test/resources/google/registry/proxy/quota/quota_config_default.yaml diff --git a/proxy/src/test/java/google/registry/proxy/quota/testdata/quota_config_duplicate.yaml b/proxy/src/test/resources/google/registry/proxy/quota/quota_config_duplicate.yaml similarity index 100% rename from proxy/src/test/java/google/registry/proxy/quota/testdata/quota_config_duplicate.yaml rename to proxy/src/test/resources/google/registry/proxy/quota/quota_config_duplicate.yaml diff --git a/proxy/src/test/java/google/registry/proxy/quota/testdata/quota_config_no_refresh_no_refill.yaml b/proxy/src/test/resources/google/registry/proxy/quota/quota_config_no_refresh_no_refill.yaml similarity index 100% rename from proxy/src/test/java/google/registry/proxy/quota/testdata/quota_config_no_refresh_no_refill.yaml rename to proxy/src/test/resources/google/registry/proxy/quota/quota_config_no_refresh_no_refill.yaml diff --git a/proxy/src/test/java/google/registry/proxy/quota/testdata/quota_config_regular.yaml b/proxy/src/test/resources/google/registry/proxy/quota/quota_config_regular.yaml similarity index 100% rename from proxy/src/test/java/google/registry/proxy/quota/testdata/quota_config_regular.yaml rename to proxy/src/test/resources/google/registry/proxy/quota/quota_config_regular.yaml diff --git a/proxy/src/test/java/google/registry/proxy/quota/testdata/quota_config_unlimited_tokens.yaml b/proxy/src/test/resources/google/registry/proxy/quota/quota_config_unlimited_tokens.yaml similarity index 100% rename from proxy/src/test/java/google/registry/proxy/quota/testdata/quota_config_unlimited_tokens.yaml rename to proxy/src/test/resources/google/registry/proxy/quota/quota_config_unlimited_tokens.yaml